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

LJSUP-13769: S2 styles Journal Promo block

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

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2012-10-03 14:32:07 UTC (rev 12722)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2012-10-03 15:09:14 UTC (rev 12723)
@@ -2378,14 +2378,17 @@
 #LJSUP-13769
 function print_journalpromo () {
     var Page p = get_page();
+
+    if ($p->render_journalpromo()) {
         """
         <div class="compBg compContent" style="border: 1px solid $*outside_border;">
         """;
-            $p->render_journalpromo();
+            $p->journalpromo();
         """
         </div>
         <div><img src="$*PALIMGROOT/component/clear.gif" width="1" height="4" alt="" border="0" /></div>
         """;
+    }
 }
 
 function RecentPage::print_body

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2012-10-03 14:32:07 UTC (rev 12722)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2012-10-03 15:09:14 UTC (rev 12723)
@@ -718,6 +718,20 @@
 }
 
 
+
+#LJSUP-13769
+function print_journalpromo () {
+    var Page p = get_page();
+
+    if ($p->render_journalpromo()) {
+        """<div class="ind-entry" style="overflow: hidden; padding: 15px 0; zoom:1;">""";
+            $p->journalpromo();
+        "</div>";
+    }
+}
+
+
+
 # -------------------------------
 # prints the user's 'link-list'
 # -------------------------------
@@ -894,6 +908,10 @@
             $e->print_ebox();
             "</div>";
         }
+
+        #LJSUP-13769
+        print_journalpromo();
+
     }
     print "</div>";
 
@@ -949,6 +967,10 @@
             $.entry->print_ebox();
             "</div>";
         }
+
+        #LJSUP-13769
+        print_journalpromo();
+
         if ( $.entry.comments.enabled ) {
             print "<h2 id='$*text_comments_id'>Comments {$.entry.comments.count}</h2>";
             print "<div id=\"comments\">";
@@ -996,7 +1018,12 @@
                 $e->print_ebox();
                 "</div>";
             }
+
+            #LJSUP-13769
+            print_journalpromo();
+
         }
+
         print "</div>";
     }
 
@@ -1507,6 +1534,10 @@
             "</div>";
         }
 
+        #LJSUP-13769
+        print_journalpromo();
+
+
         print "<div class=\"entry-form\" id='$*text_addcomment_id'>\n";
             print "<h2>Reply</h2>\n";
             $.form->print();