=== modified file 'modules/node/node.module'
--- modules/node/node.module	2009-01-04 20:00:08 +0000
+++ modules/node/node.module	2009-01-08 03:38:23 +0000
@@ -1888,17 +1888,97 @@
     $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
   }
   else {
-    $default_message = '<h1 class="title">' . t('Welcome to your new Drupal website!') . '</h1>';
-    $default_message .= '<p>' . t('Please follow these steps to set up and start using your website:') . '</p>';
-    $default_message .= '<ol>';
-    $default_message .= '<li>' . t('<strong>Configure your website</strong> Once logged in, visit the <a href="@admin">administration section</a>, where you can <a href="@config">customize and configure</a> all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))) . '</li>';
-    $default_message .= '<li>' . t('<strong>Enable additional functionality</strong> Next, visit the <a href="@modules">module list</a> and enable features which suit your specific needs. You can find additional modules in the <a href="@download_modules">Drupal modules download section</a>.', array('@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '</li>';
-    $default_message .= '<li>' . t('<strong>Customize your website design</strong> To change the "look and feel" of your website, visit the <a href="@themes">themes section</a>. You may choose from one of the included themes or download additional themes from the <a href="@download_themes">Drupal themes download section</a>.', array('@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '</li>';
-    $default_message .= '<li>' . t('<strong>Start posting content</strong> Finally, you can <a href="@content">create content</a> for your website. This message will disappear once you have promoted a post to the front page.', array('@content' => url('node/add'))) . '</li>';
-    $default_message .= '</ol>';
-    $default_message .= '<p>' . t('For more information, please refer to the <a href="@help">help section</a>, or the <a href="@handbook">online Drupal handbooks</a>. You may also post at the <a href="@forum">Drupal forum</a>, or view the wide range of <a href="@support">other support options</a> available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '</p>';
-
-    $output = '<div id="first-time">' . $default_message . '</div>';
+    $default_message = array(
+      '#prefix' => '<div id="first-time">',
+      '#suffix' => '</div>',
+    );
+    $default_message['title'] = array(
+      '#markup' => t('Welcome to your new Drupal website!'),
+      '#weight' => -10,
+      '#prefix' => '<h1>',
+      '#suffix' => '</h1>',
+    );
+    $default_message['subtitle'] = array(
+      '#markup' => t('Please follow these steps to set up and start using your website:'),
+      '#weight' => -5,
+      '#prefix' => '<p>',
+      '#suffix' => '</p>',
+    );
+    $default_message['list'] = array(
+      '#weight' => 0,
+      '#prefix' => '<ol>',
+      '#suffix' => '</ol>',
+    );
+    $default_message['list']['configure'] = array(
+      '#weight' => -10,
+      '#prefix' => '<li>',
+      '#suffix' => '</li>',
+      'title' => array(
+        '#markup' => t('Configure your website'),
+        '#weight' => -5,
+        '#prefix' => '<strong>',
+        '#suffix' => '</strong>',
+      ),
+      'body' => array(
+        '#markup' => t('Once logged in, visit the <a href="@admin">administration section</a>, where you can <a href="@config">customize and configure</a> all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))),
+        '#weight' => 5,
+      ),
+    );
+    $default_message['list']['enable'] = array(
+      '#weight' => -5,
+      '#prefix' => '<li>',
+      '#suffix' => '</li>',
+      'title' => array(
+        '#markup' => t('Enable additional functionality'),
+        '#weight' => -5,
+        '#prefix' => '<strong>',
+        '#suffix' => '</strong>',
+      ),
+      'body' => array(
+        '#markup' => t('Next, visit the <a href="@modules">module list</a> and enable features which suit your specific needs. You can find additional modules in the <a href="@download_modules">Drupal modules download section</a>.', array('@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules')),
+        '#weight' => 5,
+      ),
+    );
+    $default_message['list']['customize'] = array(
+      '#weight' => 0,
+      '#prefix' => '<li>',
+      '#suffix' => '</li>',
+      'title' => array(
+        '#markup' => t('Customize your website design'),
+        '#weight' => -5,
+        '#prefix' => '<strong>',
+        '#suffix' => '</strong>',
+      ),
+      'body' => array(
+        '#markup' => t('To change the "look and feel" of your website, visit the <a href="@themes">themes section</a>. You may choose from one of the included themes or download additional themes from the <a href="@download_themes">Drupal themes download section</a>.', array('@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes')),
+        '#weight' => 5,
+      ),
+    );
+    $default_message['list']['start'] = array(
+      '#weight' => 0,
+      '#prefix' => '<li>',
+      '#suffix' => '</li>',
+      'title' => array(
+        '#markup' => t('Start posting content'),
+        '#weight' => -5,
+        '#prefix' => '<strong>',
+        '#suffix' => '</strong>',
+      ),
+      'body' => array(
+        '#markup' => t('Finally, you can <a href="@content">create content</a> for your website. This message will disappear once you have promoted a post to the front page.', array('@content' => url('node/add'))),
+        '#weight' => 5,
+      ),
+    );
+    $default_message['footer'] = array(
+      '#markup' => t('For more information, please refer to the <a href="@help">help section</a>, or the <a href="@handbook">online Drupal handbooks</a>. You may also post at the <a href="@forum">Drupal forum</a>, or view the wide range of <a href="@support">other support options</a> available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')),
+      '#weight' => 5,
+      '#prefix' => '<p>',
+      '#suffix' => '</p>',
+    );
+    
+    drupal_alter('node_welcome_page', $default_message);
+    
+    $output = drupal_render($default_message);
   }
   drupal_set_title('');
 

