[dw-nonfree] Add a .no-title class if an entry/comment doesn't have a title

[fu]

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

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

Add .no-subject class, style to account for overlaps when there is no
subject, expose wizard properties, some refactoring.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/sundaymorning/layout.s2
• bin/upgrading/s2layers/transmogrified/layout.s2

--------------------------------------------------------------------------------
diff -r 65657c789b4f -r c2971c284e6a bin/upgrading/s2layers/sundaymorning/layout.s2
--- a/bin/upgrading/s2layers/sundaymorning/layout.s2	Sat Mar 24 12:40:39 2012 +0800
+++ b/bin/upgrading/s2layers/sundaymorning/layout.s2	Wed Apr 04 15:24:04 2012 +0800
@@ -28,6 +28,8 @@
     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 layout_type = "two-columns-left";
@@ -706,22 +708,19 @@
     border: none;
 }
 
-.comment-title {
-    $comment_title_font
-    }
-
-.comment-title h4 {
-    font-size: inherit;
-    font-weight: inherit;
-    margin: 0;
-    padding: 0;
-}
 .entry-title, .comment-title {
     padding: .2em;
 }
+
 .entry-title {
     $entry_title_font
 }
+
+.comment-title {
+    $comment_title_font
+    margin: 0;
+    }
+
 .entry-wrapper .entry, .comment, .text_noentries_day {
     $entry_colors
     margin-top: 100px;
@@ -733,6 +732,14 @@
     border: none;
     $entry_title_colors
 }
+
+.no-subject .entry .entry-title,
+.no-subject .comment .comment-title {
+    background: none;
+    border: none;
+    padding: 0;
+    }
+
 .entry-wrapper .entry-title a, .comment-wrapper .comment-title a {
     $entry_title_link_colors
 }
diff -r 65657c789b4f -r c2971c284e6a bin/upgrading/s2layers/transmogrified/layout.s2
--- a/bin/upgrading/s2layers/transmogrified/layout.s2	Sat Mar 24 12:40:39 2012 +0800
+++ b/bin/upgrading/s2layers/transmogrified/layout.s2	Wed Apr 04 15:24:04 2012 +0800
@@ -29,6 +29,8 @@
     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 layout_type = "two-columns-right";
@@ -354,15 +356,19 @@
     if($*userpics_position == "left") {
         $userpic_css = """
         .entry-title, .comment-title { margin: 0; }
-        .has-userpic .entry .header { margin: 0 0 0 $entry_header_margin; }
-        .has-userpic .comment .header { margin: 0 0 0 $comment_header_margin; }
+        .has-userpic .entry .header,
+        .has-userpic .entry .poster { margin: 0 0 0 $entry_header_margin; }
+        .has-userpic .comment .header,
+        .has-userpic .comment .poster { margin: 0 0 0 $comment_header_margin; }
         .entry .userpic a, .comment .userpic a { left: 10px; right: auto; }""";
     }
     elseif($*userpics_position == "right") {
         $userpic_css = """
         .entry-title, .comment-title { margin: 0; }
-        .has-userpic .entry .header { margin: 0 $entry_header_margin 0 0; }
-        .has-userpic .comment .header { margin: 0 $comment_header_margin 0 0; }
+        .has-userpic .entry .header,
+        .has-userpic .entry .poster { margin: 0 $entry_header_margin 0 0; }
+        .has-userpic .comment .header,
+        .has-userpic .comment .poster { margin: 0 0 0 $comment_header_margin; }
         .entry .userpic a, .comment .userpic a { right: 10px; left: auto; }""";
     }
 
@@ -648,22 +654,18 @@
         border: none;
     }
 
-.comment-title {
-    $comment_title_font
-    }
-
-    .comment-title h4 {
-        font-size: inherit;
-        font-weight: inherit;
-        margin: 0;
-        padding: 0;
-    }
     .entry-title, .comment-title {
-        padding: 0.2em;
+        padding: .2em;
     }
     .entry .entry-title {
         $entry_title_font
     }
+
+    .comment-title {
+        $comment_title_font
+        margin: 0;
+    }
+
     .entry-title a, .comment-title a {
         text-decoration: none;
     }
@@ -712,6 +714,14 @@
         color: $*color_entry_subject_alt;
         background-color: $*color_entry_subject_alt_background;
     }
+
+    .no-subject .entry .entry-title,
+    .no-subject .comment .comment-title {
+        background: none;
+        border: none;
+        padding: 0;
+    }
+
     .entry-wrapper-even .entry-title a, .comment-wrapper-even .comment-title a {
         color: $*color_entry_subject_alt;
     }
@@ -736,6 +746,11 @@
         padding: 10px 0;
     }
 
+    .page-recent .journal-type-P.has-userpic.no-subject .entry-content,
+    .page-day .journal-type-P.has-userpic.no-subject .entry-content {
+        padding-top: 25px;
+    }
+
     .no-userpic .comment {
         margin-top: 20px;
     }
@@ -749,10 +764,6 @@
         line-height: 1.4em;
         }
 
-    .partial .comment-title h4 {
-        display: inline;
-        }
-
     .partial .comment-poster:before {
         content: "- ";
         }
--------------------------------------------------------------------------------