diff options
Diffstat (limited to 'themes/marvin/marvin.theme')
| -rw-r--r-- | themes/marvin/marvin.theme | 15 |
1 files changed, 11 insertions, 4 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; } |