Dzahn has submitted this change and it was merged. Change subject: [4.4] Upgrade two template files and reapply our custom changes ......................................................................
[4.4] Upgrade two template files and reapply our custom changes DO NOT COMMIT until Bugzilla has been upgraded to 4.4. Also kill loading Dusk. It was loaded as alternative CSS in 4.2 but was enabled by default in 4.4 due to custom code and http://bzr.mozilla.org/bugzilla/trunk/revision/8553 . It has always looked ugly when explicitly enabling it. Change-Id: If24dee5f6c69c6fc374370db2ec2a49162335ab2 --- M template/en/custom/global/header.html.tmpl M template/en/custom/global/variables.none.tmpl 2 files changed, 8 insertions(+), 31 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/template/en/custom/global/header.html.tmpl b/template/en/custom/global/header.html.tmpl index cd2ea8f..6bc0448 100644 --- a/template/en/custom/global/header.html.tmpl +++ b/template/en/custom/global/header.html.tmpl @@ -111,12 +111,8 @@ [% SET yui = yui_resolve_deps(yui, yui_deps) %] [% SET css_sets = css_files(style_urls, yui, yui_css) %] - [%# CSS cascade, part 1: Standard Bugzilla stylesheet set (persistent). - # Always present. - #%] - [%# This allows people to switch back to the "Classic" skin if they - # are in another skin. - #%] + [%# CSS cascade, parts 1 & 2: YUI & Standard Bugzilla stylesheet set (persistent). + # Always present. %] <link href="[% 'skins/standard/global.css' FILTER mtime FILTER html %]" rel="alternate stylesheet" title="[% setting_descs.standard FILTER html %]"> @@ -124,26 +120,17 @@ [% PROCESS format_css_link css_set_name = 'standard' %] [% END %] - [%# CSS cascade, part 2 & 3: Third-party stylesheet set (selected and - # selectable). All third-party skins are present as alternate - # stylesheets, even if they are not currently in use. - #%] + [%# CSS cascade, part 3: Third-party stylesheet set, per user prefs. %] [% FOREACH style_url = css_sets.skin %] [% PROCESS format_css_link css_set_name = user.settings.skin.value %] [% END %] - [% FOREACH alternate_skin = css_sets.alternate.keys %] - [% FOREACH style_url = css_sets.alternate.$alternate_skin %] - [% PROCESS format_css_link css_set_name = alternate_skin %] - [% END %] - [% END %] [% IF user.settings.skin.value=='Wikimedia' %] <link rel="stylesheet" href="skins/contrib/Wikimedia/vector.css" media="screen" /> [% END %] - [%# CSS cascade, part 4: page-specific styles. - #%] + [%# CSS cascade, part 4: page-specific styles. %] [% IF style %] <style type="text/css"> [% style %] @@ -334,7 +321,7 @@ [% END %] [% IF message %] -<div id="message">[% message %]</div> + <div id="message">[% message %]</div> [% END %] [% BLOCK format_css_link %] @@ -346,26 +333,15 @@ #%] [% END %] - [% IF css_set_name == 'standard' - OR css_set_name == user.settings.skin.value - %] - [% SET css_rel = 'stylesheet' %] - [% SET css_set_display_name = setting_descs.${user.settings.skin.value} - || user.settings.skin.value %] - [% ELSE %] - [% SET css_rel = 'alternate stylesheet' %] - [% SET css_set_display_name = setting_descs.$css_set_name || css_set_name %] - [% END %] - [% IF css_set_name == 'standard' %] [% SET css_title_link = '' %] [% ELSE %] [% css_title_link = BLOCK ~%] - title="[% css_set_display_name FILTER html %]" + title="[% setting_descs.${user.settings.skin.value} || user.settings.skin.value FILTER html %]" [% END %] [% END %] - <link href="[% style_url FILTER html %]" rel="[% css_rel FILTER none %]" + <link href="[% style_url FILTER html %]" rel="stylesheet" type="text/css" [% css_title_link FILTER none %]> [% '<![endif]-->' IF style_url.match('/IE-fixes\.css') %] diff --git a/template/en/custom/global/variables.none.tmpl b/template/en/custom/global/variables.none.tmpl index c61fb59..8b25bac 100644 --- a/template/en/custom/global/variables.none.tmpl +++ b/template/en/custom/global/variables.none.tmpl @@ -41,4 +41,5 @@ } %] +[% USE Hook %] [% Hook.process("end") %] -- To view, visit https://gerrit.wikimedia.org/r/98005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If24dee5f6c69c6fc374370db2ec2a49162335ab2 Gerrit-PatchSet: 6 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
