Committer: esavintcev
LJSUP-8445: S2 160x600U trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 U trunk/bin/upgrading/s2layers/disjointed/layout.s2
Modified: trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 2011-04-27 08:42:36 UTC (rev 18987) +++ trunk/bin/upgrading/s2layers/digitalmultiplex/layout.s2 2011-04-27 08:50:32 UTC (rev 18988) @@ -1029,7 +1029,14 @@ println "</td></tr></table></td>"; if (viewer_sees_vbox()) { println """<td id="adbar" valign="top">"""; + """<div class="box-vertical1">"""; $this->print_vbox(); + """</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>"""; + } println "</td>"; } "</tr>"; Modified: trunk/bin/upgrading/s2layers/disjointed/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/disjointed/layout.s2 2011-04-27 08:42:36 UTC (rev 18987) +++ trunk/bin/upgrading/s2layers/disjointed/layout.s2 2011-04-27 08:50:32 UTC (rev 18988) @@ -1503,7 +1503,7 @@ print_sidebar_summary(); } - if (viewer_sees_ad_box("s2.vertical.2")) { + if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) { """<div class="box-vertical2" style="margin-top: 2em;">"""; $p->print_ad_box("s2.vertical.2"); """</div>"""; @@ -1825,7 +1825,7 @@ """; } else { if (viewer_sees_vbox()) { - """<td width="20%" valign="top"><div style="float: right;">"""; + """<td width="20%" valign="top"><div class="box-vertical1" style="float: right;">"""; $this->print_vbox(); """</div></td>"""; }