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

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

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2012-10-03 14:07:15 UTC (rev 12721)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2012-10-03 14:32:07 UTC (rev 12722)
@@ -2374,6 +2374,20 @@
         """;
     }
 }
+
+#LJSUP-13769
+function print_journalpromo () {
+    var Page p = get_page();
+        """
+        <div class="compBg compContent" style="border: 1px solid $*outside_border;">
+        """;
+            $p->render_journalpromo();
+        """
+        </div>
+        <div><img src="$*PALIMGROOT/component/clear.gif" width="1" height="4" alt="" border="0" /></div>
+        """;
+}
+
 function RecentPage::print_body
 {
 
@@ -2383,6 +2397,10 @@
     foreach var Entry e ($.entries) {
         $this->print_entry($e);
         print_ebox($e);
+
+        #LJSUP-13769
+        print_journalpromo();
+
     }
 
     print_bottom_nav($this);
@@ -2404,6 +2422,9 @@
     foreach var Entry e ($.entries) {
         $this->print_entry($e);
         print_ebox($e);
+
+        #LJSUP-13769
+        print_journalpromo();
     }
 
     print_bottom_nav($this);
@@ -2678,6 +2699,9 @@
         foreach var Entry e ($.entries) {
             $this->print_entry($e);
             print_ebox($e);
+
+            #LJSUP-13769
+            print_journalpromo();
         }
     }
 }
@@ -2725,6 +2749,9 @@
 
     print_ebox($.entry);
 
+    #LJSUP-13769
+    print_journalpromo();
+
     if ($.entry.comments.enabled and $.comment_pages.total_subitems > 0) {
 
         $this->print_multiform_start();
@@ -3202,6 +3229,10 @@
 
 """;
                     print_ebox($.entry);
+
+                    #LJSUP-13769
+                    print_journalpromo();
+
                     print_system_box_top();
                     "<h2>$*text_post_comment</h2>";
                     $.form->print();