diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2001-12-15 16:22:31 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2001-12-15 16:22:31 +0000 |
| commit | e28981f0720c91d2ef606917ebdff4cfb2e612b9 (patch) | |
| tree | ac325ea59fd87534febd2b8116a937f6f1ca73e3 | |
| parent | ce6be094828082345a7262f01d24b7dccd2dbb4a (diff) | |
| download | brdo-e28981f0720c91d2ef606917ebdff4cfb2e612b9.tar.gz brdo-e28981f0720c91d2ef606917ebdff4cfb2e612b9.tar.bz2 | |
- Updated BaseTheme and the Drupal themes to have header($title = "") as the header declaration and use title when provided. This is just a step towards having unique titles.
In all themes, except Marvin which already had $title, I put the $title first, because it's usually the thing the page is about:
"The future of weblogs? - Drop.org"
"Your account settings - Drop.org"
rather than the other way around, right?
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | themes/goofy/goofy.theme | 4 | ||||
| -rw-r--r-- | themes/trillian/trillian.theme | 4 | ||||
| -rw-r--r-- | themes/unconed/unconed.theme | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 8a28b81e3..6279fa0ed 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -3,7 +3,7 @@ class BaseTheme { - function header() { + function header($title = "") { $output .= "<html><head><title>". variable_get(site_name, "drupal") ."</title></head><body>"; $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\"><tr><td valign=\"top\" width=\"170\">"; diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme index a0f23d66e..73c60f767 100644 --- a/themes/goofy/goofy.theme +++ b/themes/goofy/goofy.theme @@ -17,12 +17,12 @@ var $foreground = "#000000"; var $background = "#FFFFFF"; - function header() { + function header($title = "") { ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <title><?php echo variable_get(site_name, "drupal"); ?></title> + <title><?php echo ($title ? ($title . " - ") : "") . variable_get(site_name, "drupal"); ?></title> <style type="text/css"> <!-- body { background-color: #FFFFFF; font-size: 10pt; font-family: tahoma,helvetica,arial; } diff --git a/themes/trillian/trillian.theme b/themes/trillian/trillian.theme index 8cd4ee3b1..cf5aa9058 100644 --- a/themes/trillian/trillian.theme +++ b/themes/trillian/trillian.theme @@ -6,13 +6,13 @@ var $foreground = "#000000"; var $background = "#FFFFFF"; - function header() { + function header($title = "") { global $user; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> <html> <head> - <title><? echo variable_get(site_name, "drupal"); ?></title> + <title><? echo ($title ? ($title . " - ") : "") . variable_get(site_name, "drupal"); ?></title> <style type="text/css"> <!-- body, td, p { margin: 10px; font-size: 12pt; font-family: Verdana, Helvetica; } diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index e0eae11c2..c4346fdb6 100644 --- a/themes/unconed/unconed.theme +++ b/themes/unconed/unconed.theme @@ -37,12 +37,12 @@ var $bgcolor3 = "#D7D7D7"; var $fgcolor3 = "#000000"; - function header() { + function header($title = "") { srand((double)microtime()*1000000); ?> <HTML> <HEAD> - <TITLE><?php echo variable_get(site_name, "drupal"); ?></TITLE> + <TITLE><?php echo ($title ? ($title . " - ") : "") . variable_get(site_name, "drupal"); ?></TITLE> <STYLE type="text/css"> <!-- TABLE { border-width: 0; } |