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

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

Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2012-10-02 14:09:44 UTC (rev 23031)
+++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2012-10-02 14:40:05 UTC (rev 23032)
@@ -826,6 +826,10 @@
             $e->print_ebox();
             "</div>";
         }
+
+        #LJSUP-13769
+        $this->render_journalpromo();
+
     }
 
     if ($.nav.backward_url != "" or $.nav.forward_url != "") {
@@ -852,6 +856,9 @@
         "</div>";
     }
 
+    #LJSUP-13769
+    $this->render_journalpromo();
+
 """
     <a id="$*text_comments_id"></a>
     <div class="comments">
@@ -911,6 +918,12 @@
         $.entry->print_ebox();
         "</div>";
     }
+
+    #LJSUP-13769
+    if ($this->render_journalpromo()) {
+        print "\n<hr />\n";
+    }
+
     $.form->print();
 }
 
@@ -928,6 +941,10 @@
                 $e->print_ebox();
                 "</div>";
             }
+
+            #LJSUP-13769
+            $this->render_journalpromo();
+
         }
 
         "</div>";