afuna: Cat under a blanket. Text: "Cats are just little people with Fur and Fangs" (Default)
afuna ([personal profile] afuna) wrote in [site community profile] changelog2009-09-10 02:46 pm

[dw-free] Base layouts category for styles

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

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

Show one of each layout type.

Patch by [personal profile] afuna.

Files modified:
  • bin/upgrading/en.dat
  • cgi-bin/LJ/Customize.pm
  • cgi-bin/LJ/S2Theme/bases.pm
  • cgi-bin/LJ/S2Theme/basicboxes.pm
  • cgi-bin/LJ/S2Theme/blanket.pm
  • cgi-bin/LJ/S2Theme/boxesandborders.pm
  • cgi-bin/LJ/S2Theme/core2base.pm
  • cgi-bin/LJ/S2Theme/drifting.pm
  • cgi-bin/LJ/S2Theme/negatives.pm
  • cgi-bin/LJ/S2Theme/steppingstones.pm
  • cgi-bin/LJ/S2Theme/zesty.pm
--------------------------------------------------------------------------------
diff -r e81adb64800f -r e544b4ba04fa bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Wed Sep 09 23:41:27 2009 +0000
+++ b/bin/upgrading/en.dat	Thu Sep 10 14:45:26 2009 +0000
@@ -615,6 +615,8 @@ crumb.yourstyles=Your Styles
 crumb.yourstyles=Your Styles
 
 customize.cats.all=All
+
+customize.cats.base=Base Layouts
 
 customize.cats.custom=Your Custom Layers
 
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/Customize.pm
--- a/cgi-bin/LJ/Customize.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/Customize.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -667,13 +667,19 @@ sub get_cats {
         special => {
             text => LJ::Lang::ml('customize.cats.special'),
             main => 1,
-            order => 3,
+            order => 4,
         },
         custom => {
             text => LJ::Lang::ml('customize.cats.custom'),
             main => 1,
-            order => 4,
+            order => 5,
         },
+        base => {
+            text => LJ::Lang::ml( 'customize.cats.base' ),
+            main => 1,
+            order => 3,
+        },
+
     );
 
     LJ::run_hooks("modify_cat_list", \@categories, user => $u,);
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/bases.pm
--- a/cgi-bin/LJ/S2Theme/bases.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/bases.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -9,7 +9,7 @@ sub designer { "Malionette" }
 
 package LJ::S2Theme::bases::tropical;
 use base qw( LJ::S2Theme::bases );
-sub cats { qw( featured ) }
+sub cats { qw( featured base ) }
 
 package LJ::S2Theme::bases::summerholiday;
 use base qw( LJ::S2Theme::bases );
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/basicboxes.pm
--- a/cgi-bin/LJ/S2Theme/basicboxes.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/basicboxes.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -25,7 +25,7 @@ sub cats { qw( featured ) }
 
 package LJ::S2Theme::basicboxes::green;
 use base qw( LJ::S2Theme::basicboxes );
-sub cats { qw() }
+sub cats { qw( base ) }
 
 package LJ::S2Theme::basicboxes::leaf;
 use base qw( LJ::S2Theme::basicboxes );
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/blanket.pm
--- a/cgi-bin/LJ/S2Theme/blanket.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/blanket.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -9,7 +9,7 @@ sub designer { "renoir" }
 
 package LJ::S2Theme::blanket::peach;
 use base qw( LJ::S2Theme::blanket );
-sub cats { qw( featured ) }
+sub cats { qw( featured base ) }
 
 1;
 
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/boxesandborders.pm
--- a/cgi-bin/LJ/S2Theme/boxesandborders.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/boxesandborders.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -9,6 +9,6 @@ sub designer { "branchandroot" }
 
 package LJ::S2Theme::boxesandborders::gray;
 use base qw( LJ::S2Theme::boxesandborders );
-sub cats { qw( featured ) }
+sub cats { qw( featured base ) }
 
 1;
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/core2base.pm
--- a/cgi-bin/LJ/S2Theme/core2base.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/core2base.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -4,4 +4,7 @@ sub layouts { ( "1" => "one-column", "2l
 sub layouts { ( "1" => "one-column", "2l" => "two-columns-left", "2r" => "two-columns-right", "3" => "three-columns-sides", "3r" => "three-columns-right", "3l" => "three-columns-left" ) }
 sub layout_prop { "layout_type" }
 
-1;
\ No newline at end of file
+package LJ::S2Theme::core2base::testing;
+use base qw( LJ::S2Theme::core2base );
+sub cats { qw( base )}
+1;
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/drifting.pm
--- a/cgi-bin/LJ/S2Theme/drifting.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/drifting.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -1,7 +1,7 @@ package LJ::S2Theme::drifting;
 package LJ::S2Theme::drifting;
 use base qw(LJ::S2Theme);
 
-sub cats { qw( featured ) }
+sub cats { qw( featured base ) }
 sub designer { "Jennie Griner" }
 
 sub layouts { ( "2l" => "two-columns-left" ) }
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/negatives.pm
--- a/cgi-bin/LJ/S2Theme/negatives.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/negatives.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -9,7 +9,7 @@ sub layout_prop { "layout_type" }
 
 package LJ::S2Theme::negatives::black;
 use base qw( LJ::S2Theme::negatives );
-sub cats { qw() }
+sub cats { qw( base ) }
 
 package LJ::S2Theme::negatives::blastedsands;
 use base qw( LJ::S2Theme::negatives );
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/steppingstones.pm
--- a/cgi-bin/LJ/S2Theme/steppingstones.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/steppingstones.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -29,7 +29,7 @@ sub cats { qw( ) }
 
 package LJ::S2Theme::steppingstones::purple;
 use base qw( LJ::S2Theme::steppingstones );
-sub cats { qw() }
+sub cats { qw( base ) }
 
 package LJ::S2Theme::steppingstones::shadows;
 use base qw( LJ::S2Theme::steppingstones );
diff -r e81adb64800f -r e544b4ba04fa cgi-bin/LJ/S2Theme/zesty.pm
--- a/cgi-bin/LJ/S2Theme/zesty.pm	Wed Sep 09 23:41:27 2009 +0000
+++ b/cgi-bin/LJ/S2Theme/zesty.pm	Thu Sep 10 14:45:26 2009 +0000
@@ -1,7 +1,7 @@ package LJ::S2Theme::zesty;
 package LJ::S2Theme::zesty;
 use base qw( LJ::S2Theme );
 
-sub cats { qw() }
+sub cats { qw( base ) }
 sub designer { "exampleusername" }
 
 1;
--------------------------------------------------------------------------------