[ljcom] r12708: LJSUP-13769: S2 styles Journal Promo blo...

U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2
U   trunk/htdocs/stc/voxhtml/default/screen.css

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2012-09-28 13:12:37 UTC (rev 12707)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2012-09-28 13:19:08 UTC (rev 12708)
@@ -1926,16 +1926,18 @@
 
     foreach var Entry e ($.entries) {
         $this->print_entry($e);
-        $this->render_journalpromo();
+
         if ($e->viewer_sees_ebox()) {
             """<div style="margin-top: 20px; margin-bottom: 30px;">""";
             $e->print_ebox();
             "</div>";
         }
+
+        #LJSUP-13769
+        $this->render_journalpromo();
+
     }
 
-    $this->render_journalpromo();
-
     if($skiplinks != "") {
         println """<div class="stream-footer">""";
         println """<p class="prevnext">""";
@@ -1974,6 +1976,7 @@
         $.entry->print_ebox();
     }
 
+    #LJSUP-13769
     $this->render_journalpromo();
     
     if ($.entry.comments.enabled and ($.comment_pages.total_subitems > 0 or $.entry.comments.spam_counter > 0)) {
@@ -2518,13 +2521,14 @@
 
     print_entry($this, $.replyto, null Color, null Color, false);
 
-    print "\n<hr />\n";
-
     if ($.entry->viewer_sees_ebox()) {
+        print "\n<hr />\n";
         $.entry->print_ebox();
+        print "\n<hr />\n";
     }
 
-    print "\n<hr />\n";
+    #LJSUP-13769
+    $this->render_journalpromo();
 
     container_open("comments");
     """
@@ -2560,7 +2564,10 @@
                 $e->print_ebox();
                 "</div>";
             }
+
+            #LJSUP-13769
             $this->render_journalpromo();
+
         }
 
         "</div>";

Modified: trunk/htdocs/stc/voxhtml/default/screen.css
===================================================================
--- trunk/htdocs/stc/voxhtml/default/screen.css	2012-09-28 13:12:37 UTC (rev 12707)
+++ trunk/htdocs/stc/voxhtml/default/screen.css	2012-09-28 13:19:08 UTC (rev 12708)
@@ -1912,3 +1912,9 @@
     height: 1%;
 }
 
+
+
+/* LJSUP-13769 */
+.appwidget-journalpromo {
+    margin: 0 auto 0.75em;
+    }