diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/bluemarine/page.tpl.php | 9 | ||||
-rw-r--r-- | themes/garland/page.tpl.php | 14 | ||||
-rw-r--r-- | themes/garland/template.php | 8 | ||||
-rw-r--r-- | themes/pushbutton/page.tpl.php | 12 |
4 files changed, 22 insertions, 21 deletions
diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php index 6cc707df3..01c35d9a8 100644 --- a/themes/bluemarine/page.tpl.php +++ b/themes/bluemarine/page.tpl.php @@ -33,8 +33,8 @@ <table border="0" cellpadding="0" cellspacing="0" id="content"> <tr> - <?php if ($sidebar_left) { ?><td id="sidebar-left"> - <?php print $sidebar_left ?> + <?php if ($left) { ?><td id="sidebar-left"> + <?php print $left ?> </td><?php } ?> <td valign="top"> <?php if ($mission) { ?><div id="mission"><?php print $mission ?></div><?php } ?> @@ -48,14 +48,15 @@ <?php print $feed_icons; ?> </div> </td> - <?php if ($sidebar_right) { ?><td id="sidebar-right"> - <?php print $sidebar_right ?> + <?php if ($right) { ?><td id="sidebar-right"> + <?php print $right ?> </td><?php } ?> </tr> </table> <div id="footer"> <?php print $footer_message ?> + <?php print $footer ?> </div> <?php print $closure ?> </body> diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php index bef8aaa92..82f5df1bf 100644 --- a/themes/garland/page.tpl.php +++ b/themes/garland/page.tpl.php @@ -12,7 +12,7 @@ <link type="text/css" rel="stylesheet" media="all" href="<?php print base_path() . path_to_theme() ?>/fix-ie.css" /> <![endif]--> </head> - <body<?php print phptemplate_body_class($sidebar_left, $sidebar_right); ?>> + <body<?php print phptemplate_body_class($left, $right); ?>> <!-- Layout --> <div id="header-region" class="clear-block"><?php print $header; ?></div> @@ -54,10 +54,10 @@ </div> <!-- /header --> - <?php if ($sidebar_left): ?> + <?php if ($left): ?> <div id="sidebar-left" class="sidebar"> <?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?> - <?php print $sidebar_left ?> + <?php print $left ?> </div> <?php endif; ?> @@ -76,13 +76,13 @@ <?php print $content ?> <span class="clear"></span> <?php print $feed_icons ?> - <div id="footer"><?php print $footer_message ?></div> + <div id="footer"><?php print $footer_message . $footer ?></div> </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center --> - <?php if ($sidebar_right): ?> + <?php if ($right): ?> <div id="sidebar-right" class="sidebar"> - <?php if (!$sidebar_left && $search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?> - <?php print $sidebar_right ?> + <?php if (!$left && $search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?> + <?php print $right ?> </div> <?php endif; ?> diff --git a/themes/garland/template.php b/themes/garland/template.php index 89fd4f13e..26820b78d 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -6,15 +6,15 @@ * * Adds 'sidebar-left', 'sidebar-right' or 'sidebars' classes as needed. */ -function phptemplate_body_class($sidebar_left, $sidebar_right) { - if ($sidebar_left != '' && $sidebar_right != '') { +function phptemplate_body_class($left, $right) { + if ($left != '' && $right != '') { $class = 'sidebars'; } else { - if ($sidebar_left != '') { + if ($left != '') { $class = 'sidebar-left'; } - if ($sidebar_right != '') { + if ($right != '') { $class = 'sidebar-right'; } } diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php index 49a55b80f..0de34808c 100644 --- a/themes/pushbutton/page.tpl.php +++ b/themes/pushbutton/page.tpl.php @@ -52,9 +52,9 @@ <table id="content" border="0" cellpadding="15" cellspacing="0" width="100%"> <tr> - <?php if ($sidebar_left != ""): ?> + <?php if ($left != ""): ?> <td id="sidebar-left"> - <?php print $sidebar_left ?> + <?php print $left ?> </td> <?php endif; ?> @@ -89,9 +89,9 @@ </div><!-- main --> </td> - <?php if ($sidebar_right != ""): ?> + <?php if ($right != ""): ?> <td id="sidebar-right"> - <?php print $sidebar_right ?> + <?php print $right ?> </td> <?php endif; ?> </tr> @@ -110,9 +110,9 @@ </tr> </table> -<?php if ($footer_message) : ?> +<?php if ($footer_message || $footer) : ?> <div id="footer-message"> - <p><?php print $footer_message;?></p> + <p><?php print $footer_message . $footer;?></p> </div> <?php endif; ?> <?php print $closure;?> |