[dw-nonfree] Add header background images to Sunday Morning

[fu]

[commit: http://hg.dwscoalition.org/dw-nonfree/rev/53919139e745]

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

Add a header image option, and tweak various styling to accommodate the
header height if given.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/sundaymorning/layout.s2

--------------------------------------------------------------------------------
diff -r 63d2710b0013 -r 53919139e745 bin/upgrading/s2layers/sundaymorning/layout.s2
--- a/bin/upgrading/s2layers/sundaymorning/layout.s2	Fri Dec 23 19:17:50 2011 +0800
+++ b/bin/upgrading/s2layers/sundaymorning/layout.s2	Fri Dec 23 19:34:27 2011 +0800
@@ -83,6 +83,8 @@
 
 propgroup images {
     property use image_background_page_group;
+    property use image_background_header_group;
+    property use image_background_header_height;
 }
 
 set image_background_page_repeat = "no-repeat";
@@ -271,9 +273,6 @@
 function Page::print_default_stylesheet() {
     var string sidebar_position = "";
     var string sidebar_position_alt = "";
-    var string image_background_page_position = "100% 70px";
-    if ($*layout_type == "two-columns-right") { $sidebar_position = "right"; $sidebar_position_alt = "left"; $image_background_page_position = "0% 70px"; }
-    elseif ($*layout_type == "two-columns-left") { $sidebar_position = "left"; $sidebar_position_alt = "right"; }
 
     var string page_background_colors = generate_color_css( new Color, $*color_page_background, new Color );
     var string page_colors = generate_color_css( $*color_page_text, new Color, new Color );
@@ -284,11 +283,27 @@
 
     var string page_content_title_colors = generate_color_css( $*color_entry_title, $*color_entry_background, $*color_entry_border );
 
-    var string container_background = generate_background_css( $*image_background_page_url, $*image_background_page_repeat, $image_background_page_position, new Color );
-
     var string page_title_colors = generate_color_css( $*color_page_title, $*color_page_title_background, new Color );
     var string page_title_anchor_colors = generate_color_css( $*color_page_title, new Color, new Color );
     var string header_colors = generate_color_css( $*color_header_text, $*color_header_background, $*color_module_border );
+    var string header_background = generate_background_css($*image_background_header_url, $*image_background_header_repeat, $*image_background_header_position, $*color_header_background);
+
+    var string module_two_position = "8em";
+    var string image_background_page_position_top = "70px";
+    if ($*image_background_header_height > 0) {
+        $header_background = """
+            $header_background
+            height: """ + $*image_background_header_height + "px;";
+        $module_two_position = $*image_background_header_height + 20 + "px;";
+        $image_background_page_position_top = $*image_background_header_height + 20 + "px;";
+    }
+
+    var string image_background_page_position = "100% $image_background_page_position_top";
+    if ($*layout_type == "two-columns-right") { $sidebar_position = "right"; $sidebar_position_alt = "left"; $image_background_page_position = "0% $image_background_page_position_top"; }
+    elseif ($*layout_type == "two-columns-left") { $sidebar_position = "left"; $sidebar_position_alt = "right"; }
+
+    var string container_background = generate_background_css( $*image_background_page_url, $*image_background_page_repeat, $image_background_page_position, new Color );
+
     var string header_hover_colors = generate_color_css( $*color_header_hover, $*color_header_hover_background, new Color );
 
     var string module_base_colors = generate_color_css( $*color_module_text, new Color, new Color );
@@ -401,6 +416,7 @@
  
 #header {
     $page_title_colors
+    $header_background
     margin: 0;
     padding: 0;
 }
@@ -471,7 +487,7 @@
 .two-columns .module-section-two {
     position: absolute;
     $sidebar_position: 2em;
-    top: 8em;
+    top: $module_two_position;
 }
 
 .one-column .module-section-two {
--------------------------------------------------------------------------------

Comments

[ninetydegrees]

I'm not sure this is what we wanted. The header group isn't meant to be used as a banner but rather as a header background image hence the other bug to create a *true* banner option. If anybody uses this and then we change the option to what it's really meant to do it's gonna cause issues.

[ninetydegrees]

Unless I'm misunderstand what this does, which is extremely possible since I haven't applied this yet.

[fu]

Oh! I thought that the header background image was meant for a banner, and had been created, but was just awaiting implementation in various styles.

My bad, removing.