[livejournal] r23006: LJSUP-13769: S2 styles Journal Promo blo...

U   trunk/bin/upgrading/s2layers/generator/layout.s2

Modified: trunk/bin/upgrading/s2layers/generator/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/generator/layout.s2	2012-09-28 12:05:47 UTC (rev 23005)
+++ trunk/bin/upgrading/s2layers/generator/layout.s2	2012-09-28 12:11:58 UTC (rev 23006)
@@ -484,6 +484,13 @@
 """;
 }
 
+"""
+    /* LJSUP-13769 */
+    .b-journalpromo-container {
+        max-width: 600px;
+        }
+""";
+
 print_custom_control_strip_css();
 }
 
@@ -985,6 +992,14 @@
     foreach var Entry e ($.entries) {
         $this->print_entry($e);
         print_ebox($e);
+
+        #LJSUP-13769
+        if ($this->render_journalpromo()) {
+            """
+            <p></p>
+            """;
+        }
+
     }
 
     var string range = "most recent entries";
@@ -1166,6 +1181,14 @@
             </td></tr></table><p>
             """;
         }
+
+        #LJSUP-13769
+        if ($this->render_journalpromo()) {
+            """
+            <p></p>
+            """;
+        }
+
     }
 
     var string tprev = ehtml($*text_day_prev);
@@ -1282,6 +1305,14 @@
 
     print_entry($this, $.entry, null Color, null Color, false);
     print_ebox($.entry);
+
+    #LJSUP-13769
+    if ($this->render_journalpromo()) {
+        """
+        <p></p>
+        """;
+    }
+
     if ($.entry.comments.enabled and $.comment_pages.total_subitems > 0)
     {
         $this->print_multiform_start();
@@ -1510,6 +1541,13 @@
 
     print_ebox($.entry);
 
+    #LJSUP-13769
+    if ($this->render_journalpromo()) {
+        """
+        <p></p>
+        """;
+    }
+
     """<table width="$*box_width" cellpadding="2" cellspacing="0" border="0" summary="" class="entrybox">
 <tr align='left'>
 <td bgcolor="$*stronger_back" align="center">