diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/marvin/marvin.theme | 4 | ||||
| -rw-r--r-- | themes/unconed/unconed.theme | 2 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 25 |
3 files changed, 5 insertions, 26 deletions
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index fdeefb118..ae31085fb 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -47,7 +47,7 @@ function marvin_header($title = "") { $output .= "<table border=\"0\" style=\"width: 100%\" cellpadding=\"8\" cellspacing=\"0\">\n"; $output .= " <tr>\n"; - $blocks = render_blocks("left"); + $blocks = theme("blocks", "left"); if ($blocks) { $output .= " <td style=\"width: 200px; vertical-align: top;\">\n"; $output .= $blocks; @@ -171,7 +171,7 @@ function marvin_links($links, $delimiter = " · ") { function marvin_footer() { $output = " </td>\n"; - $blocks = render_blocks("right"); + $blocks = theme("blocks", "right"); if ($blocks) { $output .= " <td style=\"width: 200px; vertical-align: top;\">\n"; $output .= $blocks; diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index df2e014ff..66cd24c08 100644 --- a/themes/unconed/unconed.theme +++ b/themes/unconed/unconed.theme @@ -274,7 +274,7 @@ function unconed_footer() { </td> <td valign="top" width="20%"> <?php - print render_blocks("all", $this); + print theme("blocks", "all"); ?> </td> </tr> diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index 799643d19..9bf714483 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -5,7 +5,6 @@ if (!class_exists("XTemplate")) { include_once("themes/xtemplate/xtemplate.inc"); } -$GLOBALS["xtemplate"]->sidebar = variable_get("xtemplate_sidebar", "right"); $GLOBALS["xtemplate"]->template = new XTemplate("themes/xtemplate/xtemplate.xtmpl"); $GLOBALS["xtemplate"]->template->SetNullBlock(" "); // "" doesnt work! @@ -113,17 +112,7 @@ function xtemplate_header($title = "") { $xtemplate->template->parse("header.message"); } - /* - if ($xtemplate->sidebar == "left") { - $blocks = render_blocks("all"); - } - else if ($xtemplate->sidebar == "both") { - $blocks = render_blocks("left"); - } - */ - $blocks = render_blocks("left"); - - if ($blocks) { + if ($blocks = theme("blocks", "left")) { $xtemplate->template->assign("blocks", $blocks); $xtemplate->template->parse("header.blocks"); } @@ -162,17 +151,7 @@ function xtemplate_box($title, $content, $region = "main") { function xtemplate_footer() { global $xtemplate; - /* - if ($xtemplate->sidebar == "right") { - print render_blocks("all"); - } - else if ($xtemplate->sidebar == "both") { - print render_blocks("right"); - } - */ - $blocks = render_blocks("right"); - - if ($blocks) { + if ($blocks = theme("blocks", "right")) { $xtemplate->template->assign("blocks", $blocks); $xtemplate->template->parse("footer.blocks"); } |