Bug 829709: Do not load CSS files from all skins by default

r=dkl a=LpSolit

1 files changed, 8 insertions, 36 deletions

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 83816c97e..0858edd98 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -22,10 +22,6 @@
   # atomlink: Atom link URL, May contain HTML
   #%]
 
-[% IF message %]
-  [% PROCESS global/messages.html.tmpl %]
-[% END %]
-
 [% DEFAULT
   subheader = ""
   header_addl_info = ""
@@ -95,12 +91,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 %]">
@@ -108,22 +100,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 %]
@@ -296,7 +278,8 @@
 [% END %]
 
 [% IF message %]
-<div id="message">[% message %]</div>
+  [% PROCESS global/messages.html.tmpl %]
+  <div id="message">[% message %]</div>
 [% END %]
 
 [% BLOCK format_css_link %]
@@ -308,26 +291,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') %]