diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/chameleon/chameleon.theme | 40 | ||||
| -rw-r--r-- | themes/marvin/marvin.theme | 52 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 52 |
3 files changed, 82 insertions, 62 deletions
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index 0bb52adb0..c9f2ada39 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -32,7 +32,13 @@ function chameleon_settings() { return $output; } -function chameleon_header($title = "") { +function chameleon_page($content, $title = NULL, $breadcrumb = NULL) { + if (isset($title)) { + drupal_set_title($title); + } + if (isset($breadcrumb)) { + drupal_set_breadcrumb($breadcrumb); + } $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"; $output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n"; @@ -70,6 +76,22 @@ function chameleon_header($title = "") { $output .= "<strong>". t("Status") ."</strong>: $message<hr />"; } + $output .= "\n<!-- begin content -->\n"; + $output .= $content; + $output .= "\n<!-- end content -->\n"; + + $output .= " </td>\n"; + + if ($blocks = theme_blocks("right")) { + $output .= " <td id=\"sidebar-right\">$blocks</td>\n"; + } + + $output .= " </tr>\n"; + $output .= " </table>\n"; + $output .= theme_closure(); + $output .= " </body>\n"; + $output .= "</html>\n"; + return $output; } @@ -121,20 +143,4 @@ function chameleon_comment($comment, $link = "") { return $output; } -function chameleon_footer() { - - $output = " </td>\n"; - - if ($blocks = theme_blocks("right")) { - $output .= " <td id=\"sidebar-right\">$blocks</td>\n"; - } - - $output .= " </tr>\n"; - $output .= " </table>\n"; - $output .= theme_closure(); - $output .= " </body>\n"; - $output .= "</html>\n"; - - return $output; -} ?> diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index 0c090370a..ca7857222 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -14,7 +14,13 @@ function marvin_help($section) { return $output; } -function marvin_header() { +function marvin_page($content, $title = NULL, $breadcrumb = NULL) { + if (isset($title)) { + drupal_set_title($title); + } + if (isset($breadcrumb)) { + drupal_set_breadcrumb($breadcrumb); + } $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; $output .= "<html>\n"; @@ -70,6 +76,28 @@ function marvin_header() { $output .= "<strong>". t("Status") ."</strong>: $message<hr />"; } + $output .= "\n<!-- begin content -->\n"; + $output .= $content; + $output .= "\n<!-- end content -->\n"; + + $output .= " </td>\n"; + $blocks = theme("blocks", "right"); + if ($blocks) { + $output .= " <td style=\"width: 200px; vertical-align: top;\">\n"; + $output .= $blocks; + $output .= " </td>\n"; + } + $output .= " </tr>\n</table>"; + $output .= "<table border=\"0\" style=\"width: 100%\" cellpadding=\"8\" cellspacing=\"0\">\n"; + $output .= " <tr>\n"; + $output .= " <td colspan=\"2\" style=\"text-align: center;\">"; + $output .= "<p>". theme("links", link_page()) ."</p><p>". variable_get("site_footer", "") ."</p>\n"; + $output .= " </td>\n"; + $output .= " </tr>\n"; + $output .= "</table>\n"; + $output .= theme_closure(); + $output .= "</body>\n</html>\n"; + return $output; } @@ -157,26 +185,4 @@ function marvin_comment($comment, $link = "") { function marvin_links($links, $delimiter = " · ") { return implode($delimiter, $links); } - -function marvin_footer() { - $output = " </td>\n"; - $blocks = theme("blocks", "right"); - if ($blocks) { - $output .= " <td style=\"width: 200px; vertical-align: top;\">\n"; - $output .= $blocks; - $output .= " </td>\n"; - } - $output .= " </tr>\n</table>"; - $output .= "<table border=\"0\" style=\"width: 100%\" cellpadding=\"8\" cellspacing=\"0\">\n"; - $output .= " <tr>\n"; - $output .= " <td colspan=\"2\" style=\"text-align: center;\">"; - $output .= "<p>". theme("links", link_page()) ."</p><p>". variable_get("site_footer", "") ."</p>\n"; - $output .= " </td>\n"; - $output .= " </tr>\n"; - $output .= "</table>\n"; - $output .= theme_closure(); - $output .= "</body>\n</html>\n"; - - return $output; -} ?> diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index bac833398..a0a56fa30 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -86,7 +86,14 @@ function xtemplate_comment($comment, $links = 0) { return $output; } -function xtemplate_header() { +function xtemplate_page($content, $title = NULL, $breadcrumb = NULL) { + if (isset($title)) { + drupal_set_title($title); + } + if (isset($breadcrumb)) { + drupal_set_breadcrumb($breadcrumb); + } + global $xtemplate; $xtemplate->template->assign(array( @@ -140,8 +147,29 @@ function xtemplate_header() { } $xtemplate->template->parse("header"); - return $xtemplate->template->text("header"); + $output = $xtemplate->template->text("header"); + + $output .= "\n<!-- begin content -->\n"; + $output .= $content; + $output .= "\n<!-- end content -->\n"; + + if ($blocks = theme("blocks", "right")) { + $xtemplate->template->assign("blocks", $blocks); + $xtemplate->template->parse("footer.blocks"); + } + + // only parse the footer block if site_footer is set + if ($footer_message = variable_get("site_footer", FALSE)) { + $xtemplate->template->assign("footer_message", $footer_message); + $xtemplate->template->parse("footer.message"); + } + + $xtemplate->template->assign("footer", theme_closure()); + $xtemplate->template->parse("footer"); + + $output .= $xtemplate->template->text("footer"); + return $output; } function xtemplate_block(&$block) { @@ -170,24 +198,4 @@ function xtemplate_box($title, $content, $region = "main") { return $output; } -function xtemplate_footer() { - global $xtemplate; - - if ($blocks = theme("blocks", "right")) { - $xtemplate->template->assign("blocks", $blocks); - $xtemplate->template->parse("footer.blocks"); - } - - // only parse the footer block if site_footer is set - if ($footer_message = variable_get("site_footer", FALSE)) { - $xtemplate->template->assign("footer_message", $footer_message); - $xtemplate->template->parse("footer.message"); - } - - $xtemplate->template->assign("footer", theme_closure()); - $xtemplate->template->parse("footer"); - - return $xtemplate->template->text("footer"); -} - ?> |