[ljcom] r10449: LJSUP-8445: S2 160x600

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

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-27 07:15:08 UTC (rev 10448)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-27 07:21:45 UTC (rev 10449)
@@ -1840,8 +1840,8 @@
 
 
         "            </table>\n";
-        if (viewer_sees_ad_box("s2.vertical.2")) {
-            """<div class="box-vertical2">""";
+        if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) {
+            """<div class="compBg compContent box-vertical2" style="margin: 5px 0 0; padding: 6px; border: 1px solid $*outside_border;">""";
             $p->print_ad_box("s2.vertical.2");
             """</div>""";
         }
@@ -1983,9 +1983,16 @@
 """;
             if($*comp_state == "right" or $*comp_state == "none") {
                 if (viewer_sees_vbox()) {
-                    """<td valign="top" width="184" style="padding: 3px;"><div class="compBg compContent" style="border: 1px solid $*outside_border;">""";
+                    """<td valign="top" width="184" style="padding: 3px;">""";
+                    """<div class="compBg compContent box-vertical1" style="padding: 6px; border: 1px solid $*outside_border;">""";
                     $p->print_vbox();
-                    "</div></td>";
+                    "</div>";
+                    if ($*comp_state == "none" and viewer_sees_ad_box("s2.vertical.2")) {
+                        """<div class="compBg compContent box-vertical2" style="margin: 10px 0 0; padding: 6px; border: 1px solid $*outside_border;">""";
+                        $p->print_ad_box("s2.vertical.2");
+                        """</div>""";
+                    }
+                    "</td>";
                 }
                 print_my_entries($p, $title);
             } elseif($*comp_state == "left") {