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-04-26 04:44 pm
  • Add Memory
  • Share This Entry

[dw-free] Wizard subheaders cleanup

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

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

Wizard subheaders cleanup, for user-friendliness.

Patch by [personal profile] afuna.

Files modified:
  • bin/upgrading/en.dat
  • cgi-bin/LJ/Customize.pm
  • cgi-bin/LJ/S2Theme.pm
  • cgi-bin/LJ/Widget/S2PropGroup.pm
--------------------------------------------------------------------------------
diff -r 0994eaccc677 -r 19d51b239e14 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Sun Apr 26 23:51:26 2009 +0800
+++ b/bin/upgrading/en.dat	Sun Apr 26 16:42:30 2009 +0000
@@ -640,57 +640,23 @@ customize.layouts.3=3 Column (sidebars o
 
 customize.layouts_for_dropdown.choose=(Choose a Layout)
 
-customize.propgroup_subheaders.calendar=Calendar
-
-customize.propgroup_subheaders.caption_bar=Caption Bar
-
-customize.propgroup_subheaders.comment=Comments
-
-customize.propgroup_subheaders.component=Components
-
-customize.propgroup_subheaders.custom=Custom
-
-customize.propgroup_subheaders.entry=Entries
-
-customize.propgroup_subheaders.free_text_sidebox=Free Text Sidebox
+customize.propgroup_subheaders.archive=Archive
+
+customize.propgroup_subheaders.comment=Comment
+
+customize.propgroup_subheaders.entry=Entry
+
+customize.propgroup_subheaders.footer=Footer
 
 customize.propgroup_subheaders.header=Header
 
-customize.propgroup_subheaders.header_bar=Header Bar
-
-customize.propgroup_subheaders.hotspot_area=Hotspot Area
-
-customize.propgroup_subheaders.icon=Icon
-
-customize.propgroup_subheaders.links_sidebox=Links Sidebox
-
-customize.propgroup_subheaders.multisearch_sidebox=Multisearch Sidebox
+customize.propgroup_subheaders.module=Module
 
 customize.propgroup_subheaders.navigation=Navigation
 
-customize.propgroup_subheaders.navigation_box=Navigation Box
-
-customize.propgroup_subheaders.ordering=Ordering
-
 customize.propgroup_subheaders.page=Page
 
-customize.propgroup_subheaders.setup=Setup
-
-customize.propgroup_subheaders.sidebar=Sidebar
-
-customize.propgroup_subheaders.sidebox=Sidebox
-
-customize.propgroup_subheaders.tabs_and_headers=Tabs and Headers
-
-customize.propgroup_subheaders.tags_sidebox=Tags Sidebox
-
-customize.propgroup_subheaders.text=Text
-
-customize.propgroup_subheaders.title=Title
-
-customize.propgroup_subheaders.title_box=Title Box
-
-customize.propgroup_subheaders.top_bar=Top Bar
+customize.propgroup_subheaders.unsorted=Options
 
 date.day.friday.long=Friday
 
diff -r 0994eaccc677 -r 19d51b239e14 cgi-bin/LJ/Customize.pm
--- a/cgi-bin/LJ/Customize.pm	Sun Apr 26 23:51:26 2009 +0800
+++ b/cgi-bin/LJ/Customize.pm	Sun Apr 26 16:42:30 2009 +0000
@@ -689,63 +689,33 @@ sub get_layouts {
 
 sub get_propgroup_subheaders {
     return (
-        page => LJ::Lang::ml('customize.propgroup_subheaders.page'),
-        navigation => LJ::Lang::ml('customize.propgroup_subheaders.navigation'),
-        navigation_box => LJ::Lang::ml('customize.propgroup_subheaders.navigation_box'),
-        text => LJ::Lang::ml('customize.propgroup_subheaders.text'),
-        title => LJ::Lang::ml('customize.propgroup_subheaders.title'),
-        title_box => LJ::Lang::ml('customize.propgroup_subheaders.title_box'),
-        top_bar => LJ::Lang::ml('customize.propgroup_subheaders.top_bar'),
-        header => LJ::Lang::ml('customize.propgroup_subheaders.header'),
-        tabs_and_headers => LJ::Lang::ml('customize.propgroup_subheaders.tabs_and_headers'),
-        header_bar => LJ::Lang::ml('customize.propgroup_subheaders.header_bar'),
-        icon => LJ::Lang::ml('customize.propgroup_subheaders.icon'),
-        sidebar => LJ::Lang::ml('customize.propgroup_subheaders.sidebar'),
-        caption_bar => LJ::Lang::ml('customize.propgroup_subheaders.caption_bar'),
-        entry => LJ::Lang::ml('customize.propgroup_subheaders.entry'),
-        comment => LJ::Lang::ml('customize.propgroup_subheaders.comment'),
-        sidebox => LJ::Lang::ml('customize.propgroup_subheaders.sidebox'),
-        links_sidebox => LJ::Lang::ml('customize.propgroup_subheaders.links_sidebox'),
-        tags_sidebox => LJ::Lang::ml('customize.propgroup_subheaders.tags_sidebox'),
-        multisearch_sidebox => LJ::Lang::ml('customize.propgroup_subheaders.multisearch_sidebox'),
-        free_text_sidebox => LJ::Lang::ml('customize.propgroup_subheaders.free_text_sidebox'),
-        hotspot_area => LJ::Lang::ml('customize.propgroup_subheaders.hotspot_area'),
-        calendar => LJ::Lang::ml('customize.propgroup_subheaders.calendar'),
-        component => LJ::Lang::ml('customize.propgroup_subheaders.component'),
-        setup => LJ::Lang::ml('customize.propgroup_subheaders.setup'),
-        ordering => LJ::Lang::ml('customize.propgroup_subheaders.ordering'),
-        custom => LJ::Lang::ml('customize.propgroup_subheaders.custom'),
+        page => LJ::Lang::ml( 'customize.propgroup_subheaders.page' ),
+        module => LJ::Lang::ml( 'customize.propgroup_subheaders.module' ),
+        navigation => LJ::Lang::ml( 'customize.propgroup_subheaders.navigation' ),
+        header => LJ::Lang::ml( 'customize.propgroup_subheaders.header' ),
+        entry => LJ::Lang::ml( 'customize.propgroup_subheaders.entry' ),
+        comment => LJ::Lang::ml( 'customize.propgroup_subheaders.comment' ),
+        archive => LJ::Lang::ml( 'customize.propgroup_subheaders.archive' ),
+        footer => LJ::Lang::ml( 'customize.propgroup_subheaders.footer' ),
+
+        unsorted => LJ::Lang::ml( 'customize.propgroup_subheaders.unsorted' ),
     );
 }
 
 sub get_propgroup_subheaders_order {
-    return qw(
+    return ( 
+    qw (
         page
+        module
         navigation
-        navigation_box
-        text
-        title
-        title_box
-        top_bar
         header
-        tabs_and_headers
-        header_bar
-        icon
-        sidebar
-        caption_bar
+        footer
         entry
         comment
-        sidebox
-        links_sidebox
-        tags_sidebox
-        multisearch_sidebox
-        free_text_sidebox
-        hotspot_area
-        calendar
-        component
-        setup
-        ordering
-        custom
+        archive
+        unsorted
+    )
+
     );
 }
 
diff -r 0994eaccc677 -r 19d51b239e14 cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Sun Apr 26 23:51:26 2009 +0800
+++ b/cgi-bin/LJ/S2Theme.pm	Sun Apr 26 16:42:30 2009 +0000
@@ -673,30 +673,113 @@ sub display_option_props {
         linklist_support
     )
 }
-sub navigation_props { () }
-sub navigation_box_props { () }
-sub text_props { () }
-sub title_props { () }
-sub title_box_props { () }
-sub top_bar_props { () }
-sub header_props { () }
-sub tabs_and_headers_props { () }
-sub header_bar_props { () }
-sub icon_props { () }
-sub sidebar_props { () }
-sub caption_bar_props { () }
-sub entry_props { () }
-sub comment_props { () }
-sub sidebox_props { () }
-sub links_sidebox_props { () }
-sub tags_sidebox_props { () }
-sub multisearch_sidebox_props { () }
-sub free_text_sidebox_props { () }
-sub hotspot_area_props { () }
-sub calendar_props { () }
-sub component_props { () }
-sub setup_props { () }
-sub ordering_props { () }
-sub custom_props { () }
+
+sub module_props {
+    qw (
+        text_module_links
+        text_module_pagesummary
+        text_module_syndicate
+        text_module_tags
+        text_generated_on
+        text_tags_manage
+        text_tag_uses
+        color_module_background
+        color_module_text
+        color_module_border
+        color_module_link
+        color_module_link_active
+        color_module_link_hover
+        color_module_link_visited
+        color_module_title
+    )
+}
+
+sub navigation_props { 
+    qw (
+        text_view_archive
+        text_view_friends
+        text_view_friends_comm
+        text_view_friends_filter
+        text_view_memories
+        text_view_recent
+        text_view_userinfo
+    ) 
+}
+
+sub header_props {
+    qw (
+        text_tags_page_header
+        color_header_background
+        
+    )
+}
+
+sub entry_props {
+    qw (
+        text_edit_entry
+        text_edit_tags
+        text_mem_add
+        text_post_comment
+        text_read_comments
+        text_entry_prev
+        text_entry_next
+        text_tell_friend
+        text_meta_mood
+        text_meta_music
+        text_meta_groups
+        text_meta_location
+        text_nosubject
+        text_watch_comments
+        text_unwatch_comments
+        text_tags
+        color_entry_link
+        color_entry_link_active
+        color_entry_link_hover
+        color_entry_link_visited
+        color_entry_border
+        color_entry_background
+        color_entry_text
+        color_entry_title
+        color_entry_interaction_links
+    )
+}
+
+sub comment_props {
+    qw (
+        text_comment_date
+        text_comment_edittime
+        text_comment_expand
+        text_comment_from
+        text_comment_frozen
+        text_comment_ipaddr
+        text_comment_parent
+        text_comment_posted
+        text_comment_reply
+        text_comment_thread
+        color_comment_bar
+    )
+}
+
+sub archive_props {
+    qw (
+        text_day_next
+        text_day_prev
+        text_view_month
+    )
+}
+
+sub page_props {
+    qw (
+        color_page_background
+        color_page_text
+        color_page_link
+        color_page_link_active
+        color_page_link_hover
+        color_page_link_visited
+        color_page_title
+    )
+}
+
+sub footer_props {}
 
 1;
diff -r 0994eaccc677 -r 19d51b239e14 cgi-bin/LJ/Widget/S2PropGroup.pm
--- a/cgi-bin/LJ/Widget/S2PropGroup.pm	Sun Apr 26 23:51:26 2009 +0800
+++ b/cgi-bin/LJ/Widget/S2PropGroup.pm	Sun Apr 26 16:42:30 2009 +0000
@@ -132,12 +132,12 @@ sub render_body {
     } else {
         my %subheaders = LJ::Customize->get_propgroup_subheaders;
 
-        # props under the "Page" subheader include all props in the group that aren't under any of the other subheaders
-        my %page_props = map { $_ => 1 } @$groupprops;
+        # props under the unsorted subheader include all props in the group that aren't under any of the other subheaders
+        my %unsorted_props = map { $_ => 1 } @$groupprops;
         foreach my $subheader (keys %subheaders) {
             my @subheader_props = eval "\$theme->${subheader}_props";
             foreach my $prop_name (@subheader_props) {
-                delete $page_props{$prop_name} if $page_props{$prop_name};
+                delete $unsorted_props{$prop_name} if $unsorted_props{$prop_name};
             }
         }
 
@@ -146,8 +146,8 @@ sub render_body {
             my $header_printed = 0;
 
             my @subheader_props;
-            if ($subheader eq "page") {
-                @subheader_props = keys %page_props;
+            if ( $subheader eq "unsorted" ) {
+                @subheader_props = keys %unsorted_props;
             } else {
                 @subheader_props = eval "\$theme->${subheader}_props";
             }
--------------------------------------------------------------------------------
  • 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.
HTML doesn't work in the subject.
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.