[dw-free] Marginless: sort and rephrase custom props

[fu]

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

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

Rephrase and sort extra color options.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/marginless/layout.s2
• cgi-bin/LJ/S2Theme/marginless.pm

--------------------------------------------------------------------------------
diff -r 2e3cd92fc9af -r f8eb77eff62c bin/upgrading/s2layers/marginless/layout.s2
--- a/bin/upgrading/s2layers/marginless/layout.s2	Wed Apr 04 14:37:29 2012 +0800
+++ b/bin/upgrading/s2layers/marginless/layout.s2	Wed Apr 04 15:15:00 2012 +0800
@@ -29,11 +29,11 @@
 ##===============================
 
 propgroup colors_child {
-    property Color color_calendar_background { des = "Background color for calendar on Archive page"; }
-    property Color color_calendar_entry { des = "Background color for a day with entries on the calendar"; }
-    property Color color_comment_title_even { des = "Comment title alternate color"; }
-    property Color color_comment_title_background_even { des = "Comment title alternate background color"; }
-    property Color color_userpic_background { des = "Border color for user icon on sidebar and in entries"; }
+    property Color color_calendar_background { des = "Calendar background color on Archive page"; }
+    property Color color_calendar_entry { des = "Day background color on Archive page"; }
+    property Color color_comment_title_even { des = "Alternate comment title color"; }
+    property Color color_comment_title_background_even { des = "Alternate comment title background color"; }
+    property Color color_userpic_background { des = "Icon border color"; }
     }
 
 ##===============================
diff -r 2e3cd92fc9af -r f8eb77eff62c cgi-bin/LJ/S2Theme/marginless.pm
--- a/cgi-bin/LJ/S2Theme/marginless.pm	Wed Apr 04 14:37:29 2012 +0800
+++ b/cgi-bin/LJ/S2Theme/marginless.pm	Wed Apr 04 15:15:00 2012 +0800
@@ -1,8 +1,26 @@
 package LJ::S2Theme::marginless;
 use base qw( LJ::S2Theme );
 use strict;
- 
+
 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" }
- 
+
+sub page_props {
+    my $self = shift;
+    my @props = qw( color_userpic_background );
+    return $self->_append_props( "page_props", @props );
+}
+
+sub archive_props {
+    my $self = shift;
+    my @props = qw( color_calendar_background color_calendar_entry );
+    return $self->_append_props( "archive_props", @props );
+}
+
+sub comment_props {
+    my $self = shift;
+    my @props = qw( color_comment_title_even color_comment_title_background_even );
+    return $self->_append_props( "comment_props", @props );
+}
+
 1;
--------------------------------------------------------------------------------