Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal/drupal/CHANGELOG.txt,v retrieving revision 1.306 diff -u -p -r1.306 CHANGELOG.txt --- CHANGELOG.txt 3 May 2009 05:03:44 -0000 1.306 +++ CHANGELOG.txt 7 May 2009 08:34:15 -0000 @@ -109,7 +109,9 @@ Drupal 7.0, xxxx-xx-xx (development vers * Provides a subset of the features of the Content Construction Kit (CCK) module. - Page organization - * Made the help text area a full featured region with blocks. + * Made the help text area a full featured region with blocks. + * Site mission is replaced with the highlighted content block region and + separate RSS site description settings. - Upgraded the core JavaScript library to jQuery version 1.3.2. - Upgraded the jQuery Forms library to 2.21. Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.481 diff -u -p -r1.481 theme.inc --- includes/theme.inc 3 May 2009 08:12:12 -0000 1.481 +++ includes/theme.inc 7 May 2009 08:34:15 -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'; @@ -1811,11 +1801,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')); @@ -1837,7 +1822,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 7 May 2009 08:34:15 -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.1044 diff -u -p -r1.1044 node.module --- modules/node/node.module 3 May 2009 10:11:34 -0000 1.1044 +++ modules/node/node.module 7 May 2009 08:34:15 -0000 @@ -1988,7 +1988,7 @@ function node_feed($nids = FALSE, $chann 'version' => '2.0', 'title' => variable_get('site_name', 'Drupal'), 'link' => $base_url, - 'description' => variable_get('site_mission', ''), + 'description' => variable_get('site_description', ''), '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 7 May 2009 08:34:15 -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.140 diff -u -p -r1.140 system.admin.inc --- modules/system/system.admin.inc 3 May 2009 07:35:37 -0000 1.140 +++ modules/system/system.admin.inc 7 May 2009 08:34:16 -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'), @@ -1467,6 +1460,12 @@ function system_image_toolkit_settings() */ function system_rss_feeds_settings() { + $form['site_description'] = array( + '#type' => 'textarea', + '#title' => t('Site description'), + '#default_value' => '', + '#description' => t("Your site's description, included in each feed.") + ); $form['feed_default_items'] = array( '#type' => 'select', '#title' => t('Number of items in each feed'), Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.319 diff -u -p -r1.319 system.install --- modules/system/system.install 30 Apr 2009 21:44:18 -0000 1.319 +++ modules/system/system.install 7 May 2009 08:34:16 -0000 @@ -3268,9 +3268,9 @@ function system_update_7021() { // Add new system generated help block. $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('system', 'help', '" . $theme->name . "', 1, 0, 'help', '', 1)"); } - - // Migrate contact form information and user register help to blocks. $bid_max = db_query("SELECT MAX(bid) FROM {box}")->fetchField(); + + // Migrate contact form information. if ($contact_help = variable_get('contact_form_information', '')) { db_insert('box')->fields(array('body' => $contact_help, 'info' => 'Contact page help', 'format' => FILTER_FORMAT_DEFAULT))->execute(); foreach ($themes_with_blocks as $theme) { @@ -3279,6 +3279,8 @@ function system_update_7021() { } drupal_set_message('The contact form information setting was migrated to a custom block and set up to only show on the site-wide contact page. 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.'); } + + // Migrate user help setting. if ($user_help = variable_get('user_registration_help', '')) { db_insert('box')->fields(array('body' => $user_help, 'info' => 'User registration guidelines', 'format' => FILTER_FORMAT_DEFAULT))->execute(); foreach ($themes_with_blocks as $theme) { @@ -3287,13 +3289,28 @@ function system_update_7021() { } drupal_set_message('The user registration guidelines were migrated to a custom block and set up to only show on the user registration page. 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.'); } - // Remove the two variables (even if they were saved empty on the admin interface), + + // Migrate site mission setting. + 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(); + foreach ($themes_with_blocks as $theme) { + // Add mission block for themes, which had blocks. + $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . ($bid_max + 3) . "', '" . $theme->name . "', 1, 0, 'highlight', 1, '', -1)"); + } + 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. If your theme does not have a highlighted content region, you might need to relocate the block.'); + // Migrate mission to RSS site description. + variable_set('site_description', $mission); + } + + // Remove the variables (even if they were saved empty on the admin interface), // to avoid keeping clutter in the variables table. variable_del('contact_form_information'); variable_del('user_registration_help'); + variable_del('site_mission'); // Rebuild theme data, so the new 'help' region is identified. - _system_theme_data(); + system_theme_data(); return $ret; } Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.689 diff -u -p -r1.689 system.module --- modules/system/system.module 30 Apr 2009 21:44:19 -0000 1.689 +++ modules/system/system.module 7 May 2009 08:34:16 -0000 @@ -681,7 +681,7 @@ function system_menu() { ); $items['admin/content/rss-publishing'] = array( 'title' => 'RSS publishing', - 'description' => 'Configure the number of items per feed and whether feeds should be titles/teasers/full-text.', + 'description' => 'Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_rss_feeds_settings'), 'access arguments' => array('administer site configuration'), @@ -1127,6 +1127,7 @@ function system_theme_default() { 'content' => 'Content', 'header' => 'Header', 'footer' => 'Footer', + 'highlight' => 'Highlighted content', 'help' => 'Help', ), 'description' => '', @@ -1134,7 +1135,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 7 May 2009 08:34:16 -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 7 May 2009 08:34:16 -0000 @@ -520,7 +520,7 @@ body.two-sidebars #footer { color: #529ad6; } -#mission { +#highlight { padding: 1em; background-color: #fff; border: 1px solid #e0e5fb;