diff options
Diffstat (limited to 'themes/xtemplate/xtemplate.theme')
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index 2bc36e7af..99ae8b29b 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -9,7 +9,7 @@ $GLOBALS["xtemplate"]->template = new XTemplate("themes/xtemplate/xtemplate.xtmp $GLOBALS["xtemplate"]->template->SetNullBlock(" "); // "" doesnt work! function xtemplate_settings() { - $output .= form_textarea(t("Message on front page"), "xtemplate_message", variable_get("xtemplate_message", "edit message"), 70, 6, t("This text will be displayed on the front page. It can be used to display a mission statement, announcement or site description..")); + $output .= form_textarea(t("Message on front page"), "xtemplate_mission", variable_get("xtemplate_mission", "edit mission"), 70, 6, t("This text will be displayed on the front page. It can be used to display a mission statement, announcement or site description..")); $output .= form_textfield(t("Stylesheet URL"), "xtemplate_stylesheet", variable_get("xtemplate_stylesheet", "themes/xtemplate/xtemplate.css"), 70, 300, t("The URL for your theme's cascading stylesheet.")); $output .= form_textarea(t("Logo"), "xtemplate_logo", variable_get("xtemplate_logo", "<img src=\"themes/xtemplate/images/druplicon.gif\" alt=\"Druplicon\" />"), 70, 4, t("The HTML code for displaying the logo.")); $output .= form_textarea(t("Primary links"), "xtemplate_primary_links", variable_get("xtemplate_primary_links", l("edit primary links", "admin/system/themes/xtemplate")), 70, 8, t("The HTML code for the primary links.")); @@ -105,11 +105,17 @@ function xtemplate_header() { "breadcrumb" => theme("breadcrumb", drupal_get_breadcrumb()) )); - if (menu_get_active_help()) { - $xtemplate->template->assign("help", menu_get_active_help()); + if ($help = menu_get_active_help()) { + $xtemplate->template->assign("help", $help); $xtemplate->template->parse("header.help"); } + if ($message = drupal_get_message()) { + $xtemplate->template->assign("class", $message->type ."-message"); + $xtemplate->template->assign("message", ucfirst($message->message)); + $xtemplate->template->parse("header.message"); + } + if (variable_get("xtemplate_search_box", 1)) { $xtemplate->template->assign(array( //"search" => search_form(), @@ -119,10 +125,10 @@ function xtemplate_header() { $xtemplate->template->parse("header.search_box"); } - // only parse the message block if we are on the frontpage ... - if ($_GET["q"] == variable_get("site_frontpage", "node") && ($message = variable_get("xtemplate_message", "edit message"))) { - $xtemplate->template->assign("header_message", $message); - $xtemplate->template->parse("header.message"); + // only parse the mission block if we are on the frontpage ... + if ($_GET["q"] == variable_get("site_frontpage", "node") && ($mission = variable_get("xtemplate_mission", "edit mission"))) { + $xtemplate->template->assign("header_mission", $mission); + $xtemplate->template->parse("header.mission"); } if ($blocks = theme("blocks", "left")) { |