[dw-free] Skittlish Dreams: 5 new themes by sarken

[fu]

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

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

Only print out images/styling related to images if theme wants them.

Patch by fu.

Files modified:

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

--------------------------------------------------------------------------------
diff -r 27e14284313c -r 9aa5e013e2ed bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Thu Jan 13 11:55:17 2011 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Thu Jan 13 12:08:26 2011 +0800
@@ -40,6 +40,10 @@ propgroup presentation {
     property use comment_management_links;
     property use entry_datetime_format_group;
     property use comment_datetime_format_group;
+    property bool use_action_links_images {
+        des = "Theme has images for the entry/comment links";
+        noui = 1;
+    }
 }
 
 set layout_type = "two-columns-right";
@@ -47,6 +51,7 @@ set tags_page_type = "";
 set tags_page_type = "";
 set entryicons_position = "same";
 set custom_colors_template = "%%new%% .userpic a {background-color: %%background%%; border: solid 1px %%foreground%%;}";
+set use_action_links_images = true;
 
 propgroup colors {
     property use color_page_background;
@@ -648,8 +653,11 @@ blockquote {margin: 1em; padding: 1em; $
 
 .entry-management-links, .entry-interaction-links, .comment-management-links, .comment-interaction-links {text-align: right; margin: 0; padding: 0; display: inline; }
 .entry-management-links li, .entry-interaction-links li,  .comment-management-links li, .comment-interaction-links li {display: inline; list-style: none; margin: 0; padding: 5px; }
-.entry-management-links li a, .comment-management-links li a, .comment-interaction-links .thread a {background-repeat: no-repeat; background-position: 0% 50%; padding-left: 18px; }
-.comment-management-links li.unscreen_comment a, .comment-management-links li.screen_comment a, .comment-management-links li.freeze_thread a { padding-left: 0; }
+.comment-management-links li.unscreen_comment a, .comment-management-links li.screen_comment a, .comment-management-links li.freeze_thread a { padding-left: 0; }""";
+
+if ( $*use_action_links_images ) {
+""".entry-management-links li a, .comment-management-links li a, .comment-interaction-links .thread a {background-repeat: no-repeat; background-position: 0% 50%; padding-left: 18px; }
+
 .entry-management-links .edit_entry a, .comment-management-links .delete_comment a, .comment-management-links .edit_comment a {background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_edit.png); }
 .entry-management-links .edit_tags a, .comment-interaction-links .parent a {background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_tag.png); }
 .entry-management-links .mem_add a {background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_add.png); }
@@ -658,8 +666,10 @@ blockquote {margin: 1em; padding: 1em; $
 .entry-management-links .link_next a {background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_arrow_right.png); }
 .entry-management-links .tell_friend a {background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_tell.png);}
 .entry-interaction-links .entry-readlink a, .entry-interaction-links .entry-permalink a { background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_comments.png); }
-.entry-interaction-links li a, .comment-interaction-links li a { background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_comment.png); background-repeat: no-repeat; background-position: 0% 50%; padding-left: 18px;  display: inline; }
+.entry-interaction-links li a, .comment-interaction-links li a { background-image: url($*STATDIR/skittlishdreams/${theme_base_color}_comment.png); background-repeat: no-repeat; background-position: 0% 50%; padding-left: 18px;  display: inline; }""";
+}
 
+"""
 .entry .footer hr {display: none; }
 .entry .metadata-label {font-weight: bold; }
 .full .comment-poster {display: inline-block; min-width: 40%; }
diff -r 27e14284313c -r 9aa5e013e2ed bin/upgrading/s2layers/skittlishdreams/themes.s2
--- a/bin/upgrading/s2layers/skittlishdreams/themes.s2	Thu Jan 13 11:55:17 2011 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/themes.s2	Thu Jan 13 12:08:26 2011 +0800
@@ -46,6 +46,8 @@ set color_module_title = "#444";
 ##===============================
 ## Images
 ##===============================
+
+set use_action_links_images = false;
 
 set image_background_container_url = "skittlishdreams/academy_shaddow.gif";
 set image_background_entry_url = "skittlishdreams/academy_edge.gif";
@@ -231,6 +233,8 @@ set color_module_title = "#fff";
 ## Images
 ##===============================
 
+set use_action_links_images = false;
+
 set image_background_container_url = "skittlishdreams/desertcream_shaddow.gif";
 set image_background_entry_url = "skittlishdreams/desertcream_edge.gif";
 set image_background_footer_url = "skittlishdreams/desertcream_bgb.gif";
@@ -355,6 +359,8 @@ set color_module_title = "#fff";
 ## Images
 ##===============================
 
+set use_action_links_images = false;
+
 set image_background_container_url = "skittlishdreams/inthebag_shaddow.gif";
 set image_background_entry_url = "skittlishdreams/inthebag_edge.gif";
 set image_background_footer_url = "skittlishdreams/inthebag_bgb.gif";
@@ -424,6 +430,8 @@ set color_module_title = "#fff";
 ##===============================
 ## Images
 ##===============================
+
+set use_action_links_images = false;
 
 set image_background_container_url = "skittlishdreams/likesunshine_shaddow.gif";
 set image_background_entry_url = "skittlishdreams/likesunshine_edge.gif";
@@ -663,6 +671,8 @@ set color_module_title = "#fff";
 ## Images
 ##===============================
 
+set use_action_links_images = false;
+
 set image_background_container_url = "skittlishdreams/snowcherries_shaddow.gif";
 set image_background_entry_url = "skittlishdreams/snowcherries_edge.gif";
 set image_background_footer_url = "skittlishdreams/snowcherries_bgb.gif";
--------------------------------------------------------------------------------