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

[dw-free] Nouveau Oleanders: themes not sorted alphabetically in .s2 and .pm files and refers to mod

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

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

Alphabetize themes, fix reference to modish, tweak spelling.

Patch by [personal profile] dancing_serpent.

Files modified:
  • bin/upgrading/s2layers/nouveauoleanders/themes.s2
  • cgi-bin/LJ/S2Theme/nouveauoleanders.pm
--------------------------------------------------------------------------------
diff -r 15a5a8e65b64 -r 1543dbb2b1b3 bin/upgrading/s2layers/nouveauoleanders/themes.s2
--- a/bin/upgrading/s2layers/nouveauoleanders/themes.s2	Thu Jun 10 18:40:37 2010 +0800
+++ b/bin/upgrading/s2layers/nouveauoleanders/themes.s2	Thu Jun 10 18:44:08 2010 +0800
@@ -1,157 +1,3 @@
-#NEWLAYER: nouveauoleanders/sienna
-layerinfo "type" = "theme";
-layerinfo "name" = "Sienna";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/sienna";
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
-##===============================
-## Page Colors
-##===============================
-
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#900";
-set color_page_link_visited = "#600";
-set color_page_link_hover = "";
-set color_page_link_active = "#f00";
-set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_header_background = "#000";
-set color_footer_background = "#000";
-set color_footer_link = "#fff";
-set color_footer_link_visited = "#ddd";
-
-##===============================
-## Entry Colors
-##===============================
-
-set color_entry_border = "#000";
-set color_entry_title = "#000";
-
-##===============================
-## Module Colors
-##===============================
-
-set color_module_background = "#7C7363";
-set color_module_text = "#fff";
-set color_module_link = "#fff";
-set color_module_link_visited = "#ddd";
-set color_module_link_hover = "";
-set color_module_link_active = "#900";
-set color_module_title = "#fff";
-set color_module_title_background = "#000";
-
-
-#NEWLAYER: nouveauoleanders/piquant
-layerinfo "type" = "theme";
-layerinfo "name" = "Piquant";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/piquant";
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
-#uses the "I'm a fat tomato" palatte by BobWestbrook (http://www.colourlovers.com/palette/912675/Im_a_fat_tomato)
-
-##===============================
-## Page Colors
-##===============================
-
-set color_page_background = "#9E9767";
-set color_page_text = "#fff";
-set color_page_link = "#eee";
-set color_page_link_visited = "#ddd";
-set color_page_link_hover = "";
-set color_page_link_active = "#c00";
-set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_header_background = "#3A0404";
-set color_footer_background = "#4A0404";
-set color_footer_link = "#fff";
-set color_footer_link_visited = "#ddd";
-
-##===============================
-## Entry Colors
-##===============================
-
-set color_entry_border = "#000";
-set color_entry_title = "#fff";
-
-##===============================
-## Module Colors
-##===============================
-
-set color_module_background = "#524D2D";
-set color_module_text = "#fff";
-set color_module_link = "#fff";
-set color_module_link_visited = "#ddd";
-set color_module_link_hover = "";
-set color_module_link_active = "";
-set color_module_title = "#fff";
-set color_module_title_background = "#000";
-
-
-#NEWLAYER: nouveauoleanders/wisteria
-layerinfo "type" = "theme";
-layerinfo "name" = "Wisteria";
-layerinfo author_name = "branchandroot";
-layerinfo redist_uniq = "nouveauoleanders/wisteria";
-
-set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
-
-#uses the "Siren" palatte by Faeleia (http://www.colourlovers.com/palette/912366/Siren)
-
-##===============================
-## Page Colors
-##===============================
-
-set color_page_background = "#fff";
-set color_page_text = "#000";
-set color_page_link = "#D7B55C";
-set color_page_link_visited = "#9F7DA1";
-set color_page_link_hover = "";
-set color_page_link_active = "#c00";
-set color_page_title = "#fff";
-
-##===============================
-## Header and Footer Colors
-##===============================
-
-set color_header_background = "#4A3549";#293066
-set color_footer_background = "#4A3549";
-set color_footer_link = "#fff";
-set color_footer_link_visited = "#ddd";
-
-##===============================
-## Entry Colors
-##===============================
-
-set color_entry_border = "#000";
-set color_entry_title = "#000";
-
-##===============================
-## Module Colors
-##===============================
-
-set color_module_background = "#856685";
-set color_module_text = "#fff";
-set color_module_link = "#eee";
-set color_module_link_visited = "#ddd";
-set color_module_link_hover = "";
-set color_module_link_active = "#D7B55C";
-set color_module_title = "#fff";
-set color_module_title_background = "#000";
-
-
 #NEWLAYER: nouveauoleanders/dustyantique
 layerinfo "type" = "theme";
 layerinfo "name" = "Dusty Antique";
@@ -160,7 +6,7 @@ layerinfo redist_uniq = "nouveauoleander
 
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
-#uses the "i'm home again" palatte by dinsdale (http://www.colourlovers.com/palette/130396/im_home_again)
+#uses the "i'm home again" palette by dinsdale (http://www.colourlovers.com/palette/130396/im_home_again)
 
 ##===============================
 ## Page Colors
@@ -260,6 +106,58 @@ set color_module_title = "#ffffff";
 set color_module_title = "#ffffff";
 
 
+#NEWLAYER: nouveauoleanders/piquant
+layerinfo "type" = "theme";
+layerinfo "name" = "Piquant";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "nouveauoleanders/piquant";
+
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
+#uses the "I'm a fat tomato" palette by BobWestbrook (http://www.colourlovers.com/palette/912675/Im_a_fat_tomato)
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#9E9767";
+set color_page_text = "#fff";
+set color_page_link = "#eee";
+set color_page_link_visited = "#ddd";
+set color_page_link_hover = "";
+set color_page_link_active = "#c00";
+set color_page_title = "#fff";
+
+##===============================
+## Header and Footer Colors
+##===============================
+
+set color_header_background = "#3A0404";
+set color_footer_background = "#4A0404";
+set color_footer_link = "#fff";
+set color_footer_link_visited = "#ddd";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_border = "#000";
+set color_entry_title = "#fff";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#524D2D";
+set color_module_text = "#fff";
+set color_module_link = "#fff";
+set color_module_link_visited = "#ddd";
+set color_module_link_hover = "";
+set color_module_link_active = "";
+set color_module_title = "#fff";
+set color_module_title_background = "#000";
+
+
 #NEWLAYER: nouveauoleanders/seaandsalt
 layerinfo "type" = "theme";
 layerinfo "name" = "Sea and Salt";
@@ -268,7 +166,7 @@ layerinfo redist_uniq = "nouveauoleander
 
 set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
 
-#uses the "Oceanside Twilight" palatte by BlueLou (http://www.colourlovers.com/palette/912345/Oceanside_Twilight)
+#uses the "Oceanside Twilight" palette by BlueLou (http://www.colourlovers.com/palette/912345/Oceanside_Twilight)
 
 ##===============================
 ## Page Colors
@@ -311,3 +209,105 @@ set color_module_title = "#fff";
 set color_module_title = "#fff";
 set color_module_title_background = "#000";
 
+
+#NEWLAYER: nouveauoleanders/sienna
+layerinfo "type" = "theme";
+layerinfo "name" = "Sienna";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "nouveauoleanders/sienna";
+
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#fff";
+set color_page_text = "#000";
+set color_page_link = "#900";
+set color_page_link_visited = "#600";
+set color_page_link_hover = "";
+set color_page_link_active = "#f00";
+set color_page_title = "#fff";
+
+##===============================
+## Header and Footer Colors
+##===============================
+
+set color_header_background = "#000";
+set color_footer_background = "#000";
+set color_footer_link = "#fff";
+set color_footer_link_visited = "#ddd";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_border = "#000";
+set color_entry_title = "#000";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#7C7363";
+set color_module_text = "#fff";
+set color_module_link = "#fff";
+set color_module_link_visited = "#ddd";
+set color_module_link_hover = "";
+set color_module_link_active = "#900";
+set color_module_title = "#fff";
+set color_module_title_background = "#000";
+
+
+#NEWLAYER: nouveauoleanders/wisteria
+layerinfo "type" = "theme";
+layerinfo "name" = "Wisteria";
+layerinfo author_name = "branchandroot";
+layerinfo redist_uniq = "nouveauoleanders/wisteria";
+
+set layout_resources = [ { "name" => "OpenClipart", "url" => "http://www.openclipart.org/" } ];
+
+#uses the "Siren" palette by Faeleia (http://www.colourlovers.com/palette/912366/Siren)
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#fff";
+set color_page_text = "#000";
+set color_page_link = "#D7B55C";
+set color_page_link_visited = "#9F7DA1";
+set color_page_link_hover = "";
+set color_page_link_active = "#c00";
+set color_page_title = "#fff";
+
+##===============================
+## Header and Footer Colors
+##===============================
+
+set color_header_background = "#4A3549";#293066
+set color_footer_background = "#4A3549";
+set color_footer_link = "#fff";
+set color_footer_link_visited = "#ddd";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_border = "#000";
+set color_entry_title = "#000";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#856685";
+set color_module_text = "#fff";
+set color_module_link = "#eee";
+set color_module_link_visited = "#ddd";
+set color_module_link_hover = "";
+set color_module_link_active = "#D7B55C";
+set color_module_title = "#fff";
+set color_module_title_background = "#000";
+
diff -r 15a5a8e65b64 -r 1543dbb2b1b3 cgi-bin/LJ/S2Theme/nouveauoleanders.pm
--- a/cgi-bin/LJ/S2Theme/nouveauoleanders.pm	Thu Jun 10 18:40:37 2010 +0800
+++ b/cgi-bin/LJ/S2Theme/nouveauoleanders.pm	Thu Jun 10 18:44:08 2010 +0800
@@ -6,29 +6,29 @@ sub layout_prop { "layout_type" }
 
 sub designer { "branchandroot" }
 
-package LJ::S2Theme::nouveauoleanders::sienna;
-use base qw( LJ::S2Theme::modish );
-sub cats { qw( base ) }
-
-package LJ::S2Theme::nouveauoleanders::piquant;
-use base qw( LJ::S2Theme::modish );
-sub cats { qw() }
-
-package LJ::S2Theme::nouveauoleanders::wisteria;
-use base qw( LJ::S2Theme::modish );
-sub cats { qw() }
-
 package LJ::S2Theme::nouveauoleanders::dustyantique;
-use base qw( LJ::S2Theme::modish );
+use base qw( LJ::S2Theme::nouveauoleanders );
 sub cats { qw() }
 
 package LJ::S2Theme::nouveauoleanders::huntergreen;
-use base qw( LJ::S2Theme::modish );
+use base qw( LJ::S2Theme::nouveauoleanders );
 sub cats { qw() }
 sub designer { "dancing_serpent" }
 
+package LJ::S2Theme::nouveauoleanders::piquant;
+use base qw( LJ::S2Theme::nouveauoleanders );
+sub cats { qw() }
+
 package LJ::S2Theme::nouveauoleanders::seaandsalt;
-use base qw( LJ::S2Theme::modish );
+use base qw( LJ::S2Theme::nouveauoleanders );
 sub cats { qw( featured ) }
 
+package LJ::S2Theme::nouveauoleanders::sienna;
+use base qw( LJ::S2Theme::nouveauoleanders );
+sub cats { qw( base ) }
+
+package LJ::S2Theme::nouveauoleanders::wisteria;
+use base qw( LJ::S2Theme::nouveauoleanders );
+sub cats { qw() }
+
 1;
--------------------------------------------------------------------------------
  • Add Memory
  • Share This Entry
(0 comments)

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
No Subject Icon Selected
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org

 
Notice: This account is set to log the IP addresses of everyone who comments.
Links will be displayed as unclickable URLs to help prevent spam.