kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2012-07-21 12:58 am
  • Add Memory
  • Share This Entry

[dw-free] New Style: Bannering by branchandroot

[commit: http://hg.dwscoalition.org/dw-free/rev/419c0af19ea5]

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

Rename some custom style properties in Bannering, as requested by [personal profile] ninetydegrees.

Patch by [personal profile] kareila.

Files modified:
  • bin/upgrading/s2layers/bannering/layout.s2
  • bin/upgrading/s2layers/bannering/themes.s2
  • cgi-bin/LJ/S2Theme/bannering.pm
--------------------------------------------------------------------------------
diff -r 1ead40895ac9 -r 419c0af19ea5 bin/upgrading/s2layers/bannering/layout.s2
--- a/bin/upgrading/s2layers/bannering/layout.s2	Fri Jul 20 17:49:33 2012 -0700
+++ b/bin/upgrading/s2layers/bannering/layout.s2	Fri Jul 20 18:02:23 2012 -0700
@@ -12,7 +12,7 @@
 
 propgroup presentation_child {
 
-property string header_border {
+property string header_border_position {
     des = "Add border to header";
     values = "none|None|bottom|Bottom|topbottom|Top and Bottom|all|On All Sides";
     }
@@ -23,7 +23,7 @@
     des = "Define style of optional header border";
     values = "solid|Solid|double|Double|dotted|Dotted|dashed|Dashed";
     }
-property string header_margin {
+property string header_margin_size {
     des = "Add a margin around the header";
     }
 property string header_title_position {
@@ -39,10 +39,10 @@
 }
 
 set userpics_position = "left";
-set header_border = "none";
+set header_border_position = "none";
 set header_border_width = "1px";
 set header_border_style = "solid";
-set header_margin = "0em";
+set header_margin_size = "0em";
 set header_title_position = "left";
 set header_title_spacing_top = "0em";
 set header_title_spacing_side = "0em";
@@ -89,11 +89,11 @@
 ##===============================
 
 propgroup images_child {
-    property string[] image_header_background_group2 {
+    property string[] image_header_background_inner_group {
         des = "Second header image";
         grouptype = "image";
     }
-    set image_header_background_group2 = [ "image_background_header_inner_url", "image_background_header_inner_repeat", "image_background_header_inner_position" ];
+    set image_header_background_inner_group = [ "image_background_header_inner_url", "image_background_header_inner_repeat", "image_background_header_inner_position" ];
     property string image_background_header_inner_url {
         grouped = 1;
     }
@@ -111,7 +111,7 @@
 
 propgroup colors_child {
     property Color color_header_inner_background { des = "Color of the inner header."; }
-    property Color color_navlinks_current { des = "The color of the nav link for the page you are currently on."; }
+    property Color color_navlinks_link_current { des = "The color of the nav link for the page you are currently on."; }
     property Color color_navlinks_link { des = "The link color of the nav links (used when those appear in the header)."; }
     property Color color_navlinks_link_visited { des = "The visited link color of the nav links (used when those appear in the header)."; }
     property Color color_header_border { des = "Color of the header border."; }
@@ -247,14 +247,14 @@
 
 
 var string header_border_css = "";
-    if ($*header_border == "bottom") {
+    if ($*header_border_position == "bottom") {
         $header_border_css = "#header { border-bottom: $*header_border_style $*header_border_width $*color_header_border; }";
     }
-    if ($*header_border == "topbottom") {
+    if ($*header_border_position == "topbottom") {
         $header_border_css = "#header { border-bottom: $*header_border_style $*header_border_width $*color_header_border;
             border-top: $*header_border_style $*header_border_width $*color_header_border; }";
     }
-    if ($*header_border == "all") {
+    if ($*header_border_position == "all") {
         $header_border_css = "#header { border: $*header_border_style $*header_border_width $*color_header_border; }";
     }
 
@@ -319,7 +319,7 @@
     padding-top: 1px; }
 
 #header {
-    margin: $*header_margin;
+    margin: $*header_margin_size;
     text-align: $*header_title_position;
     margin: 0;
     margin-bottom: 1em;
@@ -522,7 +522,7 @@
 .module-calendar table { margin: 0; }
 
 $navlinks_css
-.module-navlinks a.current { color: $*color_navlinks_current;
+.module-navlinks a.current { color: $*color_navlinks_link_current;
     text-decoration: none; }
 
 .search-box {max-width: 100%;}
diff -r 1ead40895ac9 -r 419c0af19ea5 bin/upgrading/s2layers/bannering/themes.s2
--- a/bin/upgrading/s2layers/bannering/themes.s2	Fri Jul 20 17:49:33 2012 -0700
+++ b/bin/upgrading/s2layers/bannering/themes.s2	Fri Jul 20 18:02:23 2012 -0700
@@ -70,7 +70,7 @@
 set color_page_link_active = "#009";
 set color_page_title = "#fff";
 set color_header_inner_background = "#600";
-set header_border = "bottom";
+set header_border_position = "bottom";
 set color_header_border = "#000";
 set header_border_width = "3px";
 set header_border_style = "solid";
@@ -126,7 +126,7 @@
 set color_page_link_active = "#900";
 set color_page_title = "#fff";
 set color_header_inner_background = "#066";
-set header_border = "bottom";
+set header_border_position = "bottom";
 set color_header_border = "#333";
 set header_border_width = "3px";
 set header_border_style = "solid";
@@ -201,7 +201,7 @@
 
 set color_module_title = "#f6f3ee";
 set color_module_border = "#ccc";
-set color_navlinks_current = "#000";
+set color_navlinks_link_current = "#000";
 set color_navlinks_link = "#fff";
 set color_navlinks_link_visited = "#ccc";
 
@@ -250,7 +250,7 @@
 set color_page_link_visited = "#ac3b19";
 set color_page_link_active = "#506b8b";
 set color_page_title = "#fffff9";
-set header_border = "bottom";
+set header_border_position = "bottom";
 set color_header_border = "#000";
 set header_border_width = "2px";
 set header_border_style = "solid";
@@ -270,7 +270,7 @@
 
 set color_module_title = "#000";
 set color_module_border = "#000";
-set color_navlinks_current = "#fffff9";
+set color_navlinks_link_current = "#fffff9";
 set color_navlinks_link_visited = "#80371c";
 
 ##===============================
@@ -317,7 +317,7 @@
 set color_page_link_active = "#900";
 set color_page_title = "#000";
 set color_header_background = "#fefdf9";
-set header_border = "topbottom";
+set header_border_position = "topbottom";
 set color_header_border = "#000";
 set header_border_width = "2px";
 set header_border_style = "solid";
@@ -337,7 +337,7 @@
 
 set color_module_title = "#fff";
 set color_module_border = "#fefdf9";
-set color_navlinks_current = "#000";
+set color_navlinks_link_current = "#000";
 set color_navlinks_link = "#809435";
 set color_navlinks_link_visited = "#585336";
 
@@ -399,7 +399,7 @@
 
 set color_module_title = "#fff";
 set color_module_border = "#eee";
-set color_navlinks_current = "#fff";
+set color_navlinks_link_current = "#fff";
 
 ##===============================
 ## Fonts
@@ -459,7 +459,7 @@
 
 set color_module_title = "#000";
 set color_module_border = "#666";
-set color_navlinks_current = "#000";
+set color_navlinks_link_current = "#000";
 
 ##===============================
 ## Fonts
@@ -501,7 +501,7 @@
 set color_page_link_visited = "#7a5e14";
 set color_page_link_active = "#e00";
 set color_page_title = "#fff";
-set header_border = "bottom";
+set header_border_position = "bottom";
 set color_header_border = "#607381";
 set header_border_width = "2px";
 set header_border_style = "solid";
@@ -521,7 +521,7 @@
 
 set color_module_title = "#000";
 set color_module_border = "#999";
-set color_navlinks_current = "#fff";
+set color_navlinks_link_current = "#fff";
 
 ##===============================
 ## Fonts
@@ -569,7 +569,7 @@
 set color_page_link_active = "#009";
 set color_page_title = "#f3ebf3";
 set color_header_inner_background = "#2d9da4";
-set header_border = "bottom";
+set header_border_position = "bottom";
 set color_header_border = "#000";
 set header_border_width = "1px";
 set header_border_style = "solid";
@@ -588,7 +588,7 @@
 
 set color_module_title = "#000";
 set color_module_border = "#666";
-set color_navlinks_current = "#000";
+set color_navlinks_link_current = "#000";
 set color_navlinks_link = "#ead9d6";
 set color_navlinks_link_visited = "#cdbdbb";
 
@@ -633,11 +633,11 @@
 set color_page_link = "#007cc2";
 set color_page_link_visited = "#004c92";
 set color_page_link_active = "#090";
-set header_border = "all";
+set header_border_position = "all";
 set color_header_border = "#000";
 set header_border_width = "2px";
 set header_border_style = "solid";
-set header_margin = "2.5em 2em";
+set header_margin_size = "2.5em 2em";
 
 ##===============================
 ## Entry Colors
@@ -652,7 +652,7 @@
 
 set color_module_title = "#000";
 set color_module_border = "#000";
-set color_navlinks_current = "#000";
+set color_navlinks_link_current = "#000";
 
 ##===============================
 ## Fonts
@@ -716,7 +716,7 @@
 
 set color_module_title = "#fff";
 set color_module_border = "#9396a9";
-set color_navlinks_current = "#000";
+set color_navlinks_link_current = "#000";
 set color_navlinks_link = "#3f4112";
 set color_navlinks_link_visited = "#9396a9";
 
@@ -779,7 +779,7 @@
 
 set color_module_title = "#fff";
 set color_module_border = "#000";
-set color_navlinks_current = "#fff";
+set color_navlinks_link_current = "#fff";
 
 ##===============================
 ## Fonts
@@ -823,7 +823,7 @@
 set color_page_link_active = "#009";
 set color_page_title = "#fff";
 set color_header_inner_background = "#fff";
-set header_border = "bottom";
+set header_border_position = "bottom";
 set color_header_border = "#500";
 set header_border_width = "3px";
 set header_border_style = "solid";
@@ -842,7 +842,7 @@
 
 set color_module_title = "#000";
 set color_module_border = "#666";
-set color_navlinks_current = "#000";
+set color_navlinks_link_current = "#000";
 
 ##===============================
 ## Fonts
diff -r 1ead40895ac9 -r 419c0af19ea5 cgi-bin/LJ/S2Theme/bannering.pm
--- a/cgi-bin/LJ/S2Theme/bannering.pm	Fri Jul 20 17:49:33 2012 -0700
+++ b/cgi-bin/LJ/S2Theme/bannering.pm	Fri Jul 20 18:02:23 2012 -0700
@@ -8,7 +8,7 @@
 sub module_props {
     my $self = shift;
     my @props = qw(
-        color_navlinks_current
+        color_navlinks_link_current
         color_navlinks_link
         color_navlinks_link_visited
     );
@@ -20,7 +20,7 @@
     my @props = qw(
         color_header_border
         color_header_inner_background
-        image_header_background_group2
+        image_header_background_inner_group
         image_background_header_inner_height
     );
     return $self->_append_props( "header_props", @props );
--------------------------------------------------------------------------------