Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

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

Committer: esavintcev
LJSUP-8445: S2 160x600
U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-27 08:54:33 UTC (rev 10450)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-04-27 09:22:03 UTC (rev 10451)
@@ -837,6 +837,9 @@
 
 
     /* sidebar */
+    .box-vertical2 {
+        margin: 10px 0 0;
+    }
 
     div#sidebar a, div#sidebar a:link, div#sidebar a:visited{
         color: $*sidebar_link_color;
@@ -1543,8 +1546,18 @@
     if (viewer_sees_vbox() and $order == "calendar") {
         var Page p = get_page();
         """<div style="margin: 10px auto 10px auto; width: 160px;">""";
+
+        """<div class="box-vertical1">""";
         $p->print_vbox();
         "</div>";
+
+        if (viewer_sees_ad_box("s2.vertical.2")) {
+            """<div class="box-vertical2">""";
+            $p->print_ad_box("s2.vertical.2");
+            """</div>""";
+        }
+        
+        "</div>";
     }
 }
 
@@ -1561,10 +1574,21 @@
     if (viewer_sees_vbox() and $*sidebar_order_1 != "calendar" and $*sidebar_order_2 != "calendar"
             and $*sidebar_order_3 != "calendar" and $*sidebar_order_4 != "calendar" and $*sidebar_order_5 != "calendar"
             and $*sidebar_order_6 != "calendar") {
-        var Page p = get_page();
+        var Page p = get_page();        
+
         """<div style="margin: 10px auto 10px auto; width: 160px;">""";
+
+        """<div class="box-vertical1">""";
         $p->print_vbox();
         "</div>";
+
+        if (viewer_sees_ad_box("s2.vertical.2")) {
+            """<div class="box-vertical2">""";
+            $p->print_ad_box("s2.vertical.2");
+            """</div>""";
+        }
+
+        "</div>";
     }
 }
 
@@ -1716,12 +1740,6 @@
                 <div id="sidebar">""";
                     print_sidebar();
                     
-                    if (viewer_sees_ad_box("s2.vertical.2")) {
-                        """<div class="box-vertical2">""";
-                        $page->print_ad_box("s2.vertical.2");
-                        """</div>""";
-                    }
-                    
                     if (viewer_sees_ad_box("s2.box.yandex")) {
                         """<div class="box-yandex">""";
                         $page->print_ad_box("s2.box.yandex");
@@ -1735,11 +1753,20 @@
                 } elseif (viewer_sees_vbox()) {
                     """<div id="sidebar">""";
                     """<div style="margin: 0 auto 0 auto; width: 160px;">""";
+                    
+                    """<div class="box-vertical1">""";
                     $this->print_vbox();
+                    "</div>";
                     
+                    if (viewer_sees_ad_box("s2.vertical.2")) {
+                        """<div class="box-vertical2">""";
+                        $this->print_ad_box("s2.vertical.2");
+                        """</div>""";
+                    }
+                    
                     if (viewer_sees_ad_box("s2.box.yandex")) {
                         """<div class="box-yandex">""";
-                        $page->print_ad_box("s2.box.yandex");
+                        $this->print_ad_box("s2.box.yandex");
                         """</div>""";
                     }
                     

Tags: ljcom, s2, savintsev_egor
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments