fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-10-12 09:55 am
  • Add Memory
  • Share This Entry

[dw-free] Nouveau Oleanders: make images accessible via Customize

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

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

Add properties, rename images.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/nouveauoleanders/layout.s2
  • cgi-bin/LJ/S2Theme/nouveauoleanders.pm
  • htdocs/stc/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-rev-trans.png
  • htdocs/stc/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-trans.png
  • htdocs/stc/nouveauoleanders/comment_border.png
  • htdocs/stc/nouveauoleanders/comment_border_end_left.png
  • htdocs/stc/nouveauoleanders/comment_border_end_right.png
  • htdocs/stc/nouveauoleanders/entry_border.png
  • htdocs/stc/nouveauoleanders/entry_border_end_left.png
  • htdocs/stc/nouveauoleanders/entry_border_end_right.png
  • htdocs/stc/nouveauoleanders/johnny_automatic_oleander_design-blk-sm-trans.png
  • htdocs/stc/nouveauoleanders/journalheader_background.png
  • htdocs/stc/nouveauoleanders/oleander-johnny_automatic-sm-trans.png
  • htdocs/stc/nouveauoleanders/steren-extender-trans2.png
  • htdocs/stc/nouveauoleanders/steren-short-extender2.png
  • htdocs/stc/nouveauoleanders/steren-short-rev2.png
  • htdocs/stc/nouveauoleanders/steren-short2.png
  • htdocs/stc/nouveauoleanders/titles_background.png
--------------------------------------------------------------------------------
diff -r 61fef0b4ad3e -r dbde602b39f8 bin/upgrading/s2layers/nouveauoleanders/layout.s2
--- a/bin/upgrading/s2layers/nouveauoleanders/layout.s2	Mon Oct 11 21:38:34 2010 +0800
+++ b/bin/upgrading/s2layers/nouveauoleanders/layout.s2	Tue Oct 12 17:54:22 2010 +0800
@@ -43,7 +43,150 @@ set font_module_text = "";
 ## Images
 ##===============================
 
-set image_background_header_url = "nouveauoleanders/johnny_automatic_oleander_design-blk-sm-trans.png";
+propgroup images_child {
+
+    property string[] image_background_titles_group {
+        des = "Journal titles, module headings and footer background image";
+        grouptype = "image";
+        }
+    set image_background_titles_group = [ "image_background_titles_url", "image_background_titles_repeat" ];
+        property string image_background_titles_url {
+        grouped = 1;
+        }
+    property string image_background_titles_repeat {
+        values = "repeat|tile image|no-repeat|don't tile|repeat-x|tile horizontally|repeat-y|tile vertically";
+        grouped = 1;
+        }
+
+    property string[] image_entry_border_group {
+        des = "Entry border image";
+        grouptype = "image";
+        }
+    set image_entry_border_group = [ "image_entry_border_url", "image_entry_border_repeat", "image_entry_border_position" ];
+        property string image_entry_border_url {
+        grouped = 1;
+        }
+    property string image_entry_border_repeat {
+        values = "repeat|tile image|no-repeat|don't tile|repeat-x|tile horizontally|repeat-y|tile vertically";
+        grouped = 1;
+        }
+    property string image_entry_border_position {
+    values = "top left|top left|top center|top center|top right|top right|center left|center left|center center|center|center right|center right|bottom left|bottom left|bottom center|bottom center|bottom right|bottom right";
+        grouped = 1;
+        }
+
+    property string[] image_entry_border_end_odd_group {
+        des = "Odd entry border image";
+        grouptype = "image";
+        }
+    set image_entry_border_end_odd_group = [ "image_entry_border_end_odd_url", "image_entry_border_end_odd_repeat", "image_entry_border_end_odd_position" ];
+        property string image_entry_border_end_odd_url {
+        grouped = 1;
+        }
+    property string image_entry_border_end_odd_repeat {
+        values = "repeat|tile image|no-repeat|don't tile|repeat-x|tile horizontally|repeat-y|tile vertically";
+        grouped = 1;
+        }
+    property string image_entry_border_end_odd_position {
+    values = "top left|top left|top center|top center|top right|top right|center left|center left|center center|center|center right|center right|bottom left|bottom left|bottom center|bottom center|bottom right|bottom right";
+        grouped = 1;
+        }
+
+    property string[] image_entry_border_end_even_group {
+        des = "Even entry border image";
+        grouptype = "image";
+        }
+    set image_entry_border_end_even_group = [ "image_entry_border_end_even_url", "image_entry_border_end_even_repeat", "image_entry_border_end_even_position" ];
+        property string image_entry_border_end_even_url {
+        grouped = 1;
+        }
+    property string image_entry_border_end_even_repeat {
+        values = "repeat|tile image|no-repeat|don't tile|repeat-x|tile horizontally|repeat-y|tile vertically";
+        grouped = 1;
+        }
+    property string image_entry_border_end_even_position {
+    values = "top left|top left|top center|top center|top right|top right|center left|center left|center center|center|center right|center right|bottom left|bottom left|bottom center|bottom center|bottom right|bottom right";
+        grouped = 1;
+        }
+
+    property string[] image_comment_border_group {
+        des = "Comment border image";
+        grouptype = "image";
+        }
+    set image_comment_border_group = [ "image_comment_border_url", "image_comment_border_repeat", "image_comment_border_position" ];
+        property string image_comment_border_url {
+        grouped = 1;
+        }
+    property string image_comment_border_repeat {
+        values = "repeat|tile image|no-repeat|don't tile|repeat-x|tile horizontally|repeat-y|tile vertically";
+        grouped = 1;
+        }
+    property string image_comment_border_position {
+    values = "top left|top left|top center|top center|top right|top right|center left|center left|center center|center|center right|center right|bottom left|bottom left|bottom center|bottom center|bottom right|bottom right";
+        grouped = 1;
+        }
+
+    property string[] image_comment_border_end_odd_group {
+        des = "Odd comment border image";
+        grouptype = "image";
+        }
+    set image_comment_border_end_odd_group = [ "image_comment_border_end_odd_url", "image_comment_border_end_odd_repeat", "image_comment_border_end_odd_position" ];
+        property string image_comment_border_end_odd_url {
+        grouped = 1;
+        }
+    property string image_comment_border_end_odd_repeat {
+        values = "repeat|tile image|no-repeat|don't tile|repeat-x|tile horizontally|repeat-y|tile vertically";
+        grouped = 1;
+        }
+    property string image_comment_border_end_odd_position {
+    values = "top left|top left|top center|top center|top right|top right|center left|center left|center center|center|center right|center right|bottom left|bottom left|bottom center|bottom center|bottom right|bottom right";
+        grouped = 1;
+        }
+
+    property string[] image_comment_border_end_even_group {
+        des = "Even comment border image";
+        grouptype = "image";
+        }
+    set image_comment_border_end_even_group = [ "image_comment_border_end_even_url", "image_comment_border_end_even_repeat", "image_comment_border_end_even_position" ];
+        property string image_comment_border_end_even_url {
+        grouped = 1;
+        }
+    property string image_comment_border_end_even_repeat {
+        values = "repeat|tile image|no-repeat|don't tile|repeat-x|tile horizontally|repeat-y|tile vertically";
+        grouped = 1;
+        }
+    property string image_comment_border_end_even_position {
+    values = "top left|top left|top center|top center|top right|top right|center left|center left|center center|center|center right|center right|bottom left|bottom left|bottom center|bottom center|bottom right|bottom right";
+        grouped = 1;
+        }
+    }
+
+set image_background_header_url = "nouveauoleanders/journalheader_background.png";
+set image_background_header_repeat = "no-repeat";
+
+set image_background_titles_url = "nouveauoleanders/titles_background.png";
+set image_background_titles_repeat = "no-repeat";
+
+set image_entry_border_url = "nouveauoleanders/entry_border.png";
+set image_entry_border_position = "top left";
+set image_entry_border_repeat = "repeat-x";
+set image_entry_border_end_odd_url = "nouveauoleanders/entry_border_end_right.png";
+set image_entry_border_end_odd_position = "top right";
+set image_entry_border_end_odd_repeat = "no-repeat";
+set image_entry_border_end_even_url = "nouveauoleanders/entry_border_end_left.png";
+set image_entry_border_end_even_position = "top left";
+set image_entry_border_end_even_repeat = "no-repeat";
+
+set image_comment_border_url = "nouveauoleanders/comment_border.png";
+set image_comment_border_position = "top left";
+set image_comment_border_repeat = "repeat-x";
+set image_comment_border_end_odd_url = "nouveauoleanders/comment_border_end_right.png";
+set image_comment_border_end_odd_position = "top right";
+set image_comment_border_end_odd_repeat = "no-repeat";
+set image_comment_border_end_even_url = "nouveauoleanders/comment_border_end_left.png";
+set image_comment_border_end_even_position = "top left";
+set image_comment_border_end_even_repeat = "no-repeat";
+
 
 ##===============================
 ## Navigation Module
@@ -127,16 +270,21 @@ function Page::print() {
 
 function print_stylesheet () {
 
-#non universal image variables
-    var string entry_background_stretch = "$*STATDIR/nouveauoleanders/steren-extender-trans2.png";
-    var string entry_background_end_odd = "$*STATDIR/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-trans.png";
-    var string entry_background_end_even = "$*STATDIR/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-rev-trans.png";
+    var string header_background_image = generate_background_css ($*image_background_header_url, $*image_background_header_repeat, "", new Color);
 
-    var string h_background = "$*STATDIR/nouveauoleanders/oleander-johnny_automatic-sm-trans.png";
+    var string titles_background_image = generate_background_css ($*image_background_titles_url, $*image_background_titles_repeat, "", new Color);
 
-    var string comment_background_stretch = "$*STATDIR/nouveauoleanders/steren-short-extender2.png";
-    var string comment_background_end_odd = "$*STATDIR/nouveauoleanders/steren-short2.png";
-    var string comment_background_end_even = "$*STATDIR/nouveauoleanders/steren-short-rev2.png";
+    var string entry_border_image = generate_background_css ($*image_entry_border_url, $*image_entry_border_repeat, $*image_entry_border_position, new Color);
+
+    var string entry_border_image_odd = generate_background_css ($*image_entry_border_end_odd_url, $*image_entry_border_end_odd_repeat, $*image_entry_border_end_odd_position, new Color);
+
+    var string entry_border_image_even = generate_background_css ($*image_entry_border_end_even_url, $*image_entry_border_end_even_repeat, $*image_entry_border_end_even_position, new Color);
+
+    var string comment_border_image = generate_background_css ($*image_comment_border_url, $*image_comment_border_repeat, $*image_comment_border_position, new Color);
+
+    var string comment_border_image_odd = generate_background_css ($*image_comment_border_end_odd_url, $*image_comment_border_end_odd_repeat, $*image_comment_border_end_odd_position, new Color);
+
+    var string comment_border_image_even = generate_background_css ($*image_comment_border_end_even_url, $*image_comment_border_end_even_repeat, $*image_comment_border_end_even_position, new Color);
 
     var string no_icon_url = "$*IMGDIR/profile_icons/user.png";
 
@@ -196,11 +344,16 @@ h1, h2, h3, h4,
 .comment-title { font-family: $*font_journal_title, serif;
     font-style: italic; }
 
-h2, h3, h4 { color: $*color_page_title;
-    background: $*color_header_background url("$h_background") center left no-repeat; 
+h2, h3, h4 {
+    $titles_background_image
+    background-color: $*color_header_background;
+    background-position: center left;
+    color: $*color_page_title;
+    line-height: 1.5em;
+    min-height: 30px;
     padding-left: 40px;
-    min-height: 30px;
-    line-height: 1.5em; }
+    }
+
 h2 a, h3 a, h4 a { color: $*color_page_title; }
 h2 a, h3 a, h4 a:visited { color: $*color_page_title; }
 .entry .header h3,
@@ -225,14 +378,22 @@ body { margin: 0;
 
 #canvas { position: relative; }
 
-/* header */
-#header { 
+/* Header */
+
+#header {
+    $header_background_image
+    background-color: $*color_header_background;
+    background-position: top right;
     color: $*color_page_title;
-    background: $*color_header_background url("$*STATDIR/$*image_background_header_url") top right no-repeat;
-    padding: 1px;}
-#header > .inner:first-child { background: url("$*STATDIR/$*image_background_header_url") top left no-repeat;
+    padding: 1px;
+    }
+
+#header > .inner:first-child {
+    $header_background_image
+    background-position: top left;
     margin-top: -1px;
-    padding: 3em 2em 1em 2em; }
+    padding: 3em 2em 1em;
+    }
 
 #title { margin-right: 20px;
     margin-left: 200px;
@@ -251,17 +412,27 @@ body { margin: 0;
 .page-day .navigation .page-back { float: left; }
 
 
-/* entries */
-.entry-wrapper { margin-bottom: 3em; 
-    background: url("$entry_background_stretch") top left repeat-x; }
+/* Entries */
+
+.entry-wrapper {
+    $entry_border_image
+    margin-bottom: 3em;
+    }
+
 .entry-wrapper-odd { margin-right: 255px; }
 .entry-wrapper-even { margin-left: 255px; }
-.entry-wrapper-odd .entry { background: url("$entry_background_end_odd") top right no-repeat !important; 
+
+.entry-wrapper-odd .entry {
+    $entry_border_image_odd
+    margin-right: -255px;
     padding: 1px;
-    margin-right: -255px; }
-.entry-wrapper-even .entry { background: url("$entry_background_end_even") top left no-repeat !important;
+    }
+
+.entry-wrapper-even .entry {
+    $entry_border_image_even
+    margin-left: -255px;
     padding: 1px;
-    margin-left: -255px; }
+    }
 
 .entry { border: none; }
 
@@ -330,9 +501,11 @@ ul.entry-interaction-links { text-align:
 .comment-thread { margin-left: 1.5em; }
 .comment-depth-1 { margin-left: 0; }
 
-.comment-wrapper { margin-bottom: 1em; 
-    background: url("$comment_background_stretch") top left repeat-x;
-    padding-top: 1px;}
+.comment-wrapper {
+    $comment_border_image
+    margin-bottom: 1em;
+    padding-top: 1px;
+    }
 
 .comment-wrapper.partial {
     background: none;
@@ -340,14 +513,20 @@ ul.entry-interaction-links { text-align:
 
 .comment-wrapper-odd { margin-right: 48px; }
 .comment-wrapper-even { margin-left: 48px; }
-.comment-wrapper-odd .comment { background: url("$comment_background_end_odd") top right no-repeat; 
+
+.comment-wrapper-odd .comment {
+    $comment_border_image_odd
+    margin-right: -48px;
     margin-top: -1px;
-    margin-right: -48px;
-    padding-right: 2em; }
-.comment-wrapper-even .comment { background: url("$comment_background_end_even") top left no-repeat; 
+    padding-right: 2em;
+    }
+
+.comment-wrapper-even .comment {
+    $comment_border_image_even
+    margin-left: -48px;
     margin-top: -1px;
-    margin-left: -48px;
-    padding-left: 2em; }
+    padding-left: 2em;
+    }
 
 .comment { padding: 30px 1em 0 1em }
 
@@ -539,8 +718,13 @@ margin-left: 0; padding-left: 0; }
 
 #footer { padding: 1em;
     background-color: $*color_footer_background; }
-#footer > .inner:first-child { background: url("$h_background") center right no-repeat; 
-    min-height: 31px;  }
+
+#footer > .inner:first-child {
+    $titles_background_image
+    background-position: center right;
+    min-height: 31px;
+    }
+
 #footer a { color: $*color_footer_link; }
 
     """;
diff -r 61fef0b4ad3e -r dbde602b39f8 cgi-bin/LJ/S2Theme/nouveauoleanders.pm
--- a/cgi-bin/LJ/S2Theme/nouveauoleanders.pm	Mon Oct 11 21:38:34 2010 +0800
+++ b/cgi-bin/LJ/S2Theme/nouveauoleanders.pm	Tue Oct 12 17:54:22 2010 +0800
@@ -6,6 +6,44 @@ sub layout_prop { "layout_type" }
 sub layout_prop { "layout_type" }
 
 sub designer { "branchandroot" }
+
+sub entry_props {
+    my $self = shift;
+    my @props = qw(
+        image_entry_border_group
+        image_entry_border_url
+        image_entry_border_repeat
+        image_entry_border_position
+        image_entry_border_end_odd_group
+        image_entry_border_end_odd_url
+        image_entry_border_end_odd_repeat
+        image_entry_border_end_odd_position
+        image_entry_border_end_even_group
+        image_entry_border_end_even_url
+        image_entry_border_end_even_repeat
+        image_entry_border_end_even_position
+    );
+    return $self->_append_props( "entry_props", @props );
+}
+
+sub comment_props {
+    my $self = shift;
+    my @props = qw(
+        image_comment_border_group
+        image_comment_border_url
+        image_comment_border_repeat
+        image_comment_border_position
+        image_comment_border_end_odd_group
+        image_comment_border_end_odd_url
+        image_comment_border_end_odd_repeat
+        image_comment_border_end_odd_position
+        image_comment_border_end_even_group
+        image_comment_border_end_even_url
+        image_comment_border_end_even_repeat
+        image_comment_border_end_even_position
+    );
+    return $self->_append_props( "comment_props", @props );
+}
 
 package LJ::S2Theme::nouveauoleanders::dustyantique;
 use base qw( LJ::S2Theme::nouveauoleanders );
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-rev-trans.png
Binary file htdocs/stc/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-rev-trans.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-trans.png
Binary file htdocs/stc/nouveauoleanders/Steren_Twisted_Tree_Banner-sm-trans.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/comment_border.png
Binary file htdocs/stc/nouveauoleanders/comment_border.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/comment_border_end_left.png
Binary file htdocs/stc/nouveauoleanders/comment_border_end_left.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/comment_border_end_right.png
Binary file htdocs/stc/nouveauoleanders/comment_border_end_right.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/entry_border.png
Binary file htdocs/stc/nouveauoleanders/entry_border.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/entry_border_end_left.png
Binary file htdocs/stc/nouveauoleanders/entry_border_end_left.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/entry_border_end_right.png
Binary file htdocs/stc/nouveauoleanders/entry_border_end_right.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/johnny_automatic_oleander_design-blk-sm-trans.png
Binary file htdocs/stc/nouveauoleanders/johnny_automatic_oleander_design-blk-sm-trans.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/journalheader_background.png
Binary file htdocs/stc/nouveauoleanders/journalheader_background.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/oleander-johnny_automatic-sm-trans.png
Binary file htdocs/stc/nouveauoleanders/oleander-johnny_automatic-sm-trans.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/steren-extender-trans2.png
Binary file htdocs/stc/nouveauoleanders/steren-extender-trans2.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/steren-short-extender2.png
Binary file htdocs/stc/nouveauoleanders/steren-short-extender2.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/steren-short-rev2.png
Binary file htdocs/stc/nouveauoleanders/steren-short-rev2.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/steren-short2.png
Binary file htdocs/stc/nouveauoleanders/steren-short2.png has changed
diff -r 61fef0b4ad3e -r dbde602b39f8 htdocs/stc/nouveauoleanders/titles_background.png
Binary file htdocs/stc/nouveauoleanders/titles_background.png has changed
--------------------------------------------------------------------------------