Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.471 diff -u -p -r1.471 theme.inc --- includes/theme.inc 4 Apr 2009 00:58:09 -0000 1.471 +++ includes/theme.inc 15 Apr 2009 12:16:03 -0000 @@ -901,7 +901,6 @@ function drupal_find_theme_templates($ca */ function theme_get_settings($key = NULL) { $defaults = array( - 'mission' => '', 'default_logo' => 1, 'logo_path' => '', 'default_favicon' => 1, @@ -913,7 +912,6 @@ function theme_get_settings($key = NULL) 'toggle_name' => 1, 'toggle_search' => 0, 'toggle_slogan' => 0, - 'toggle_mission' => 1, 'toggle_node_user_picture' => 0, 'toggle_comment_user_picture' => 0, 'toggle_main_menu' => 1, @@ -960,14 +958,6 @@ function theme_get_setting($setting_name $themes = list_themes(); $theme_object = $themes[$theme_key]; - if ($settings['mission'] == '') { - $settings['mission'] = variable_get('site_mission', ''); - } - - if (!$settings['toggle_mission']) { - $settings['mission'] = ''; - } - if ($settings['toggle_logo']) { if ($settings['default_logo']) { $settings['logo'] = base_path() . dirname($theme_object->filename) . '/logo.png'; @@ -1844,11 +1834,6 @@ function template_preprocess_page(&$vari $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right'; } - // Set mission when viewing the frontpage. - if (drupal_is_front_page()) { - $mission = filter_xss_admin(theme_get_setting('mission')); - } - // Construct page title if (drupal_get_title()) { $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); @@ -1871,7 +1856,6 @@ function template_preprocess_page(&$vari $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; - $variables['mission'] = isset($mission) ? $mission : ''; $variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array(); $variables['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array(); $variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : ''); Index: includes/theme.maintenance.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v retrieving revision 1.21 diff -u -p -r1.21 theme.maintenance.inc --- includes/theme.maintenance.inc 24 Nov 2008 10:41:39 -0000 1.21 +++ includes/theme.maintenance.inc 15 Apr 2009 12:16:03 -0000 @@ -252,7 +252,6 @@ function template_preprocess_maintenance $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; - $variables['mission'] = ''; $variables['main_menu'] = array(); $variables['secondary_menu'] = array(); $variables['search_box'] = ''; Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1033 diff -u -p -r1.1033 node.module --- modules/node/node.module 26 Mar 2009 13:31:25 -0000 1.1033 +++ modules/node/node.module 15 Apr 2009 12:16:03 -0000 @@ -1981,7 +1981,6 @@ function node_feed($nids = FALSE, $chann 'version' => '2.0', 'title' => variable_get('site_name', 'Drupal'), 'link' => $base_url, - 'description' => variable_get('site_mission', ''), 'language' => $language->language ); $channel = array_merge($channel_defaults, $channel); Index: modules/system/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v retrieving revision 1.18 diff -u -p -r1.18 page.tpl.php --- modules/system/page.tpl.php 2 Mar 2009 19:23:54 -0000 1.18 +++ modules/system/page.tpl.php 15 Apr 2009 12:16:03 -0000 @@ -41,8 +41,6 @@ * in theme settings. * - $site_slogan: The slogan of the site, empty when display has been disabled * in theme settings. - * - $mission: The text of the site mission, empty when display has been disabled - * in theme settings. * * Navigation: * - $search_box: HTML to display the search box, empty if search has been disabled. @@ -62,6 +60,7 @@ * - $feed_icons: A string of all feed icons for the current page. * - $left: The HTML for the left sidebar. * - $right: The HTML for the right sidebar. + * - $highlight: The HTML for the highlighted content region. * * Footer/closing data: * - $footer_message: The footer message as defined in the admin settings. @@ -138,7 +137,7 @@
-
+

Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.132 diff -u -p -r1.132 system.admin.inc --- modules/system/system.admin.inc 5 Apr 2009 12:31:57 -0000 1.132 +++ modules/system/system.admin.inc 15 Apr 2009 12:16:03 -0000 @@ -365,7 +365,6 @@ function system_theme_settings(&$form_st 'logo' => t('Logo'), 'name' => t('Site name'), 'slogan' => t('Site slogan'), - 'mission' => t('Mission statement'), 'node_user_picture' => t('User pictures in posts'), 'comment_user_picture' => t('User pictures in comments'), 'search' => t('Search box'), @@ -1196,12 +1195,6 @@ function system_site_information_setting '#default_value' => '', '#description' => t("Your site's motto, tag line, or catchphrase (often displayed alongside the title of the site).") ); - $form['site_mission'] = array( - '#type' => 'textarea', - '#title' => t('Mission'), - '#default_value' => '', - '#description' => t("Your site's mission or focus statement (often prominently displayed on the front page).") - ); $form['site_footer'] = array( '#type' => 'textarea', '#title' => t('Footer message'), Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.676 diff -u -p -r1.676 system.module --- modules/system/system.module 25 Mar 2009 18:40:50 -0000 1.676 +++ modules/system/system.module 15 Apr 2009 12:16:03 -0000 @@ -1113,12 +1113,12 @@ function system_theme_default() { 'content' => 'Content', 'header' => 'Header', 'footer' => 'Footer', + 'highlight' => 'Highlighted content', ), 'description' => '', 'features' => array( 'comment_user_picture', 'favicon', - 'mission', 'logo', 'name', 'node_user_picture', Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.49 diff -u -p -r1.49 style.css --- themes/garland/style.css 30 Mar 2009 03:15:41 -0000 1.49 +++ themes/garland/style.css 15 Apr 2009 12:16:03 -0000 @@ -520,7 +520,7 @@ body.two-sidebars #footer { color: #529ad6; } -#mission { +#highlight { padding: 1em; background-color: #fff; border: 1px solid #e0e5fb;