[ljcom] r10196: LJSUP-8029: New AD slot at journal pages...

U   trunk/bin/upgrading/s2layers/3column/layout.s2
U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2

Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-03-05 08:39:10 UTC (rev 10195)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-03-05 08:39:31 UTC (rev 10196)
@@ -1272,6 +1272,7 @@
 
 
 """;
+
 $this->print_linklist();
 if (viewer_sees_vbox()) {
     """<div class="sidebox">""";

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-03-05 08:39:10 UTC (rev 10195)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-03-05 08:39:31 UTC (rev 10196)
@@ -1715,6 +1715,13 @@
                 """
                 <div id="sidebar">""";
                     print_sidebar();
+                    
+                    if (viewer_sees_ad_box("s2.box.yandex")) {
+                        """<div class="box-yandex">""";
+                        $page->print_ad_box("s2.box.yandex");
+                        """</div>""";
+                    }
+                    
                     """
                     <!--div class="clear">&nbsp;</div-->
                 </div>
@@ -1723,7 +1730,15 @@
                     """<div id="sidebar">""";
                     """<div style="margin: 0 auto 0 auto; width: 160px;">""";
                     $this->print_vbox();
+                    
+                    if (viewer_sees_ad_box("s2.box.yandex")) {
+                        """<div class="box-yandex">""";
+                        $page->print_ad_box("s2.box.yandex");
+                        """</div>""";
+                    }
+                    
                     "</div>";
+                    
                     """<div class="clear">&nbsp;</div>""";
                     "</div>";
                   }

Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-03-05 08:39:10 UTC (rev 10195)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-03-05 08:39:31 UTC (rev 10196)
@@ -2233,6 +2233,7 @@
 }
 
 function Page::lay_print_sidebar() {
+var Page p = get_page();
   """<div class="sidebar">""";
   foreach var int position (1..17) {
     var string pos = ""+$position;
@@ -2254,6 +2255,11 @@
     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.box.yandex")) {
+      """<div class="box-yandex">""";
+      $p->print_ad_box("s2.box.yandex");
+      """</div>""";
+  }
   """</div> <!--sidebar-->""";
 }
 function print_ebox (Entry e) {

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-03-05 08:39:10 UTC (rev 10195)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-03-05 08:39:31 UTC (rev 10196)
@@ -1271,9 +1271,9 @@
         # viewlinks
         } elseif ($module == "viewlinks") {
             print_module_viewlinks($title);
-
+        
         # poweredby
-        } elseif ($module == "poweredby") {
+        }  elseif ($module == "poweredby") {
             print_module_poweredby($title);
 
         # designedby
@@ -1302,7 +1302,13 @@
 }
 
 function Page::lay_sidebar_secondary() {
+    var Page p = get_page();
     handle_sidebar_array($*sidebar_secondary);
+    if (viewer_sees_ad_box("s2.box.yandex")) {
+        """<div class="box-yandex">""";
+        $p->print_ad_box("s2.box.yandex");
+        """</div>""";
+    }
 }
 
 function YearWeek::print() {