Index: node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.788 diff -u -p -r1.788 node.module --- node.module 7 Mar 2007 13:09:32 -0000 1.788 +++ node.module 11 Mar 2007 01:54:29 -0000 @@ -2345,20 +2345,50 @@ function node_page_default() { // Check for existence of admin account. $admin = db_result(db_query('SELECT uid FROM {users} WHERE uid = 1')); - $default_message = t('

Welcome to your new Drupal website!

Please follow these steps to set up and start using your website:

'); - $default_message .= '
    '; - - if (!$admin) { - $default_message .= '
  1. '. t('Create your administrator account To begin, create the first account. This account will have full administration rights and will allow you to configure your website.', array('@register' => url('user/register'))) .'
    2. '; - } - $default_message .= '
  2. '. 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'))) .'
    3. '; - $default_message .= '
  3. '. 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')) .'
    4. '; - $default_message .= '
  4. '. 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')) .'
    5. '; - $default_message .= '
  5. '. 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'))) .'
    6. '; - $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')) .'

'; + $default_message = array(); + $default_message['title'] = array( + '#value' => t('Welcome to your new Drupal website!'), + ); + $default_message['sub_title'] = array( + '#value' => t('Please follow these steps to set up and start using your website:'), + ); + if(!$admin) { + $default_message['list']['create']['title'] = array( + '#value' => t('Create your administrator account'), + ); + $default_message['list']['create']['body'] = array( + '#value' => t('To begin, create the first account. This account will have full administration rights and will allow you to configure your website.', array('@register' => url('user/register'))) + ); + }; + $default_message['list']['configure']['title'] = array( + '#value' => t('Configure your website'), + ); + $default_message['list']['configure']['body'] = array( + '#value' => t('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'))) + ); + $default_message['list']['enable']['title'] = array( + '#value' => t('Enable additional functionality'), + ); + $default_message['list']['enable']['body'] = array( + '#value' => t('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')) + ); + $default_message['list']['customize']['title'] = array( + '#value' => t('Customize your website design'), + ); + $default_message['list']['customize']['body'] = array( + '#value' => t('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')) + ); + $default_message['list']['content']['title'] = array( + '#value' => t('Start posting content'), + ); + $default_message['list']['content']['body'] = array( + '#value' => t('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'))) + ); + $default_message['footer'] = array( + '#value' => 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')), + ); - $output = '
'. $default_message .'
'; + $output = theme('default_message', $default_message); } drupal_set_title(''); @@ -2366,6 +2396,22 @@ function node_page_default() { } /** + * Format a listing of links to nodes. + */ +function theme_default_message($default_message) { + $output = '

'. drupal_render($default_message['title']) .'

'; + $output .= '

'. drupal_render($default_message['sub_title']) .'

'; + $output .= '
    '; + foreach ($default_message['list'] as $list_item) { + $output .= '
  1. '. drupal_render($list_item['title']) .''. drupal_render($list_item['body']) .'
    2. '; + } + $output .= ''; + $output = '
    '. $output .'
    '; + return $output; +} + +/** * Menu callback; view a single node. */ function node_page_view($node, $cid = NULL) {