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

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

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2012-09-26 13:57:28 UTC (rev 12697)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2012-09-26 14:22:27 UTC (rev 12698)
@@ -1926,6 +1926,7 @@
 
     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();
@@ -1933,6 +1934,8 @@
         }
     }
 
+    $this->render_journalpromo();
+
     if($skiplinks != "") {
         println """<div class="stream-footer">""";
         println """<p class="prevnext">""";
@@ -1970,6 +1973,8 @@
     if ($.entry->viewer_sees_ebox()) {
         $.entry->print_ebox();
     }
+
+    $this->render_journalpromo();
     
     if ($.entry.comments.enabled and ($.comment_pages.total_subitems > 0 or $.entry.comments.spam_counter > 0)) {
         var string comments_count = string($.entry.comments.count);