Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.467
diff -u -F^f -r1.467 node.module
--- modules/node.module	21 Feb 2005 19:47:44 -0000	1.467
+++ modules/node.module	24 Feb 2005 10:41:33 -0000
@@ -684,7 +684,7 @@ function node_menu($may_cache) {
       'access' => user_access('access content'),
       'type' => MENU_SUGGESTED_ITEM);
     $items[] = array('path' => 'node/add', 'title' => t('create content'),
-      'callback' => 'node_page',
+      'callback' => 'node_add',
       'access' => user_access('access content'),
       'type' => MENU_ITEM_GROUPING,
       'weight' => 1);
@@ -962,7 +962,8 @@ function node_types_configure() {
 
   $type = arg(4);
 
-  $group = form_textarea(t('Explanation or submission guidelines'), $type .'_help', variable_get($type .'_help', ''), 70, 5, t('This text will be displayed at the top of the %type submission form. It is useful for helping or instructing your users.', array('%type' => node_invoke($type, 'node_name'))));
+  $group = form_textarea(t('Description'), $type .'_description', variable_get($type .'_description', implode("\n", module_invoke_all('help', 'node/add#'. $type))), 70, 3, t('This text will be displayed on the <a href="%create_content_url">create content</a> page.', array('%create_content_url' => url('node/add'))));
+  $group .= form_textarea(t('Explanation or submission guidelines'), $type .'_help', variable_get($type .'_help', ''), 70, 5, t('This text will be displayed at the top of the %type submission form. It is useful for helping or instructing your users.', array('%type' => node_invoke($type, 'node_name'))));
   $group .= form_select(t('Minimum number of words'), 'minimum_'. $type .'_size', variable_get('minimum_'. $type .'_size', 0), drupal_map_assoc(array(0, 10, 25, 50, 75, 100, 125, 150, 175, 200)), t('The minimum number of words a %type must be to be considered valid. This can be useful to rule out submissions that do not meet the site\'s standards, such as short test posts.', array('%type' => node_invoke($type, 'node_name'))));
   $output = form_group(t('Submission form'), $group);
   $output .= form_group(t('Workflow'), implode('', node_invoke_nodeapi($type, 'settings')));
@@ -1395,7 +1396,7 @@ function node_form($edit) {
 /**
  * Present a node submission form or a set of links to such forms.
  */
-function node_add($type) {
+function node_add($type = NULL) {
   global $user;
 
   $edit = $_POST['edit'];
@@ -1420,8 +1421,8 @@ function node_add($type) {
     foreach (node_list() as $type) {
       if (node_access('create', $type)) {
         $out = '<li>';
-        $out .= ' '. l(node_invoke($type, 'node_name'), "node/add/$type", array('title' => t('Add a new %s.', array('%s' => node_invoke($type, 'node_name')))));
-        $out .= " <div style=\"margin-left: 20px;\">". implode("\n", module_invoke_all('help', 'node/add#'. $type)) .'</div>';
+        $out .= ' '. l(node_invoke($type, 'node_name'), 'node/add/'. $type, array('title' => t('Add a new %s.', array('%s' => node_invoke($type, 'node_name')))));
+        $out .= ' <div>'. variable_get($type .'_description', implode("\n", module_invoke_all('help', 'node/add#'. $type))) .'</div>';
         $out .= '</li>';
         $item[node_invoke($type, 'node_name')] = $out;
       }
@@ -1429,14 +1430,14 @@ function node_add($type) {
 
     if (isset($item)) {
       ksort($item);
-      $output = t('Choose the appropriate item from the list:') .'<ul>'. implode('', $item) .'</ul>';
+      $output = '<div id="node-add">'. t('Choose the appropriate item from the list:') .'<ul>'. implode('', $item) .'</ul></div>';
     }
     else {
       $output = message_access();
     }
   }
 
-  return $output;
+  print theme('page', $output);
 }
 
 /**
@@ -1640,9 +1654,6 @@ function node_page() {
     case 'feed':
       node_feed();
       return;
-    case 'add':
-      print theme('page', node_add(arg(2)));
-      break;
     case 'edit':
       print theme('page', node_edit(arg(1)));
       break;
Index: misc/drupal.css
===================================================================
RCS file: /cvs/drupal/drupal/misc/drupal.css,v
retrieving revision 1.95
diff -u -F^f -r1.95 drupal.css
--- misc/drupal.css	2 Feb 2005 00:55:59 -0000	1.95
+++ misc/drupal.css	24 Feb 2005 10:41:34 -0000
@@ -379,6 +379,9 @@ form {
 #access-rules .mask {
   clear: both;
 }
+#node-add ul li div {
+  margin-left: 20px;
+}
 .poll .bar {
   height: 1em;
   margin: 1px 0;