Index: node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.538
diff -u -r1.538 node.module
--- node.module	22 Oct 2005 15:14:46 -0000	1.538
+++ node.module	22 Oct 2005 23:45:03 -0000
@@ -1616,7 +1616,7 @@
    */
 
   if (user_access('administer nodes')) {
-    $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -18);
+    $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -5);
     $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name, '#weight' => -1);
     $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#required' => TRUE, '#default_value' => $node->date);
 
@@ -1625,7 +1625,7 @@
     /**
     * Node options
     */
-    $form['options'] = array('#type' => 'fieldset', '#title' => t('Publishing options'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -18);
+    $form['options'] = array('#type' => 'fieldset', '#title' => t('Publishing options'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -5);
     $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));
@@ -1633,18 +1633,17 @@
     $form['options']['revision'] = array('#type' => 'checkbox', '#title' =>t('Create new revision'), '#default_value' => in_array('revision', $node_options));
   }
 
-
   $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'] : -18;
+      $nodeapi[$key]['#weight'] = isset($nodeapi[$key]['#weight']) ? $nodeapi[$key]['#weight'] : -4;
     }
     // Append extra node form elements.
     $form = array_merge($form, $nodeapi);
   }
 
-  $form['title']['#weight'] = isset($form['title']['#weight']) ? $form['title']['#weight'] : -17;
-  $form['body']['#weight'] = isset($form['body']['#weight']) ? $form['body']['#weight'] : -5;
+  $form['title']['#weight'] = isset($form['title']['#weight']) ? $form['title']['#weight'] : -18;
+  $form['body']['#weight'] = isset($form['body']['#weight']) ? $form['body']['#weight'] : -17;
 
   // Add the buttons.
   $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 19);
@@ -1669,6 +1668,9 @@
     $output .= form_render($form['node_preview']);
   }
 
+  $output .= '  <div class="standard">';
+  $output .= form_render($form);
+  $output .= '  </div>';
   $output .= '  <div class="admin">';
   $output .= '    <div class="authored">';
   $output .= form_render($form['author']);
@@ -1676,9 +1678,6 @@
   $output .= '    <div class="options">';
   $output .= form_render($form['options']);
   $output .= '    </div>';
-  $output .= '</div>';
-  $output .= '  <div class="standard">';
-  $output .= form_render($form);
   $output .= '  </div>';
   $output .= '</div>';
   return $output;