? misc/vertical-tabs.css
? misc/vertical-tabs.js
? modules/comment/comment-node-form.js
? modules/menu/menu.js
? modules/node/node.js
? modules/path/path.js
? modules/upload/upload.js
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.297
diff -u -p -r1.297 form.inc
--- includes/form.inc	15 Oct 2008 14:17:26 -0000	1.297
+++ includes/form.inc	27 Oct 2008 09:30:37 -0000
@@ -874,6 +874,19 @@ function form_builder($form_id, $form, &
   if (isset($form['#input']) && $form['#input']) {
     _form_builder_handle_input_element($form_id, $form, $form_state, $complete_form);
   }
+  if (!isset($form['#id'])) {
+    $form['#id'] = form_clean_id('edit-' . implode('-', $form['#parents']));
+  }
+  // Allow for elements to expand to multiple elements, e.g., radios,
+  // checkboxes and files.
+  if (isset($form['#process']) && !$form['#processed']) {
+    foreach ($form['#process'] as $process) {
+      if (drupal_function_exists($process)) {
+        $form = $process($form, isset($edit) ? $edit : NULL, $form_state, $complete_form);
+      }
+    }
+    $form['#processed'] = TRUE;
+  }
   $form['#defaults_loaded'] = TRUE;
 
   // We start off assuming all form elements are in the correct order.
@@ -970,9 +983,6 @@ function _form_builder_handle_input_elem
     }
     array_unshift($form['#parents'], $name);
   }
-  if (!isset($form['#id'])) {
-    $form['#id'] = form_clean_id('edit-' . implode('-', $form['#parents']));
-  }
 
   unset($edit);
   if (!empty($form['#disabled'])) {
@@ -1042,16 +1052,6 @@ function _form_builder_handle_input_elem
       }
     }
   }
-  // Allow for elements to expand to multiple elements, e.g., radios,
-  // checkboxes and files.
-  if (isset($form['#process']) && !$form['#processed']) {
-    foreach ($form['#process'] as $process) {
-      if (drupal_function_exists($process)) {
-        $form = $process($form, isset($edit) ? $edit : NULL, $form_state, $complete_form);
-      }
-    }
-    $form['#processed'] = TRUE;
-  }
   form_set_value($form, $form['#value'], $form_state);
 }
 
@@ -1515,6 +1515,7 @@ function theme_fieldset($element) {
       $element['#attributes']['class'] .= ' collapsed';
     }
   }
+  $element['#attributes']['id'] = $element['#id'];
 
   return '<fieldset' . drupal_attributes($element['#attributes']) . '>' . ($element['#title'] ? '<legend>' . $element['#title'] . '</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">' . $element['#description'] . '</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . (isset($element['#value']) ? $element['#value'] : '') . "</fieldset>\n";
 }
@@ -1917,6 +1918,54 @@ function form_process_ahah($element) {
 }
 
 /**
+ * Add vertical tabs to the page.
+ */
+function form_process_vertical_tabs(&$element) {
+  static $js_added = array();
+  // If the element has a vertical tab, and it is visible, then add it to the JavaScript.
+  if (isset($element['#vertical_tab']) && $element['#vertical_tab'] && (isset($element['#access']) ? $element['#access'] : TRUE)) {
+    // If it's not a full array (with the keys "callback" and "arguments"), find out what it is.
+    if (!is_array($element['#vertical_tab'])) {
+      // If it's a string, convert it.
+      if (is_string($element['#vertical_tab'])) {
+        $element['#vertical_tab'] = array('callback' => $element['#vertical_tab']);
+      }
+      // Otherwise, there's no callback.
+      else {
+        $element['#vertical_tab'] = array();
+      }
+    }
+    // Add the tab to the JavaScript.
+    $js_added[$element['#id']] = array(
+      'name' => (isset($element['#title']) ? $element['#title'] : ''),
+      'callback' => (isset($element['#vertical_tab']['callback']) ? $element['#vertical_tab']['callback'] : ''),
+      'arguments' => (isset($element['#vertical_tab']['arguments']) ? $element['#vertical_tab']['arguments'] : ''),
+    );
+    // If there's more than one tab, then add the JavaScript and add the previous element.
+    if (count($js_added) == 2) {
+      drupal_add_js(array('verticalTabs' => $js_added), 'setting');
+      // We do not immediately add the JavaScript because otherwise it would be added before
+      // the collapse.js was added, but we need collapse.js to do it's magic on fieldsets first.
+      $element['#post_render'][] = '_form_post_render_vertical_tabs';
+    }
+    // Otherwise, just add the current element.
+    elseif (count($js_added) > 2) {
+      drupal_add_js(array('verticalTabs' => array($element['#id'] => $js_added[$element['#id']])), 'setting');
+    }
+  }
+  return $element;
+}
+
+/**
+ * Actually add the JavaScript and CSS for vertical tabs.
+ */
+function _form_post_render_vertical_tabs($element) {
+  drupal_add_js('misc/vertical-tabs.js');
+  drupal_add_css('misc/vertical-tabs.css');
+  return $element;
+}
+
+/**
  * Format a form item.
  *
  * @param $element
Index: misc/drupal.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/drupal.js,v
retrieving revision 1.46
diff -u -p -r1.46 drupal.js
--- misc/drupal.js	12 Oct 2008 00:29:09 -0000	1.46
+++ misc/drupal.js	27 Oct 2008 09:30:37 -0000
@@ -1,6 +1,6 @@
 // $Id: drupal.js,v 1.46 2008/10/12 00:29:09 webchick Exp $
 
-var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {} };
+var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {}, 'verticalTabs': {} };
 
 /**
  * Set the variable that indicates if JavaScript behaviors should be applied.
Index: modules/book/book.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.css,v
retrieving revision 1.7
diff -u -p -r1.7 book.css
--- modules/book/book.css	15 May 2008 21:19:24 -0000	1.7
+++ modules/book/book.css	27 Oct 2008 09:30:37 -0000
@@ -36,7 +36,7 @@
   margin-bottom: 0;
 }
 #edit-book-bid-wrapper .description {
-  clear: both;
+  clear: none;
 }
 #book-admin-edit select {
   margin-right: 24px;
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.472
diff -u -p -r1.472 book.module
--- modules/book/book.module	13 Oct 2008 19:59:41 -0000	1.472
+++ modules/book/book.module	27 Oct 2008 09:30:38 -0000
@@ -387,7 +387,7 @@ function _book_parent_select($book_link)
 function _book_add_form_elements(&$form, $node) {
   // Need this for AJAX.
   $form['#cache'] = TRUE;
-  drupal_add_js("if (Drupal.jsEnabled) { $(document).ready(function() { $('#edit-book-pick-book').css('display', 'none'); }); }", 'inline');
+  drupal_add_js(drupal_get_path('module', 'book') .'/book.js');
 
   $form['book'] = array(
     '#type' => 'fieldset',
@@ -397,6 +397,7 @@ function _book_add_form_elements(&$form,
     '#collapsed' => TRUE,
     '#tree' => TRUE,
     '#attributes' => array('class' => 'book-outline-form'),
+    '#vertical_tab' => 'nodeFormBook',
   );
   foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) {
     $form['book'][$key] = array(
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.659
diff -u -p -r1.659 comment.module
--- modules/comment/comment.module	14 Oct 2008 20:39:42 -0000	1.659
+++ modules/comment/comment.module	27 Oct 2008 09:30:39 -0000
@@ -546,6 +546,8 @@ function comment_form_alter(&$form, $for
   }
   elseif (!empty($form['#node_edit_form'])) {
     $node = $form['#node'];
+    drupal_add_js(drupal_get_path('module', 'comment') . '/comment-node-form.js');
+    drupal_add_js(array('nodeForm' => array('comment' => $node->comment)), 'setting');
     $form['comment_settings'] = array(
       '#type' => 'fieldset',
       '#access' => user_access('administer comments'),
@@ -553,6 +555,7 @@ function comment_form_alter(&$form, $for
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#weight' => 30,
+      '#vertical_tab' => 'nodeFormComment',
     );
     $form['comment_settings']['comment'] = array(
       '#type' => 'radios',
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.172
diff -u -p -r1.172 menu.module
--- modules/menu/menu.module	12 Oct 2008 04:30:06 -0000	1.172
+++ modules/menu/menu.module	27 Oct 2008 09:30:40 -0000
@@ -379,6 +379,7 @@ function _menu_parent_depth_limit($item)
  */
 function menu_form_alter(&$form, $form_state, $form_id) {
   if (!empty($form['#node_edit_form'])) {
+    drupal_add_js(drupal_get_path('module', 'menu') . '/menu.js');
     // Note - doing this to make sure the delete checkbox stays in the form.
     $form['#cache'] = TRUE;
 
@@ -389,7 +390,8 @@ function menu_form_alter(&$form, $form_s
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
       '#tree' => TRUE,
-      '#weight' => -2,
+      '#weight' => 5,
+      '#vertical_tab' => 'nodeFormMenu',
       '#attributes' => array('class' => 'menu-item-form'),
     );
     $item = $form['#node']->menu;
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.45
diff -u -p -r1.45 node.pages.inc
--- modules/node/node.pages.inc	13 Oct 2008 00:33:03 -0000	1.45
+++ modules/node/node.pages.inc	27 Oct 2008 09:30:40 -0000
@@ -96,6 +96,7 @@ function node_object_prepare(&$node) {
  * Generate the node add/edit form array.
  */
 function node_form(&$form_state, $node) {
+  drupal_add_js(drupal_get_path('module', 'node') . '/node.js');
   global $user;
 
   if (isset($form_state['node'])) {
@@ -155,6 +156,7 @@ function node_form(&$form_state, $node) 
       // Collapsed by default when "Create new revision" is unchecked
       '#collapsed' => !$node->revision,
       '#weight' => 20,
+      '#vertical_tab' => 'nodeFormRevision',
     );
     $form['revision_information']['revision'] = array(
       '#access' => user_access('administer nodes'),
@@ -178,6 +180,7 @@ function node_form(&$form_state, $node) 
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#weight' => 90,
+    '#vertical_tab' => 'nodeFormAuthoring',
   );
   $form['author']['name'] = array(
     '#type' => 'textfield',
@@ -207,6 +210,7 @@ function node_form(&$form_state, $node) 
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#weight' => 95,
+    '#vertical_tab' => 'nodeFormPublishingOptions',
   );
   $form['options']['status'] = array(
     '#type' => 'checkbox',
@@ -233,8 +237,11 @@ function node_form(&$form_state, $node) 
   }
 
   // Add the buttons.
-  $form['buttons'] = array();
-  $form['buttons']['#weight'] = 100;
+  $form['buttons'] = array(
+    '#weight' => 100,
+    '#prefix' => '<div class="buttons">',
+    '#suffix' => '</div>',
+  );
   $form['buttons']['submit'] = array(
     '#type' => 'submit',
     '#access' => !variable_get('node_preview', 0) || (!form_get_errors() && isset($form_state['node_preview'])),
@@ -304,7 +311,7 @@ function node_body_field(&$node, $label,
 }
 
 /**
- * Button sumit function: handle the 'Delete' button on the node form.
+ * Button submit function: handle the 'Delete' button on the node form.
  */
 function node_form_delete_submit($form, &$form_state) {
   $destination = '';
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.149
diff -u -p -r1.149 path.module
--- modules/path/path.module	12 Oct 2008 04:30:06 -0000	1.149
+++ modules/path/path.module	27 Oct 2008 09:30:40 -0000
@@ -186,6 +186,7 @@ function path_nodeapi_delete(&$node, $ar
  */
 function path_form_alter(&$form, $form_state, $form_id) {
   if (!empty($form['#node_edit_form'])) {
+    drupal_add_js(drupal_get_path('module', 'path') .'/path.js');
     $path = isset($form['#node']->path) ? $form['#node']->path : NULL;
     $form['path'] = array(
       '#type' => 'fieldset',
@@ -194,6 +195,7 @@ function path_form_alter(&$form, $form_s
       '#collapsed' => empty($path),
       '#access' => user_access('create url aliases'),
       '#weight' => 30,
+      '#vertical_tab' => 'nodeFormPath',
     );
     $form['path']['path'] = array(
       '#type' => 'textfield',
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.633
diff -u -p -r1.633 system.module
--- modules/system/system.module	26 Oct 2008 18:06:39 -0000	1.633
+++ modules/system/system.module	27 Oct 2008 09:30:41 -0000
@@ -337,7 +337,7 @@ function system_elements() {
     '#collapsible' => FALSE,
     '#collapsed' => FALSE,
     '#value' => NULL,
-    '#process' => array('form_process_ahah'),
+    '#process' => array('form_process_ahah', 'form_process_vertical_tabs'),
   );
 
   $type['token'] = array(
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.213
diff -u -p -r1.213 upload.module
--- modules/upload/upload.module	12 Oct 2008 02:42:56 -0000	1.213
+++ modules/upload/upload.module	27 Oct 2008 09:30:42 -0000
@@ -227,6 +227,8 @@ function upload_form_alter(&$form, $form
   if (!empty($form['#node_edit_form'])) {
     $node = $form['#node'];
     if (variable_get("upload_$node->type", TRUE)) {
+      drupal_add_js(drupal_get_path('module', 'upload') .'/upload.js');
+
       // Attachments fieldset
       $form['attachments'] = array(
         '#type' => 'fieldset',
@@ -238,6 +240,7 @@ function upload_form_alter(&$form, $form
         '#prefix' => '<div class="attachments">',
         '#suffix' => '</div>',
         '#weight' => 30,
+        '#vertical_tab' => 'nodeFormAttachments',
       );
 
       // Wrapper for fieldset contents (used by ahah.js).