Skip to content
Browse files

'added check if right column is empty - needed for round corners'

  • Loading branch information...
1 parent ce821fd commit ec3938f3d1f3e4e345a6ef5c4d3c8ad0cf06ae09 urs_hunkler committed Feb 7, 2007
Showing with 25 additions and 20 deletions.
  1. +12 −10 admin/settings.php
  2. +13 −10 lib/adminlib.php
View
22 admin/settings.php
@@ -175,17 +175,19 @@
echo '</td>';
break;
case 'right':
- echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
- if (!empty($THEME->roundcorners)) {
- echo '<div class="bt"><div></div></div>';
- echo '<div class="i1"><div class="i2"><div class="i3">';
- }
- blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
- if (!empty($THEME->roundcorners)) {
- echo '</div></div></div>';
- echo '<div class="bb"><div></div></div>';
+ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
+ echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
+ if (!empty($THEME->roundcorners)) {
+ echo '<div class="bt"><div></div></div>';
+ echo '<div class="i1"><div class="i2"><div class="i3">';
+ }
+ blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
+ if (!empty($THEME->roundcorners)) {
+ echo '</div></div></div>';
+ echo '<div class="bb"><div></div></div>';
+ }
+ echo '</td>';
}
- echo '</td>';
break;
}
}
View
23 lib/adminlib.php
@@ -2705,17 +2705,20 @@ function admin_externalpage_print_footer($adminroot) {
echo '<div class="bb"><div></div></div>';
}
echo '</td>';
- echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
- if (!empty($THEME->roundcorners)) {
- echo '<div class="bt"><div></div></div>';
- echo '<div class="i1"><div class="i2"><div class="i3">';
- }
- blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
- if (!empty($THEME->roundcorners)) {
- echo '</div></div></div>';
- echo '<div class="bb"><div></div></div>';
+ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
+ echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
+ if (!empty($THEME->roundcorners)) {
+ echo '<div class="bt"><div></div></div>';
+ echo '<div class="i1"><div class="i2"><div class="i3">';
+ }
+ blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
+ if (!empty($THEME->roundcorners)) {
+ echo '</div></div></div>';
+ echo '<div class="bb"><div></div></div>';
+ }
+ echo '</td>';
}
- echo '</td></tr></table>';
+ echo '</tr></table>';
}
print_footer();
}

0 comments on commit ec3938f

Please sign in to comment.
Something went wrong with that request. Please try again.