Committer: esavintcev
LJSUP-8445: S2 160x600U trunk/bin/upgrading/s2layers/punquin/layout.s2 U trunk/bin/upgrading/s2layers/refriedpaper/layout.s2 U trunk/bin/upgrading/s2layers/sixhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-04-27 09:59:26 UTC (rev 18994) +++ trunk/bin/upgrading/s2layers/punquin/layout.s2 2011-04-27 10:20:40 UTC (rev 18995) @@ -423,17 +423,17 @@ # End Table if (viewer_sees_vbox()) { - "<p>"; + """<div class="box-vertical1">"""; $p->print_vbox(); - "</p>"; + """</div>"""; + if (viewer_sees_ad_box("s2.vertical.2")) { + """<div class="box-vertical2" style="margin-top: 10px;">"""; + $p->print_ad_box("s2.vertical.2"); + """</div>"""; + } } "</td></tr></table>\n<!-- End Main Sidebar -->"; - if (viewer_sees_ad_box("s2.vertical.2")) { - """<div class="box-vertical2">"""; - $p->print_ad_box("s2.vertical.2"); - """</div>"""; - } } function print_gotop (Page p) Modified: trunk/bin/upgrading/s2layers/refriedpaper/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/refriedpaper/layout.s2 2011-04-27 09:59:26 UTC (rev 18994) +++ trunk/bin/upgrading/s2layers/refriedpaper/layout.s2 2011-04-27 10:20:40 UTC (rev 18995) @@ -1467,7 +1467,7 @@ <table border="0" cellspacing="0" cellpadding="0" width="100%"> """; print_sidebar(); -if (viewer_sees_ad_box("s2.vertical.2")) { +if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) { """<tr><td><div class="box-vertical2" style="padding: 8px 0 0 8px;">"""; $this->print_ad_box("s2.vertical.2"); """</div></td></tr>"""; @@ -1518,7 +1518,7 @@ <table border="0" cellspacing="0" cellpadding="0" width="100%"> """; print_sidebar(); -if (viewer_sees_ad_box("s2.vertical.2")) { +if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) { """<tr><td><div class="box-vertical2" style="padding: 8px 0 0 8px;">"""; $this->print_ad_box("s2.vertical.2"); """</div></td></tr>"""; Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sixhtml/layout.s2 2011-04-27 09:59:26 UTC (rev 18994) +++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2 2011-04-27 10:20:40 UTC (rev 18995) @@ -250,6 +250,7 @@ [ "calendar" ], [ "links", $*text_links ], [ "syndicate", $*text_syndicate ], + [ "ads1", "" ], [ "poweredby" ], ]; } else { @@ -257,7 +258,8 @@ [ "userprofile", "", "0", "1" ], [ "viewlinks", "" ], [ "calendar" ], - [ "ads", "" ], + [ "ads1", "" ], + [ "ads2", "" ], [ "links", $*text_links ], [ "tags", $*text_tags_section_header ], [ "pagesummary", $*text_page_summary ], @@ -269,7 +271,7 @@ if (not $custom_secondary) { $*sidebar_secondary = [ - [ "ads", "" ], + [ "ads2", "" ], [ "tags", $*text_tags_section_header ], [ "pagesummary", $*text_page_summary ], ]; @@ -540,12 +542,24 @@ close_module(); } } -function print_module_ads(string title) { +function print_module_ads1(string title) { var Page p = get_page(); open_module("ads", $title, ""); + """<div class="box-vertical1">"""; $p->print_vbox(); + """</div>"""; close_module(); } +function print_module_ads2(string title) { + var Page p = get_page(); + open_module("ads", $title, ""); + if (viewer_sees_ad_box("s2.vertical.2")) { + """<div class="box-vertical2" style="margin-top: 10px;">"""; + $p->print_ad_box("s2.vertical.2"); + """</div>"""; + } + close_module(); +} function handle_sidebar_array(string[][] list) { var Page p = get_page(); @@ -584,15 +598,13 @@ elseif ($module == "links") { print_module_links($title); } - elseif ($module == "ads") { - print_module_ads($title); + elseif ($module == "ads1") { + print_module_ads1($title); } + elseif ($module == "ads2") { + print_module_ads2($title); + } } - if (viewer_sees_ad_box("s2.vertical.2")) { - """<div class="box-vertical2">"""; - $p->print_ad_box("s2.vertical.2"); - """</div>"""; - } if (viewer_sees_ad_box("s2.box.yandex")) { """<div class="box-yandex">"""; $p->print_ad_box("s2.box.yandex");