Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/358430 )
Change subject: [WIP] mediawiki: Fix error page template issues ...................................................................... [WIP] mediawiki: Fix error page template issues Follows-up f8c7814308d2. See http://tools.wmflabs.org/.error/banned.html and http://tools.wmflabs.org/.error/errorpage.html * Fix logo being stretched. Make height implicit so logos naturally resize proportionally. * (TODO) Fix errorpage.html having an empty footer (should be omitted) - dynamicproxy/init has a default of '$error_details = undef'. - It is called by toollabs without setting 'error_details'. - dynamixproxy calls mediawiki::errorpage with 'footer => $error_details' - Inside mediawiki::errorpage, an ERB template is called At that point, instead of being nil, it has become the empy string. * (TODO) Fix banned.html having "undef" printed as footer - dynamixproxy calls mediawiki::errorpage without footer. - errorpage has a default of '$footer = undef'. - Inside the RB template it has somehow become the string "undef" instead of the Ruby nil value. Bug: T113114 Change-Id: I4b3e7879b363cabd218338ec60334281ed641e2e --- M modules/mediawiki/templates/errorpage.html.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/358430/1 diff --git a/modules/mediawiki/templates/errorpage.html.erb b/modules/mediawiki/templates/errorpage.html.erb index 8643f4a..0835a3e 100644 --- a/modules/mediawiki/templates/errorpage.html.erb +++ b/modules/mediawiki/templates/errorpage.html.erb @@ -18,7 +18,7 @@ .text-muted { color: #777; } </style> <div class="content" role="main"> -<% if @errorpage['logo_link'] %><a href="<%= @errorpage['logo_link'] %>"><% end %><img src="<%= @errorpage['logo_src'] %>" srcset="<%= @errorpage['logo_srcset'] %>" alt="<%= @errorpage['logo_alt'] %>" width=135 height=135><% if @errorpage['logo_link'] %></a><% end %> +<% if @errorpage['logo_link'] %><a href="<%= @errorpage['logo_link'] %>"><% end %><img src="<%= @errorpage['logo_src'] %>" srcset="<%= @errorpage['logo_srcset'] %>" alt="<%= @errorpage['logo_alt'] %>" width="135"><% if @errorpage['logo_link'] %></a><% end %> <h1><%= @errorpage['pagetitle'] %></h1> <%= @errorpage['content'] %> </div> -- To view, visit https://gerrit.wikimedia.org/r/358430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b3e7879b363cabd218338ec60334281ed641e2e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
