diff options
Diffstat (limited to 'themes/xtemplate')
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 16 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.xtmpl | 7 |
2 files changed, 18 insertions, 5 deletions
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 --> |