Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.480 diff -u -p -r1.480 theme.inc --- includes/theme.inc 29 Apr 2009 08:04:23 -0000 1.480 +++ includes/theme.inc 29 Apr 2009 18:12:32 -0000 @@ -906,7 +906,6 @@ function drupal_find_theme_templates($ca */ function theme_get_settings($key = NULL) { $defaults = array( - 'mission' => '', 'default_logo' => 1, 'logo_path' => '', 'default_favicon' => 1, @@ -918,7 +917,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_comment_user_verification' => 1, @@ -966,14 +964,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'; @@ -1826,11 +1816,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')); @@ -1852,7 +1837,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.24 diff -u -p -r1.24 theme.maintenance.inc --- includes/theme.maintenance.inc 22 Apr 2009 09:45:02 -0000 1.24 +++ includes/theme.maintenance.inc 29 Apr 2009 18:12:32 -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.1043 diff -u -p -r1.1043 node.module --- modules/node/node.module 29 Apr 2009 17:48:11 -0000 1.1043 +++ modules/node/node.module 29 Apr 2009 18:12:33 -0000 @@ -2020,7 +2020,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 29 Apr 2009 18:12:33 -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.139 diff -u -p -r1.139 system.admin.inc --- modules/system/system.admin.inc 27 Apr 2009 16:33:05 -0000 1.139 +++ modules/system/system.admin.inc 29 Apr 2009 18:12:34 -0000 @@ -357,7 +357,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'), 'comment_user_verification' => t('User verification status in comments'), @@ -1189,12 +1188,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.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.318 diff -u -p -r1.318 system.install --- modules/system/system.install 29 Apr 2009 08:04:24 -0000 1.318 +++ modules/system/system.install 29 Apr 2009 18:12:34 -0000 @@ -3299,6 +3299,35 @@ function system_update_7021() { } /** + * Enable the mission statement block if the site had a mission setting. + */ +function system_update_7022() { + $ret = array(); + if ($mission = variable_get('site_mission')) { + $bid_max = db_query("SELECT MAX(bid) FROM {box}")->fetchField(); + db_insert('box')->fields(array('body' => $mission, 'info' => 'Site mission', 'format' => FILTER_FORMAT_DEFAULT))->execute(); + drupal_set_message('The site mission was migrated to a custom block and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.'); + + $themes = list_themes(); + foreach ($themes as $theme) { + if (db_query("SELECT COUNT(*) FROM {block} WHERE theme = '%s'", $theme->name)->fetchField()) { + // Add new block to all themes which had at least one block, even disabled ones. + // For those, which do not have blocks yet, they were not yet enabled, so we + // should not add this one, because that would prevent + // block_initialize_theme_blocks() to also copy over the other blocks, when the + // theme is enabled later. + $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . ($bid_max + 1) ."', '" . $theme->name . "', 1, 0, 'highlight', 1, '', -1)"); + } + } + } + // Delete the variable anyway (even if it was saved empty), + // to avoid clutter in the variable list. + variable_del('site_mission'); + + return $ret; +} + +/** * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */ Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.688 diff -u -p -r1.688 system.module --- modules/system/system.module 29 Apr 2009 08:04:24 -0000 1.688 +++ modules/system/system.module 29 Apr 2009 18:12:35 -0000 @@ -1132,6 +1132,7 @@ function system_theme_default() { 'content' => 'Content', 'header' => 'Header', 'footer' => 'Footer', + 'highlight' => 'Highlighted content', 'help' => 'Help', ), 'description' => '', @@ -1139,7 +1140,6 @@ function system_theme_default() { 'comment_user_picture', 'comment_user_verification', 'favicon', - 'mission', 'logo', 'name', 'node_user_picture', Index: themes/garland/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v retrieving revision 1.24 diff -u -p -r1.24 page.tpl.php --- themes/garland/page.tpl.php 18 Feb 2009 14:28:25 -0000 1.24 +++ themes/garland/page.tpl.php 29 Apr 2009 18:12:35 -0000 @@ -45,7 +45,7 @@
-
+
>
Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.54 diff -u -p -r1.54 style.css --- themes/garland/style.css 26 Apr 2009 15:01:06 -0000 1.54 +++ themes/garland/style.css 29 Apr 2009 18:12:35 -0000 @@ -520,7 +520,7 @@ body.two-sidebars #footer { color: #529ad6; } -#mission { +#highlight { padding: 1em; background-color: #fff; border: 1px solid #e0e5fb;