fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2012-07-17 04:33 am
  • Add Memory
  • Share This Entry

[dw-free] Customize: reorder some options

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

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

Reorder options in Bases.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/bases/layout.s2
--------------------------------------------------------------------------------
diff -r 33c36f472705 -r 25229cf3cfd1 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Mon Jul 16 21:18:40 2012 -0700
+++ b/bin/upgrading/s2layers/bases/layout.s2	Mon Jul 16 21:36:49 2012 -0700
@@ -4,64 +4,47 @@
 layerinfo "author_name" = "Malionette";
 layerinfo "lang" = "en";
 
-set layout_type = "two-columns-right";
 set layout_authors = [ { "name" => "malionette", "type" => "user" } ];
 
 ##===============================
-## Display settings - general
+## Presentation
 ##===============================
 
 propgroup presentation {
+    property use layout_type;
     property use num_items_recent;
     property use num_items_reading;
+    property use use_custom_friend_colors;
+    property use use_shared_pic;
+    property use use_journalstyle_entry_page;
+
+    property use tags_page_type;
     property use num_items_icons;
-    property use use_journalstyle_entry_page;
-    property use layout_type;
-    property use tags_page_type;
     property use icons_page_sort;
+
+    property use all_entrysubjects;
+    property use all_commentsubjects;
+    property use entry_datetime_format_group;
+    property use comment_datetime_format_group;
     property use userpics_style_group;
     property use userpics_position;
     property use entry_metadata_position;
-    property use use_custom_friend_colors;
-    property use use_shared_pic;
     property use userlite_interaction_links;
     property use entry_management_links;
     property use comment_management_links;
+
     property use reg_firstdayofweek;
-    property use entry_datetime_format_group;
-    property use comment_datetime_format_group;
-    property use all_entrysubjects;
-    property use all_commentsubjects;
 }
 
-set module_layout_sections = "none|(none)|one|Group One";
+set layout_type = "two-columns-right";
+set num_items_recent = 10;
+set num_items_reading = 10;
+set custom_foreground_element = "userpic_border";
+set custom_background_element = "userpic_background";
+set userpics_position = "right";
 
 ##===============================
-## Navigation Module
-##===============================
-
-property string module_navlinks_section_override {
-    values = "none|(none)|header|Header|one|Group One";
-    grouped = 1;
-}
-
-set grouped_property_override = { "module_navlinks_section" => "module_navlinks_section_override" };
-
-set module_navlinks_section = "header";
-
-set num_items_recent = 10;
-set num_items_reading = 10;
-set userpics_position = "right";
-set use_custom_friend_colors = false;
-
-set show_userpics_recent = true;
-set linklist_support = true;
-
-set custom_foreground_element = "userpic_border";
-set custom_background_element = "userpic_background";
-
-##===============================
-## Journal style - colors
+## Colors
 ##===============================
 
 propgroup colors {
@@ -72,7 +55,6 @@
     property use color_page_link_hover;
     property use color_page_link_visited;
     property use color_page_border;
-    property use color_page_title;
 
     property use color_header_background;
 
@@ -82,9 +64,12 @@
     property use color_module_link_active;
     property use color_module_link_hover;
     property use color_module_link_visited;
+    property use color_module_title_background;
+    property use color_module_title;
     property use color_module_border;
-    property use color_module_title;
-    property use color_module_title_background;
+
+    property use color_header_background;
+    property use color_page_title;
 
     property use color_entry_background;
     property use color_entry_text;
@@ -92,21 +77,27 @@
     property use color_entry_link_active;
     property use color_entry_link_hover;
     property use color_entry_link_visited;
+    property use color_entry_title_background;
+    property use color_entry_title;
+    property use color_entry_interaction_links;
     property use color_entry_border;
-    property use color_entry_title;
-    property use color_entry_title_background;
-    property use color_entry_interaction_links;
-
     property use color_comment_title_background;
-
 }
 
-
+##===============================
+## Fonts
+##===============================
 propgroup fonts {
     property use font_base;
     property use font_fallback;
     property use font_base_size;
     property use font_base_units;
+    property use font_module_heading;
+    property use font_module_heading_size;
+    property use font_module_heading_units;
+    property use font_module_text;
+    property use font_module_text_size;
+    property use font_module_text_units;
     property use font_journal_title;
     property use font_journal_title_size;
     property use font_journal_title_units;
@@ -119,75 +110,117 @@
     property use font_comment_title;
     property use font_comment_title_size;
     property use font_comment_title_units;
-    property use font_module_heading;
-    property use font_module_heading_size;
-    property use font_module_heading_units;
-    property use font_module_text;
-    property use font_module_text_size;
-    property use font_module_text_units;
 }
 
 set font_base = "Arial";
 set font_fallback = "sans-serif";
-set font_base_size  = "1";
+set font_base_size = "1";
 set font_base_units = "em";
-
-set font_journal_title  = "Arial";
-set font_journal_title_size  = "2.25";
+set font_module_heading = "Arial";
+set font_module_heading_size = "1";
+set font_module_heading_units = "em";
+set font_module_text = "Arial";
+set font_module_text_size = "1";
+set font_module_text_units = "em";
+set font_journal_title = "Arial";
+set font_journal_title_size = "2.25";
 set font_journal_title_units = "em";
-
-set font_journal_subtitle  = "Arial";
-set font_journal_subtitle_size  = "1.125";
+set font_journal_subtitle = "Arial";
+set font_journal_subtitle_size = "1.125";
 set font_journal_subtitle_units = "em";
-
-set font_module_text  = "Arial";
-set font_module_text_size  = "1";
-set font_module_text_units = "em";
-
-set font_module_heading  = "Arial";
-set font_module_heading_size  = "1";
-set font_module_heading_units = "em";
-
-set font_entry_title  = "Arial";
-set font_entry_title_size  = "1.25";
+set font_entry_title = "Arial";
+set font_entry_title_size = "1.25";
 set font_entry_title_units = "em";
-
-set font_comment_title_size  = "1.5";
+set font_comment_title_size = "1.5";
 set font_comment_title_units = "em";
 
 ##===============================
-## Display settings - images
+## Images
 ##===============================
 
 propgroup images {
     property use image_background_page_group;
+    property use image_background_module_group;
     property use image_background_header_group;
     property use image_background_header_height;
     property use image_background_entry_group;
-    property use image_background_module_group;
 }
 
 ##===============================
-## Display settings - modules
+## Modules
 ##===============================
 
 propgroup modules {
     property use module_userprofile_group;
     property use module_navlinks_group;
-    property use module_customtext_group;
     property use module_calendar_group;
-    property use module_pagesummary_group;
-    property use module_tags_group;
-    property use module_active_group;
     property use module_links_group;
     property use module_syndicate_group;
+    property use module_tags_group;
+    property use module_pagesummary_group;
+    property use module_active_group;
     property use module_time_group;
     property use module_poweredby_group;
+    property use module_customtext_group;
     property use module_credit_group;
     property use module_search_group;
     property use module_cuttagcontrols_group;
 }
 
+property string module_navlinks_section_override {
+    values = "none|(none)|header|Header|one|Group One";
+    grouped = 1;
+}
+
+set module_layout_sections = "none|(none)|one|Group One";
+set grouped_property_override = { "module_navlinks_section" => "module_navlinks_section_override" };
+set module_navlinks_section = "header";
+
+##===============================
+## Text
+##===============================
+
+propgroup text {
+    property use text_module_customtext;
+    property use text_module_customtext_content;
+    property use text_module_customtext_url;
+
+    property use text_view_recent;
+    property use text_view_archive;
+    property use text_view_friends;
+    property use text_view_network;
+    property use text_view_tags;
+    property use text_view_memories;
+    property use text_view_userinfo;
+
+    property use text_entry_prev;
+    property use text_entry_next;
+    property use text_edit_entry;
+    property use text_edit_tags;
+    property use text_mem_add;
+    property use text_tell_friend;
+    property use text_watch_comments;
+    property use text_unwatch_comments;
+
+    property use text_read_comments;
+    property use text_read_comments_friends;
+    property use text_post_comment;
+    property use text_post_comment_friends;
+    property use text_permalink;
+
+    property use text_meta_location;
+    property use text_meta_mood;
+    property use text_meta_music;
+    property use text_meta_xpost;
+    property use text_tags;
+
+    property use text_stickyentry_subject;
+
+    property use text_max_comments;
+    property use text_skiplinks_back;
+    property use text_skiplinks_forward;
+}
+
 ##===============================
 ## Custom CSS
 ##===============================
@@ -199,53 +232,6 @@
     property use custom_css;
 }
 
-propgroup text {
-##===============================
-## Text - main navigation
-##===============================
-
-    property use text_view_recent;
-    property use text_view_friends;
-    property use text_view_network;
-    property use text_view_archive;
-    property use text_view_userinfo;
-    property use text_view_memories;
-    property use text_view_tags;
-
-##===============================
-## Text - entry comment-related
-##===============================
-
-    property use text_post_comment;
-    property use text_max_comments;
-    property use text_read_comments;
-    property use text_post_comment_friends;
-    property use text_read_comments_friends;
-
-    property use text_skiplinks_back;
-    property use text_skiplinks_forward;
-    property use text_meta_music;
-    property use text_meta_mood;
-    property use text_meta_location;
-    property use text_meta_xpost;
-    property use text_tags;
-
-    property use text_entry_prev;
-    property use text_entry_next;
-    property use text_edit_entry;
-    property use text_edit_tags;
-    property use text_tell_friend;
-    property use text_mem_add;
-    property use text_watch_comments;
-    property use text_unwatch_comments;
-    property use text_permalink;
-    property use text_stickyentry_subject;
-
-    property use text_module_customtext;
-    property use text_module_customtext_content;
-    property use text_module_customtext_url;
-}
-
 function print_module_navlinks() {
     var Page p = get_page();
     open_module("navlinks", "", "");
--------------------------------------------------------------------------------