Committer: ybuhvalova
LJSUP-11668: Need to remove yadex.direct block from journals pagesU 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/sup/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 2012-03-29 07:11:53 UTC (rev 11653) +++ trunk/bin/upgrading/s2layers/3column/layout.s2 2012-03-29 08:26:05 UTC (rev 11654) @@ -1293,12 +1293,6 @@ "</div>"; } -if (viewer_sees_ad_box("s2.box.yandex")) { - """<div class="sidebox box-yandex">"""; - $p->print_ad_box("s2.box.yandex"); - """</div>"""; -} - print safe """ </div> Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-03-29 07:11:53 UTC (rev 11653) +++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-03-29 08:26:05 UTC (rev 11654) @@ -1758,12 +1758,6 @@ <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"> </div--> </div> @@ -1782,12 +1776,6 @@ """</div>"""; } - if (viewer_sees_ad_box("s2.box.yandex")) { - """<div class="box-yandex">"""; - $this->print_ad_box("s2.box.yandex"); - """</div>"""; - } - "</div>"; """<div class="clear"> </div>"""; Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2012-03-29 07:11:53 UTC (rev 11653) +++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2012-03-29 08:26:05 UTC (rev 11654) @@ -2283,11 +2283,7 @@ $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"); - """</div>"""; - } + """</div> <!--sidebar-->"""; } function print_ebox (Entry e) { Modified: trunk/bin/upgrading/s2layers/sup/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sup/layout.s2 2012-03-29 07:11:53 UTC (rev 11653) +++ trunk/bin/upgrading/s2layers/sup/layout.s2 2012-03-29 08:26:05 UTC (rev 11654) @@ -905,14 +905,6 @@ """; } - if (viewer_sees_ad_box("s2.box.yandex.style_sup")) { -""" - <dl class="sidebar-block"> - <dd>"""; $p->print_ad_box("s2.box.yandex.style_sup"); """</dd> - </dl> -"""; - } - var string designer = _designer(); """ Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2012-03-29 07:11:53 UTC (rev 11653) +++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2012-03-29 08:26:05 UTC (rev 11654) @@ -1311,11 +1311,6 @@ $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"); - """</div>"""; - } } function YearWeek::print() {