- Don't display the title when there is no title.
parent
1080e6c04b
commit
1c03a57684
|
@ -22,8 +22,8 @@ function marvin_header() {
|
||||||
$output .= theme_head($main);
|
$output .= theme_head($main);
|
||||||
$output .= "<title>";
|
$output .= "<title>";
|
||||||
|
|
||||||
if (drupal_get_title()) {
|
if ($title = drupal_get_title()) {
|
||||||
$output .= drupal_get_title() ." - ". variable_get("site_name", "drupal");
|
$output .= "$title - ". variable_get("site_name", "drupal");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$output .= variable_get("site_name", "drupal");
|
$output .= variable_get("site_name", "drupal");
|
||||||
|
@ -56,8 +56,11 @@ function marvin_header() {
|
||||||
}
|
}
|
||||||
$output .= " <td style=\"vertical-align: top; width: 85%;\">\n";
|
$output .= " <td style=\"vertical-align: top; width: 85%;\">\n";
|
||||||
|
|
||||||
$output .= theme("breadcrumb", drupal_get_breadcrumb());
|
if ($title = drupal_get_title()) {
|
||||||
$output .= "<h2>" . drupal_get_title() . "</h2>";
|
$output .= theme("breadcrumb", drupal_get_breadcrumb());
|
||||||
|
$output .= "<h2>$title</h2>";
|
||||||
|
}
|
||||||
|
|
||||||
if ($help = menu_get_active_help()) {
|
if ($help = menu_get_active_help()) {
|
||||||
$output .= "<small>$help</small><hr />";
|
$output .= "<small>$help</small><hr />";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue