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

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

Committer: esavintcev
LJSUP-8445: S2 160x600
U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-04-27 10:37:48 UTC (rev 10455)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-04-27 11:04:55 UTC (rev 10456)
@@ -857,16 +857,11 @@
                 print_lj_links($this);
                 print safe ($this->lay_sidebar_view_summary());
                 $this->print_linklist();
-                if (viewer_sees_ad_box("s2.vertical")) {
+                if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical")) {
                     """<div class="box-vertical">""";
                     $p->print_ad_box("s2.vertical");
                     """</div>""";
                 }
-                if (viewer_sees_ad_box("s2.vertical.2")) {
-                    """<div class="box-vertical2">""";
-                    $p->print_ad_box("s2.vertical.2");
-                    """</div>""";
-                }
             print "</div>\n";
             print "<div id=\"content\">\n";
                 $this->print_body();

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-04-27 10:37:48 UTC (rev 10455)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-04-27 11:04:55 UTC (rev 10456)
@@ -1119,8 +1119,14 @@
 
     if (viewer_sees_vbox()) {
       "<div style='float: right; margin-right: 1em;'>";
+      """<div class="box-vertical1">""";
       $this->print_vbox();
-      "</div>";
+      """</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>";
     }
 
     println """<div id="Content">""";

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-27 10:37:48 UTC (rev 10455)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-04-27 11:04:55 UTC (rev 10456)
@@ -1305,7 +1305,7 @@
 function Page::lay_sidebar_secondary() {
     var Page p = get_page();
     handle_sidebar_array($*sidebar_secondary);
-    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>""";

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