diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-01-15 22:53:02 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-01-15 22:53:02 +0100 |
| commit | d00937b9434957fcd4144781a07498c18d2089cd (patch) | |
| tree | f33e81fad73e7e721322f5828dc826b7fda78503 /extensions/BMO/template | |
| parent | 4fb57987a6b8182a38a5cfe3eca9adc7573bb604 (diff) | |
| download | bugzilla-d00937b9434957fcd4144781a07498c18d2089cd.tar.gz bugzilla-d00937b9434957fcd4144781a07498c18d2089cd.tar.xz | |
Bug 829709 - Do not load CSS files from all skins by default
https://bugzilla.mozilla.org/show_bug.cgi?id=8298709
Diffstat (limited to 'extensions/BMO/template')
| -rw-r--r-- | extensions/BMO/template/en/default/global/header.html.tmpl | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/extensions/BMO/template/en/default/global/header.html.tmpl b/extensions/BMO/template/en/default/global/header.html.tmpl index 0ef406e7c..8c96ca392 100644 --- a/extensions/BMO/template/en/default/global/header.html.tmpl +++ b/extensions/BMO/template/en/default/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,22 +120,12 @@ [% 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 %] - - [%# CSS cascade, part 4: page-specific styles. - #%] + [%# CSS cascade, part 4: page-specific styles. %] [% IF style %] <style type="text/css"> [% style FILTER none %] @@ -428,26 +414,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') %] |