[ljcom] r12115: LJSUP-12572: Minimalism's Old S1 style o...

U   trunk/bin/upgrading/s2layers/sup/themes.s2

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2012-06-15 07:45:51 UTC (rev 12114)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2012-06-15 08:03:48 UTC (rev 12115)
@@ -562,11 +562,15 @@
         $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/style.css"]);
         $p->need_res({"args" => "media=\"print\"" }, ["stc/sup/s/print.css"]);
         
-        if ($*use_theme_stylesheet) {
-            if ($*theme_css) {                
-                $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
-            }            
-            $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+        if ($*old_s1 and ($p.view == "entry" or $p.view == "reply")) {
+            $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/old_s1.css"]);
+        } else {
+            if ($*use_theme_stylesheet) {
+                if ($*theme_css) {
+                    $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
+                }
+                $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+            }
         }
     }
 }
@@ -946,12 +950,16 @@
     if ($*use_stylesheets) {
         $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/style.css"]);
         $p->need_res({"args" => "media=\"print\"" }, ["stc/sup/s/print.css"]);
-        
-        if ($*use_theme_stylesheet) {
-            if ($*theme_css) {                
-                $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
-            }            
-            $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+
+        if ($*old_s1 and ($p.view == "entry" or $p.view == "reply")) {
+            $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/old_s1.css"]);
+        } else {
+            if ($*use_theme_stylesheet) {
+                if ($*theme_css) {
+                    $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
+                }
+                $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+            }
         }
     }
 }
@@ -1331,12 +1339,16 @@
     if ($*use_stylesheets) {
         $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/style.css"]);
         $p->need_res({"args" => "media=\"print\"" }, ["stc/sup/s/print.css"]);
-        
-        if ($*use_theme_stylesheet) {
-            if ($*theme_css) {                
-                $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
-            }            
-            $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+
+        if ($*old_s1 and ($p.view == "entry" or $p.view == "reply")) {
+            $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/old_s1.css"]);
+        } else {
+            if ($*use_theme_stylesheet) {
+                if ($*theme_css) {
+                    $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
+                }
+                $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+            }
         }
     }
 }
@@ -1716,12 +1728,16 @@
     if ($*use_stylesheets) {
         $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/style.css"]);
         $p->need_res({"args" => "media=\"print\"" }, ["stc/sup/s/print.css"]);
-        
-        if ($*use_theme_stylesheet) {
-            if ($*theme_css) {                
-                $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
-            }            
-            $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+
+        if ($*old_s1 and ($p.view == "entry" or $p.view == "reply")) {
+            $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/old_s1.css"]);
+        } else {
+            if ($*use_theme_stylesheet) {
+                if ($*theme_css) {
+                    $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
+                }
+                $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+            }
         }
     }
 }
@@ -3352,11 +3368,15 @@
         $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/style.css"]);
         $p->need_res({"args" => "media=\"print\"" }, ["stc/sup/s/print.css"]);
         
-        if ($*use_theme_stylesheet) {
-            if ($*theme_css) {                
-                $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
-            }            
-            $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+        if ($*old_s1 and ($p.view == "entry" or $p.view == "reply")) {
+            $p->need_res({"args" => "media=\"screen\"" }, ["stc/sup/s/old_s1.css"]);
+        } else {
+            if ($*use_theme_stylesheet) {
+                if ($*theme_css) {
+                    $p->need_res({"args" => "media=\"screen, handheld\"" }, ["stc/sup/s/$*theme_css"]);
+                }
+                $p->need_res({"condition" => "IE","args" => "media=\"screen\"" }, ["stc/sup/s/ie.css"]);
+            }
         }
     }
 }