diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/marvin/marvin.theme | 15 | ||||
| -rw-r--r-- | themes/unconed/unconed.theme | 8 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 16 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.xtmpl | 7 |
4 files changed, 36 insertions, 10 deletions
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index ae31085fb..ed6205a27 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -14,7 +14,7 @@ function marvin_help($section) { return $output; } -function marvin_header($title = "") { +function marvin_header() { $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"; @@ -22,11 +22,12 @@ function marvin_header($title = "") { $output .= theme_head($main); $output .= "<title>"; - if ($title) { - $output .= $title ." - ". variable_get("site_name", "drupal"); + if (drupal_get_title()) { + $output .= drupal_get_title() ." - ". variable_get("site_name", "drupal"); } else { - $output .= variable_get("site_name", "drupal") . ($slogan = variable_get("site_slogan", "")) ? " - $slogan" : ""; + $output .= variable_get("site_name", "drupal"); + $output .= ($slogan = variable_get("site_slogan", "")) ? " - $slogan" : ""; } $output .= "</title>\n"; @@ -55,6 +56,12 @@ function marvin_header($title = "") { } $output .= " <td style=\"vertical-align: top; width: 85%;\">\n"; + $output .= theme("breadcrumb", drupal_get_breadcrumb()); + $output .= "<h1>" . drupal_get_title() . "</h1>"; + if ($help = menu_get_active_help()) { + $output .= "<small>$help</small><hr />"; + } + return $output; } diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index 66cd24c08..b94f30869 100644 --- a/themes/unconed/unconed.theme +++ b/themes/unconed/unconed.theme @@ -14,8 +14,9 @@ function unconed_help($section) { return $output; } -function unconed_header($title = "") { +function unconed_header() { global $base_url; + $title = drupal_get_title(); $foreground = "#000000"; $background = "#ffffff"; @@ -74,6 +75,11 @@ function unconed_header($title = "") { <tr> <td valign="top" width="80%"> <?php + print theme("breadcrumb", drupal_get_breadcrumb()); + print "<h1>" . drupal_get_title() . "</h1>"; + if ($help = menu_get_active_help()) { + print "<small>$help</small><hr />"; + } } function unconed_node($node, $main = 0) { diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index 9bf714483..6abe6fa8b 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -84,19 +84,27 @@ function xtemplate_comment($comment, $link = 0) { return $output; } -function xtemplate_header($title = "") { +function xtemplate_header() { global $xtemplate; $xtemplate->template->assign(array( - "title" => ($title ? $title." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")), + "head_title" => (drupal_get_title() ? drupal_get_title() ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")), + "body_title" => drupal_get_title(), + "site" => variable_get("site_name", "drupal"), "head" => theme_head(), "stylesheet" => variable_get("xtemplate_stylesheet", "themes/xtemplate/xtemplate.css"), "onload_attributes" => theme_onload_attribute(), "logo" => variable_get("xtemplate_logo", "<img src=\"themes/xtemplate/images/druplicon.gif\" />"), "primary_links" => variable_get("xtemplate_primary_links", l("edit primary links", "admin/system/themes/xtemplate")), - "secondary_links" => variable_get("xtemplate_secondary_links", l("edit secondary links", "admin/system/themes/xtemplate")) + "secondary_links" => variable_get("xtemplate_secondary_links", l("edit secondary links", "admin/system/themes/xtemplate")), + "breadcrumb" => theme("breadcrumb", drupal_get_breadcrumb()) )); + if (menu_get_active_help()) { + $xtemplate->template->assign("help", menu_get_active_help()); + $xtemplate->template->parse("header.help"); + } + if (variable_get("xtemplate_search_box", 1)) { $xtemplate->template->assign(array( //"search" => search_form(), @@ -168,4 +176,4 @@ function xtemplate_footer() { return $xtemplate->template->text("footer"); } -?>
\ No newline at end of file +?> diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl index e4ef9a552..cf4107867 100644 --- a/themes/xtemplate/xtemplate.xtmpl +++ b/themes/xtemplate/xtemplate.xtmpl @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <title>{title}</title> + <title>{head_title}</title> {head} <link type="text/css" rel="stylesheet" href="{stylesheet}" /> </head> @@ -43,6 +43,11 @@ <div id="message">{header_message}</div> <!-- END: message --> <div id="main"> + {breadcrumb} + <h1>{body_title}</h1> + <!-- BEGIN: help --> + <small>{help}</small><hr /> + <!-- END: help --> <!-- END: header --> <!-- BEGIN: node --> |