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

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

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2012-09-28 09:31:00 UTC (rev 12703)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2012-09-28 11:53:40 UTC (rev 12704)
@@ -1228,7 +1228,12 @@
         border-color: $*border_color;
         background-color: $*content_bgcolor;
     }
- 
+
+    /* LJSUP-13769 */
+    .appwidget-journalpromo {
+        margin: 0 10px;
+        }
+
     """;
 
     print_custom_control_strip_css();
@@ -2124,6 +2129,15 @@
             <div class="clear">&nbsp;</div>
             """;
         }
+
+        #LJSUP-13769
+        if ($this->render_journalpromo()) {
+            """
+            <div class="separator"></div>
+            <div class="clear">&nbsp;</div>
+            """;
+        }
+
     }
 }
 
@@ -2142,6 +2156,14 @@
         <div class="clear">&nbsp;</div>
         """;
     }
+
+    #LJSUP-13769
+    if ($this->render_journalpromo()) {
+        """
+        <div class="separator"></div>
+        <div class="clear">&nbsp;</div>
+        """;
+    }
     
     if ($.multiform_on and $.entry.comments.enabled and $.comment_pages.total_subitems > 0)
     {
@@ -2429,6 +2451,15 @@
                 <div class="clear">&nbsp;</div>
                 """;
             }
+
+            #LJSUP-13769
+            if ($this->render_journalpromo()) {
+                """
+                <div class="separator"></div>
+                <div class="clear">&nbsp;</div>
+                """;
+            }
+
         }
     }
     else {
@@ -2527,6 +2558,14 @@
             $.entry->print_ebox();
             "</div>";
 
+    #LJSUP-13769
+    if ($this->render_journalpromo()) {
+        """
+        <div class="separator"></div>
+        <div class="clear">&nbsp;</div>
+        """;
+    }
+
     """<div class="box" id="$*text_addcomment_id">""";
     print $.entry.comments.count > 0 ? (""" <center><b>( <a href="$.entry.permalink_url#comments">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )</b> </center>""") : "";
     """Post a comment in response:<br/>""";