afuna: Cat under a blanket. Text: "Cats are just little people with Fur and Fangs" (Default)
afuna ([personal profile] afuna) wrote in [site community profile] changelog2009-08-05 04:35 am

[dw-free] Base layouts should use print_default_stylesheet()

[commit: http://hg.dwscoalition.org/dw-free/rev/668cc8ebe4d8]

http://bugs.dwscoalition.org/show_bug.cgi?id=1540

Covers Drifting, Negatives.

Patch by [personal profile] av8rmike.

Files modified:
  • bin/upgrading/s2layers/drifting/layout.s2
  • bin/upgrading/s2layers/negatives/layout.s2
--------------------------------------------------------------------------------
diff -r 855a16325ae3 -r 668cc8ebe4d8 bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2	Wed Aug 05 03:49:39 2009 +0000
+++ b/bin/upgrading/s2layers/drifting/layout.s2	Wed Aug 05 04:15:12 2009 +0000
@@ -227,7 +227,7 @@ function prop_init()
 
 # Prints out the stylesheet for Drifting
 ################################################################################
-function print_stylesheet()
+function Page::print_default_stylesheet()
 {
     var string page_background = generate_background_css ($*image_background_page_url, $*image_background_page_repeat, $*image_background_page_position, $*color_page_background);
     var string header_background = generate_background_css ($*image_background_header_url, $*image_background_header_repeat, $*image_background_header_position, $*color_module_title);
@@ -268,6 +268,8 @@ function print_stylesheet()
         $title_font_string = "$title_font_string $*title_font_fallback";
     }
 
+    """<style type="text/css">""";
+    start_css();
 """
     /* Main layout
     ***************************************************************************/
@@ -823,6 +825,8 @@ function print_stylesheet()
         padding-left: 10px;
     }
 """;
+    end_css();
+    "</style>\n";
 }
 
 # NavLinks Module, Need to override this so the title gets printed.
diff -r 855a16325ae3 -r 668cc8ebe4d8 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Wed Aug 05 03:49:39 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Wed Aug 05 04:15:12 2009 +0000
@@ -191,7 +191,7 @@ set comment_management_links = "text";
 
 ########################
 #Prints the stylesheet
-function print_stylesheet()
+function Page::print_default_stylesheet()
 {
     var string page_background = generate_background_css($*image_background_page_url,$*image_background_page_repeat,$*image_background_page_position,$*color_page_background);
     var string header_background = generate_background_css($*image_background_header_url, $*image_background_header_repeat, $*image_background_header_position, new Color);
@@ -200,6 +200,9 @@ function print_stylesheet()
     if ($*image_background_header_height > 0) {
         $header_background = $header_background + "\n        height: " + $*image_background_header_height + "px;";
     }
+
+    """<style type="text/css">""";
+    start_css();
 """
     body {
         margin: 0;
@@ -423,6 +426,8 @@ function print_stylesheet()
     .entry h3 { display: inline; }
 
     """;
+    end_css();
+    "</style>\n";
 }
 
 #Print_body
--------------------------------------------------------------------------------