fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-05-17 01:39 am

[dw-nonfree] Sunday Morning: modules incorrectly displayed when moved to header

[commit: http://hg.dwscoalition.org/dw-nonfree/rev/c2c4d0dcd81f]

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

* Allow navigation to show up in sidebar, header, or none
* Restrict all other modules to just sidebar or none
* Add some padding to the custom text module
* style the time module to match powered by
* style navigation when it's in the sidebar to remove some odd blank space

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/sundaymorning/layout.s2
--------------------------------------------------------------------------------
diff -r e2b76fc5b479 -r c2c4d0dcd81f bin/upgrading/s2layers/sundaymorning/layout.s2
--- a/bin/upgrading/s2layers/sundaymorning/layout.s2	Mon May 10 05:56:07 2010 +0000
+++ b/bin/upgrading/s2layers/sundaymorning/layout.s2	Mon May 17 01:37:33 2010 +0000
@@ -32,6 +32,8 @@ set tags_page_type = "";
 
 set custom_colors_template = "%%new%% .userpic a {background-color: %%background%%; border: solid 1px %%foreground%%;}";
 
+set module_layout_sections = "none|(none)|two|Sidebar";
+
 propgroup modules {
     property use module_userprofile_group;
     property use module_navlinks_group;
@@ -45,7 +47,28 @@ propgroup modules {
     property use module_poweredby_group;
     property use module_customtext_group;
     property use module_credit_group;
+
+    property string module_navlinks_section_override {
+       values = "none|(none)|one|Header|two|Sidebar";
+       grouped = 1;
+       }
 }
+
+set grouped_property_override = { "module_navlinks_section" => "module_navlinks_section_override" };
+
+set module_navlinks_section = "one";
+set module_userprofile_section = "two";
+set module_pagesummary_section = "two";
+set module_tags_section = "two";
+set module_links_section = "two";
+set module_syndicate_section = "two";
+set module_calendar_section = "two";
+set module_time_section = "none";
+set module_customtext_section = "two";
+set module_active_section = "two";
+set module_credit_section = "two";
+set module_poweredby_section = "two";
+set module_poweredby_order = 20;
 
 propgroup text {
     property use text_view_recent;
@@ -174,21 +197,6 @@ propgroup customcss {
     property use linked_stylesheet;
     property use custom_css;
 }
-
-set module_layout_sections = "none|(none)|one|Header|two|Sidebar";
-set module_navlinks_section = "one";
-set module_userprofile_section = "two";
-set module_pagesummary_section = "two";
-set module_tags_section = "two";
-set module_links_section = "two";
-set module_syndicate_section = "two";
-set module_calendar_section = "two";
-set module_time_section = "none";
-set module_customtext_section = "two";
-set module_active_section = "two";
-set module_credit_section = "two";
-set module_poweredby_section = "two";
-set module_poweredby_order = 20;
 
 function Page::print()
 {
@@ -524,10 +532,18 @@ q { font-style: italic;
     font-weight: bold;
     margin-right: 0.5em;
 }
+.module-customtext .module-content {
+    padding: 0 .5em;
+}
 
+.module-section-two .module-time,
 .module-section-two .module-powered {
     font-size: 0.8em;
     text-align: center;
+}
+.module-section-two .module-navlinks ul {
+    margin-top: 0;
+    padding-top: 1em;
 }
 
 .entry, .comment, .text_noentries_day {
--------------------------------------------------------------------------------

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