? modules/quiz
? sites/localhost.node_weight
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.14
diff -u -r1.14 form.inc
--- includes/form.inc	12 Nov 2005 03:45:57 -0000	1.14
+++ includes/form.inc	14 Nov 2005 22:45:07 -0000
@@ -263,7 +263,7 @@
   }
 
   // Recurse through all child elements.
-  $count  = 0;
+  $count  = 1;
   foreach (element_children($form) as $key) {
     // don't squash an existing tree value
     $form[$key]['#tree'] = (isset($form[$key]['#tree'])) ? $form[$key]['#tree'] : $form['#tree'];
Index: modules/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book.module,v
retrieving revision 1.329
diff -u -r1.329 book.module
--- modules/book.module	12 Nov 2005 11:26:16 -0000	1.329
+++ modules/book.module	14 Nov 2005 23:29:01 -0000
@@ -243,7 +243,7 @@
  */
 function book_form(&$node) {
   $form['parent'] = array(
-    '#type' => 'select', '#title' => t('Parent'), '#default_value' => ($node->parent ? $node->parent : arg(4)), '#options' => book_toc($node->nid), '#weight' => -15,
+    '#type' => 'select', '#title' => t('Parent'), '#default_value' => ($node->parent ? $node->parent : arg(4)), '#options' => book_toc($node->nid), '#weight' => -4,
     '#description' => t('The parent that this page belongs in. Note that pages whose parent is <top-level> are regarded as independent, top-level books.')
   );
 
@@ -254,16 +254,13 @@
   $form = array_merge($form, filter_form($node->format));
 
   $form['log'] = array(
-    '#type' => 'fieldset', '#title' => t('Log message'), '#collapsible' => TRUE, '#collapsed' => TRUE
-  );
-  $form['log']['message'] = array(
-    '#type' => 'textarea', '#default_value' => $node->log, '#weight' => 18,
+    '#type' => 'textarea', '#title' => t('Log message'), '#default_value' => $node->log, '#weight' => 18,
     '#description' => t('An explanation of the additions or updates being made to help other authors understand your motivations.')
   );
 
   if (user_access('administer nodes')) {
     $form['weight'] = array(
-        '#type' => 'weight', '#title' => t('Weight'),  '#default_value' => $node->weight, '#delta' => 15, '#weight' => -14,
+        '#type' => 'weight', '#title' => t('Weight'),  '#default_value' => $node->weight, '#delta' => 15, '#weight' => 15,
         '#description' => t('Pages at a given level are ordered first by weight and then by title.')
     );
   }
Index: modules/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter.module,v
retrieving revision 1.83
diff -u -r1.83 filter.module
--- modules/filter.module	12 Nov 2005 11:26:16 -0000	1.83
+++ modules/filter.module	14 Nov 2005 22:45:45 -0000
@@ -767,7 +767,7 @@
   $extra = l(t('More information about formatting options'), 'filter/tips');
 
   if (count($formats) > 1) {
-    $form['format'] = array('#type' => 'fieldset', '#title' => t('Input format'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -16);
+    $form['format'] = array('#type' => 'fieldset', '#title' => t('Input format'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 0);
     // Multiple formats available: display radio buttons with tips.
     foreach ($formats as $format) {
       $form['format'][$format->format] = array('#type' => 'filter_format', '#title' => $format->name, '#default_value' => $value, '#return_value' => $format->format, '#parents' => array('format'), '#description' => theme('filter_tips', _filter_tips($format->format, false)), '#valid' => 'filter_form');
Index: modules/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu.module,v
retrieving revision 1.45
diff -u -r1.45 menu.module
--- modules/menu.module	13 Nov 2005 07:52:14 -0000	1.45
+++ modules/menu.module	14 Nov 2005 23:55:28 -0000
@@ -610,7 +610,7 @@
     }
   }
 
-  $form['menu'] = array('#type' => 'fieldset', '#title' => t('Menu settings'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#tree' => TRUE);
+  $form['menu'] = array('#type' => 'fieldset', '#title' => t('Menu settings'), '#collapsible' => TRUE, '#collapsed' => empty($item['title']), '#tree' => TRUE);
 
   $form['menu']['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#default_value' => $item['title'], '#description' => t('The name to display for this link.'));
 
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.548
diff -u -r1.548 node.module
--- modules/node.module	13 Nov 2005 02:43:33 -0000	1.548
+++ modules/node.module	14 Nov 2005 22:45:33 -0000
@@ -1623,7 +1623,7 @@
    */
 
   if (user_access('administer nodes')) {
-    $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -5);
+    $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 40);
     $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#required' => TRUE, '#default_value' => $node->name, '#weight' => -1);
     $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#required' => TRUE, '#default_value' => $node->date);
 
@@ -1632,7 +1632,7 @@
     /**
     * Node options
     */
-    $form['options'] = array('#type' => 'fieldset', '#title' => t('Publishing options'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -5);
+    $form['options'] = array('#type' => 'fieldset', '#title' => t('Publishing options'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 45);
     $form['options']['status']   = array('#type' => 'checkbox', '#title' => t('Published'), '#default_value' => in_array('status', $node_options));
     $form['options']['moderate'] = array('#type' => 'checkbox', '#title' => t('In moderation queue'), '#default_value' => in_array('moderate', $node_options));
     $form['options']['promote']  = array('#type' => 'checkbox', '#title' => t('Promoted to front page'), '#default_value' => in_array('promote', $node_options));
@@ -1643,21 +1643,21 @@
   $nodeapi = node_invoke_nodeapi($node, 'form');
   if (is_array($nodeapi)) {
     foreach ($nodeapi as $key => $element) {
-      $nodeapi[$key]['#weight'] = isset($nodeapi[$key]['#weight']) ? $nodeapi[$key]['#weight'] : -4;
+      $nodeapi[$key]['#weight'] = isset($nodeapi[$key]['#weight']) ? $nodeapi[$key]['#weight'] : 50;
     }
     // Append extra node form elements.
     $form = array_merge($form, $nodeapi);
   }
 
-  $form['title']['#weight'] = isset($form['title']['#weight']) ? $form['title']['#weight'] : -18;
-  $form['body']['#weight'] = isset($form['body']['#weight']) ? $form['body']['#weight'] : -17;
+  $form['title']['#weight'] = isset($form['title']['#weight']) ? $form['title']['#weight'] : -5;
+  $form['body']['#weight'] = isset($form['body']['#weight']) ? $form['body']['#weight'] : 0;
 
   // Add the buttons.
-  $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 19);
+  $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 20);
 
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 20);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 25);
   if ($node->nid && node_access('delete', $node)) {
-    $form['delete'] = array('#type' => 'button', '#value' => t('Delete'), '#weight' => 21);
+    $form['delete'] = array('#type' => 'button', '#value' => t('Delete'), '#weight' => 30);
   }
 
   if ($op == t('Preview')) {
Index: modules/page.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/page.module,v
retrieving revision 1.144
diff -u -r1.144 page.module
--- modules/page.module	12 Nov 2005 11:26:16 -0000	1.144
+++ modules/page.module	14 Nov 2005 22:28:12 -0000
@@ -99,10 +99,7 @@
   $form = array_merge($form, filter_form($node->format));
 
   $form['log'] = array(
-    '#type' => 'fieldset', '#title' => t('Log message'), '#collapsible' => TRUE, '#collapsed' => TRUE
-  );
-  $form['log']['message'] = array(
-    '#type' => 'textarea', '#default_value' => $node->log,
+    '#type' => 'textarea', '#title' => t('Log message'), '#default_value' => $node->message,
     '#description' => t('An explanation of the additions or updates being made to help other authors understand your motivations.')
   );
 
Index: modules/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path.module,v
retrieving revision 1.71
diff -u -r1.71 path.module
--- modules/path.module	12 Nov 2005 11:26:16 -0000	1.71
+++ modules/path.module	14 Nov 2005 23:48:48 -0000
@@ -186,7 +186,7 @@
         break;
 
       case 'form':
-        $form['path'] = array('#type' => 'fieldset', '#title' => t('URL path settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
+        $form['path'] = array('#type' => 'fieldset', '#title' => t('URL path settings'), '#collapsible' => TRUE, '#collapsed' => empty($node->path));
         $form['path']['path'] = array('#type' => 'textfield', '#default_value' => $node->path, '#maxlength' => 250, '#collapsible' => TRUE, '#collapsed' => TRUE, '#description' => t('Optionally specify an alternative URL by which this node can be accessed.  For example, type "about" when writing an about page.  Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'));
         if ($node->path) {
           $form['path']['pid'] = array('#type' => 'hidden', '#value' => db_result(db_query("SELECT pid FROM {url_alias} WHERE dst = '%s'", $node->path)));
Index: modules/story.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/story.module,v
retrieving revision 1.176
diff -u -r1.176 story.module
--- modules/story.module	12 Nov 2005 11:26:16 -0000	1.176
+++ modules/story.module	14 Nov 2005 23:36:28 -0000
@@ -93,12 +93,6 @@
   );
   $form = array_merge($form, filter_form($node->format));
 
-
-  $form['log'] = array(
-    '#type' => 'textarea', '#title' => t('Log message'), '#default_value' => $node->log,
-    '#description' => t('An explanation of the additions or updates being made to help other authors understand your motivations.')
-  );
-
   return $form;
 }