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

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

Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-04-27 10:00:16 UTC (rev 10454)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-04-27 10:37:48 UTC (rev 10455)
@@ -2256,7 +2256,7 @@
     elseif ($*layout_sidebox_freetext_10_visibility==$pos) { $this->lay_print_sidebar_freetextbox_10(); }
     elseif ($*layout_sidebox_freetext_private_visibility==$pos and viewer_is_owner()) { $this->lay_print_sidebar_freetextbox_private(); }
   }
-  if (viewer_sees_ad_box("s2.vertical.2")) {
+  if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) {
     """<div class="box-vertical2">""";
     $p->print_ad_box("s2.vertical.2");
     """</div>""";
@@ -2547,8 +2547,10 @@
      if (viewer_sees_vbox()) {
         """<td valign="top"  width=\"$*layout_sidebar_width"""; """px\">""";
         """<div class="sidebox sideboxContent" style="margin-right: 20px;">""";
+        """<div class="box-vertical1">""";
         $this->print_vbox();
         "</div>";
+        "</div>";
         "</td>";
      }
   }
@@ -2564,7 +2566,20 @@
      if (viewer_sees_vbox()) {
        """<td valign="top"  width=\"$*layout_sidebar_width"""; """px\">""";
        """<div class="sidebox sideboxContent" style="margin-left: 20px;">""";
-       $this->print_vbox();
+       if ($*layout_sidebar_position=="left") {
+            """<div class="box-vertical1">""";
+            $this->print_vbox();
+            "</div>";
+       } else {
+            """<div class="box-vertical1">""";
+            $this->print_vbox();
+            "</div>";
+            if (viewer_sees_ad_box("s2.vertical.2")) {
+                  """<div class="box-vertical2" style="margin-top: 10px;">""";
+                  $this->print_ad_box("s2.vertical.2");
+                  """</div>""";
+            }
+       }
        "</div>";
        "</td>";
      }