--- menu.module.fapi.dww	Thu Mar 23 02:35:42 2006
+++ menu.module	Thu Mar 23 03:53:38 2006
@@ -341,8 +341,12 @@ function menu_edit_item_form($mid = 0) {
     }
   }
   else {
-    // This is an add form.
-    $item = array('mid' => 0, 'pid' => 1, 'weight' => 0, 'type' => MENU_CUSTOM_ITEM);
+
+    // This is an add form.  In this case, the mid argument (if any)
+    // will be the default pid for the new item.  Otherwise, default
+    // to the "Navigation" menu (which is hard-coded pid==1).
+    $default_pid = $mid ? $mid : 1;
+    $item = array('mid' => 0, 'pid' => $default_pid, 'weight' => 0, 'type' => MENU_CUSTOM_ITEM);
   }
 
   $form['title'] = array('#type' => 'textfield',
@@ -381,7 +385,6 @@ function menu_edit_item_form($mid = 0) {
   );
 
   // Generate a list of possible parents (not including this item or descendants).
-  // Default to "Navigation" menu for new items.
   $options = menu_parent_options($item['mid']);
   $form['pid'] = array('#type' => 'select',
     '#title' => t('Parent item'),
@@ -600,10 +603,13 @@ function menu_overview_tree() {
   foreach ($root_menus as $mid => $title) {
     $operations = array();
     if ($menu['items'][$mid]['type'] & MENU_MODIFIABLE_BY_ADMIN) {
-      $operations[] = l(t('edit'), 'admin/menu/menu/edit/'. $mid);
+      $operations[] = l(t('edit menu'), 'admin/menu/menu/edit/'. $mid);
     }
     if ($menu['items'][$mid]['type'] & MENU_CREATED_BY_ADMIN) {
-      $operations[] = l(t('delete'), 'admin/menu/menu/delete/'. $mid);
+      $operations[] = l(t('delete menu'), 'admin/menu/menu/delete/'. $mid);
+    }
+    if ($menu['items'][$mid]['type'] & MENU_MODIFIABLE_BY_ADMIN) {
+      $operations[] = l(t('add item'), 'admin/menu/item/add/'. $mid);
     }
     $table = theme('item_list', $operations);
     $table .= theme('table', $header, menu_overview_tree_rows($mid));