Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1063
diff -u -p -r1.1063 node.module
--- modules/node/node.module	2 Jun 2009 03:33:36 -0000	1.1063
+++ modules/node/node.module	2 Jun 2009 18:27:24 -0000
@@ -139,6 +139,9 @@ function node_theme() {
     'node_links' => array(
       'arguments' => array('element' => NULL),
     ),
+    'node_page_default' => array(
+      'arguments' => array('message' => NULL),
+    ),
   );
 }
 
@@ -2155,28 +2158,43 @@ function node_page_default() {
     drupal_set_title('');
   }
   else {
-    drupal_set_title(t('Welcome to @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))));
-    
-    $default_message = '<p>' . t('No front page content has been created yet.') . '</p>';
+    $build = array(
+      '#theme' => 'node_page_default',
+    );
+
+    $build['message'] = array(
+      '#markup' => t('No front page content has been created yet.'),
+      '#weight' => -5,
+    );
 
+    $build['links'] = array();
     if (user_access('access administration pages')) {
-      $default_links = array (
-        l(t('Create content'), 'node/add'),
-        l(t('Change the default front page'), 'admin/settings/site-information'),
+      $build['links']['add'] = array(
+        'data' => l(t('Create content'), 'node/add'),
+       );
+      $build['links']['change'] =  array(
+        'data' => l(t('Change the default front page'), 'admin/settings/site-information'),
       );
-      $default_message .= theme('item_list', $default_links);
     }
-
-    $build['default_message'] = array(
-      '#markup' => $default_message,
-      '#prefix' => '<div id="first-time">',
-      '#suffix' => '</div>',
-    );
   }
   return $build;
 }
 
 /**
+ * Theme default message.
+ *
+ * @ingroup themeable
+ */
+function theme_node_page_default($message) {
+  drupal_set_title(t('Welcome to @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))));
+
+  $output = '<p>' . drupal_render($message['message']) . '</p>';
+  $output .= theme('item_list', $message['links']);
+  $output = '<div id="first-time">' . $output .  '</div>';
+  return $output;
+}
+
+/**
  * Menu callback; view a single node.
  */
 function node_page_view($node) {