[dw-free] Drifting background images do not work with changed colors

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/315cee86e43d]

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

Allow theme images to be removed.

Patch by av8rmike.

Files modified:

• bin/upgrading/s2layers/drifting/layout.s2
• bin/upgrading/s2layers/drifting/themes.s2

--------------------------------------------------------------------------------
diff -r a036edac36e5 -r 315cee86e43d bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2	Thu Aug 20 12:37:00 2009 -0500
+++ b/bin/upgrading/s2layers/drifting/layout.s2	Thu Aug 20 17:50:12 2009 +0000
@@ -77,7 +77,9 @@ propgroup images
     property string image_header_right {
         des = "Right header image URL";
     }
-    property string image_module_header_url { noui = 1; }
+    property string image_module_header_url { 
+        des = "Module/Entry header image URL";
+    }
 }
 
 # TEXT
@@ -216,21 +218,21 @@ set module_links_order         = 3;
 ################################################################################
 function prop_init()
 {
-    if ( $*image_background_header_url == "" )
+    if ( $*image_background_header_url != "" and not $*image_background_header_url->starts_with("http") )
     {
-        $*image_background_header_url = "$*STATDIR/drifting/hdr_bg.jpg";
+        $*image_background_header_url = "$*STATDIR/$*image_background_header_url";
     }
-    if ( $*image_module_header_url == "" )
+    if ( $*image_module_header_url != "" and not $*image_module_header_url->starts_with("http") )
     {
-        $*image_module_header_url = "$*STATDIR/drifting/hdr_icon.gif";
+        $*image_module_header_url = "$*STATDIR/$*image_module_header_url";
     }
-    if ( $*image_header_left == "" )
+    if ( $*image_header_left != "" and not $*image_header_left->starts_with("http") )
     {
-        $*image_header_left = "$*STATDIR/drifting/hdr_left.jpg";
+        $*image_header_left = "$*STATDIR/$*image_header_left";
     }
-    if ( $*image_header_right == "" )
+    if ( $*image_header_right != "" and not $*image_header_right->starts_with("http") )
     {
-        $*image_header_right = "$*STATDIR/drifting/hdr_right.jpg";
+        $*image_header_right = "$*STATDIR/$*image_header_right";
     }
 }
 
diff -r a036edac36e5 -r 315cee86e43d bin/upgrading/s2layers/drifting/themes.s2
--- a/bin/upgrading/s2layers/drifting/themes.s2	Thu Aug 20 12:37:00 2009 -0500
+++ b/bin/upgrading/s2layers/drifting/themes.s2	Thu Aug 20 17:50:12 2009 +0000
@@ -3,3 +3,8 @@ layerinfo name = "Drifting Blue";
 layerinfo name = "Drifting Blue";
 layerinfo redist_uniq = "drifting/blue";
 
+set image_background_header_url = "drifting/hdr_bg.jpg";
+set image_background_header_repeat = "repeat";
+set image_header_left = "drifting/hdr_left.jpg";
+set image_header_right = "drifting/hdr_right.jpg";
+set image_module_header_url = "drifting/hdr_icon.gif";
--------------------------------------------------------------------------------