? .DS_Store ? make_node_optional_04.patch ? make_node_optional_05.patch ? make_node_optional_06.patch ? make_node_optional_07.patch ? make_node_optional_08.patch ? make_node_optional_09.patch ? make_node_optional_10.patch ? make_node_optional_11.patch ? remove_node_frontpage_00.patch ? remove_node_frontpage_01.patch ? remove_node_frontpage_02.patch ? modules/.DS_Store ? sites/.DS_Store ? sites/default/files ? sites/default/settings.php Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.874 diff -u -p -r1.874 common.inc --- includes/common.inc 30 Mar 2009 05:13:45 -0000 1.874 +++ includes/common.inc 31 Mar 2009 23:33:24 -0000 @@ -4276,3 +4276,27 @@ function _drupal_flush_css_js() { } variable_set('css_js_query_string', $new_character . substr($string_history, 0, 19)); } + +/** + * Menu callback; generate a short help text for use on the front page. + */ +function front_page_help() { + $help_message = '

' . t('Please follow these steps to set up and start using your website:') . '

'; + $help_message .= '
    '; + $help_message .= '
  1. ' . t('Configure your website Once logged in, visit the administration section, where you can customize and configure all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))) . '
    2. '; + $help_message .= '
  2. ' . t('Enable additional functionality Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.', array('@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '
    3. '; + $help_message .= '
  3. ' . t('Customize your website design To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.', array('@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '
    4. '; + $help_message .= '
  4. ' . t('Start posting content Finally, you can create content for your website. This message will disappear once you have promoted a post to the front page.', array('@content' => url('node/add'))) . '
    5. '; + $help_message .= '
'; + $help_message .= '

' . t('For more information, please refer to the help section, or the online Drupal handbooks. You may also post at the Drupal forum, or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '

'; + + $build['main'] = array( + '#markup' => $help_message, + '#prefix' => '
', + '#suffix' => '
', + ); + + drupal_set_title(t('Welcome to your new Drupal website!')); + + return drupal_get_page($build); +} Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.316 diff -u -p -r1.316 menu.inc --- includes/menu.inc 21 Mar 2009 17:58:14 -0000 1.316 +++ includes/menu.inc 31 Mar 2009 23:33:25 -0000 @@ -405,6 +405,10 @@ function menu_execute_active_handler($pa return MENU_ACCESS_DENIED; } } + // If this is the front page, return help. + elseif (drupal_is_front_page()) { + return front_page_help(); + } return MENU_NOT_FOUND; } Index: includes/path.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/path.inc,v retrieving revision 1.32 diff -u -p -r1.32 path.inc --- includes/path.inc 4 Jan 2009 20:04:32 -0000 1.32 +++ includes/path.inc 31 Mar 2009 23:33:25 -0000 @@ -18,7 +18,7 @@ function drupal_init_path() { $_GET['q'] = drupal_get_normal_path(trim($_GET['q'], '/')); } else { - $_GET['q'] = drupal_get_normal_path(variable_get('site_frontpage', 'node')); + $_GET['q'] = drupal_get_normal_path(variable_get('site_frontpage', '')); } } @@ -235,7 +235,7 @@ function drupal_is_front_page() { if (!isset($is_front_page)) { // As drupal_init_path updates $_GET['q'] with the 'site_frontpage' path, // we can check it against the 'site_frontpage' variable. - $is_front_page = ($_GET['q'] == drupal_get_normal_path(variable_get('site_frontpage', 'node'))); + $is_front_page = ($_GET['q'] == drupal_get_normal_path(variable_get('site_frontpage', ''))); } return $is_front_page; @@ -256,7 +256,7 @@ function drupal_match_path($path, $patte static $regexps; if (!isset($regexps[$patterns])) { - $regexps[$patterns] = '/^(' . preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\($|\|)/'), array('|', '.*', '\1' . preg_quote(variable_get('site_frontpage', 'node'), '/') . '\2'), preg_quote($patterns, '/')) . ')$/'; + $regexps[$patterns] = '/^(' . preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\($|\|)/'), array('|', '.*', '\1' . preg_quote(variable_get('site_frontpage', ''), '/') . '\2'), preg_quote($patterns, '/')) . ')$/'; } return (bool)preg_match($regexps[$patterns], $path); } 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 31 Mar 2009 23:33:26 -0000 @@ -2046,20 +2046,9 @@ function node_page_default() { ); } else { - $default_message = '

' . t('Welcome to your new Drupal website!') . '

'; - $default_message .= '

' . t('Please follow these steps to set up and start using your website:') . '

'; - $default_message .= '
    '; - $default_message .= '
  1. ' . t('Configure your website Once logged in, visit the administration section, where you can customize and configure all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))) . '
    2. '; - $default_message .= '
  2. ' . t('Enable additional functionality Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.', array('@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '
    3. '; - $default_message .= '
  3. ' . t('Customize your website design To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.', array('@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '
    4. '; - $default_message .= '
  4. ' . t('Start posting content Finally, you can create content for your website. This message will disappear once you have promoted a post to the front page.', array('@content' => url('node/add'))) . '
    5. '; - $default_message .= '
'; - $default_message .= '

' . t('For more information, please refer to the help section, or the online Drupal handbooks. You may also post at the Drupal forum, or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '

'; - $build['default_message'] = array( - '#markup' => $default_message, - '#prefix' => '
', - '#suffix' => '
', - ); + $build['default_message'] = array( + '#markup' => t('No nodes have yet been promoted.'), + ); } drupal_set_title(''); return drupal_get_page($build); Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.131 diff -u -p -r1.131 system.admin.inc --- modules/system/system.admin.inc 17 Mar 2009 15:26:29 -0000 1.131 +++ modules/system/system.admin.inc 31 Mar 2009 23:33:27 -0000 @@ -1218,9 +1218,9 @@ function system_site_information_setting $form['site_frontpage'] = array( '#type' => 'textfield', '#title' => t('Default front page'), - '#default_value' => 'node', + '#default_value' => '', '#size' => 40, - '#description' => t('The home page displays content from this relative URL. If unsure, specify "node".'), + '#description' => t('The home page displays content from this relative URL.'), '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='), '#required' => TRUE, ); Index: modules/system/system.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.css,v retrieving revision 1.53 diff -u -p -r1.53 system.css --- modules/system/system.css 5 Dec 2008 12:50:28 -0000 1.53 +++ modules/system/system.css 31 Mar 2009 23:33:27 -0000 @@ -462,9 +462,9 @@ tr .ahah-progress .throbber { } /* -** Formatting for welcome page +** Formatting for help at front page */ -#first-time strong { +#frontpage-help strong { display: block; padding: 1.5em 0 .5em; } Index: modules/system/system.test =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.test,v retrieving revision 1.40 diff -u -p -r1.40 system.test --- modules/system/system.test 31 Mar 2009 01:49:54 -0000 1.40 +++ modules/system/system.test 31 Mar 2009 23:33:28 -0000 @@ -449,8 +449,8 @@ class AccessDeniedTestCase extends Drupa ); $node = $this->drupalCreateNode($edit); - // Use a custom 403 page. - $this->drupalPost('admin/settings/site-information', array('site_403' => 'node/' . $node->nid), t('Save configuration')); + // Use a custom 403 page. Set the front page as well because it's required. + $this->drupalPost('admin/settings/site-information', array('site_frontpage' => 'user', 'site_403' => 'node/' . $node->nid), t('Save configuration')); $this->drupalGet('admin'); $this->assertText($node->title, t('Found the custom 403 page')); @@ -510,8 +510,8 @@ class PageNotFoundTestCase extends Drupa ); $node = $this->drupalCreateNode($edit); - // Use a custom 404 page. - $this->drupalPost('admin/settings/site-information', array('site_404' => 'node/' . $node->nid), t('Save configuration')); + // Use a custom 404 page. Set the front page as well because it's required. + $this->drupalPost('admin/settings/site-information', array('site_frontpage' => 'user', 'site_404' => 'node/' . $node->nid), t('Save configuration')); $this->drupalGet($this->randomName(10)); $this->assertText($node->title, t('Found the custom 404 page')); @@ -675,7 +675,7 @@ class FrontPageTestCase extends DrupalWe function testDrupalIsFrontPage() { $this->drupalGet(''); $this->assertText(t('On front page.'), t('Path is the front page.')); - $this->drupalGet('node'); + $this->drupalGet(variable_get('site_frontpage', '')); $this->assertText(t('On front page.'), t('Path is the front page.')); $this->drupalGet($this->node_path); $this->assertNoText(t('On front page.'), t('Path is not the front page.'));