Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.475 diff -u -p -r1.475 theme.inc --- includes/theme.inc 20 Apr 2009 21:28:13 -0000 1.475 +++ includes/theme.inc 23 Apr 2009 10:51:14 -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_main_menu' => 1, @@ -965,14 +963,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'; @@ -1832,11 +1822,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')); @@ -1859,7 +1844,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 23 Apr 2009 10:51:14 -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.1035 diff -u -p -r1.1035 node.module --- modules/node/node.module 22 Apr 2009 09:45:02 -0000 1.1035 +++ modules/node/node.module 23 Apr 2009 10:51:14 -0000 @@ -1988,7 +1988,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 23 Apr 2009 10:51:14 -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.136 diff -u -p -r1.136 system.admin.inc --- modules/system/system.admin.inc 21 Apr 2009 09:31:31 -0000 1.136 +++ modules/system/system.admin.inc 23 Apr 2009 10:51:14 -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'), 'search' => t('Search box'), @@ -1188,12 +1187,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.316 diff -u -p -r1.316 system.install --- modules/system/system.install 20 Apr 2009 02:23:16 -0000 1.316 +++ modules/system/system.install 23 Apr 2009 10:51:15 -0000 @@ -3244,6 +3244,35 @@ function system_update_7020() { } /** + * Enable the mission statement block if the site had a mission setting. + */ +function system_update_7021() { + $ret = array(); + if ($mission = variable_get('site_mission')) { + $bid_max = db_query("SELECT MAX(bid) FROM {box}"); + db_query("INSERT INTO {box} (body, info, format) VALUES ('%s', '%s', %d)", $mission, 'Site mission', FILTER_FORMAT_DEFAULT); + 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_result(db_query("SELECT COUNT(*) FROM {block} WHERE theme = '%s'", $theme->name))) { + // 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.682 diff -u -p -r1.682 system.module --- modules/system/system.module 22 Apr 2009 09:45:03 -0000 1.682 +++ modules/system/system.module 23 Apr 2009 10:51:15 -0000 @@ -1121,12 +1121,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/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 23 Apr 2009 10:51:15 -0000 @@ -45,7 +45,7 @@
-
+
>
Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.53 diff -u -p -r1.53 style.css --- themes/garland/style.css 12 Apr 2009 02:37:56 -0000 1.53 +++ themes/garland/style.css 23 Apr 2009 10:51:15 -0000 @@ -520,7 +520,7 @@ body.two-sidebars #footer { color: #529ad6; } -#mission { +#highlight { padding: 1em; background-color: #fff; border: 1px solid #e0e5fb;