--- event.module.orig	2007-09-03 13:54:03.000000000 -0400
+++ event.module	2007-09-03 14:09:14.000000000 -0400
@@ -270,6 +270,12 @@ function event_admin_overview_settings()
     '#default_value' => variable_get('event_type_control', 'all'),
     '#options' => array('all' => t('Show content type filter control on calendar views'), 'request' => t('Only show content type filter control when content type filter view is requested'), 'never' => t('Never show content type filter control')));
 
+  $form['event_weight'] = array(
+    '#title' => t('Event Weight'),
+    '#type' => 'weight',
+    '#default_value' => variable_get('event_weight', '-10'),
+  );
+
   return system_settings_form($form);
 }
 
@@ -1896,13 +1902,19 @@ function event_form_alter($form_id, &$fo
     // node edit form
     case $form['type']['#value'] .'_node_form':
 
+      $form['event'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Date/Time'),
+        '#weight' => variable_get('event_weight', -15),
+      );
+
       if (variable_get('event_nodeapi_'. $form['type']['#value'], 'never') != 'never') {
 
         $form['event']['has_time'] = array(
           '#type' => 'checkbox',
           '#title' => t('Event has time'),
           '#default_value' => !isset($node->event['has_time']) ? 1 : $node->event['has_time'],
-          '#weight' => -16,
+          '#weight' => -6,
           '#description' => t('Is time important for this event? Uncheck if event takes all day.')
         );
 
@@ -1910,7 +1922,7 @@ function event_form_alter($form_id, &$fo
           '#type' => 'checkbox',
           '#title' => t('Event has end date'),
           '#default_value' => $node->event['has_end_date'],
-          '#weight' => -14,
+          '#weight' => 0,
           '#description' => t('Check if you want to specify end date for this event, then choose end date below.')
         );
 
@@ -1944,7 +1956,7 @@ function event_form_alter($form_id, &$fo
             '#jscalendar_timeFormat' => variable_get('event_ampm', '0') == 0 ? '24' : '12',
             '#size' => 19,
             '#maxlength' => 19,
-            '#weight' => -15,
+            '#weight' => -3,
             '#description' => t('YYYY-MM-DD HH:MM'),
             );
           $form['event']['event_end'] = array(
@@ -1957,7 +1969,7 @@ function event_form_alter($form_id, &$fo
             '#jscalendar_timeFormat' => variable_get('event_ampm', '0') == 0 ? '24' : '12',
             '#size' => 19,
             '#maxlength' => 19,
-            '#weight' => -13,
+            '#weight' => 2,
             '#description' => t('YYYY-MM-DD HH:MM'),
             );
         }
@@ -1965,14 +1977,14 @@ function event_form_alter($form_id, &$fo
           $form['event']['start'] = array(
             '#type' => 'fieldset',
             '#title' => t('Start date'),
-            '#weight' => -15
+            '#weight' => -3
             );
           $form['event']['start']['date'] = event_form_date(isset($node->event['start_orig']) ? $node->event['start_orig'] : _event_user_time(), 'start', $node->event['start_offset']);
 
           $form['event']['end'] = array(
             '#type' => 'fieldset',
             '#title' => t('End date'),
-            '#weight' => -13
+            '#weight' => 2
             );
           $form['event']['end']['date'] = event_form_date(isset($node->event['end_orig']) ? $node->event['end_orig'] : _event_user_time(), 'end', $node->event['end_offset']);
         }
@@ -1984,7 +1996,7 @@ function event_form_alter($form_id, &$fo
             '#default_value' => ($node->event['timezone'] ? $node->event['timezone'] : variable_get('date_default_timezone_id', 0)),
             '#options' => event_zonelist(),
             '#description' => t('Select the time zone this event occurs in.'),
-            '#weight' => -12
+            '#weight' => 4
             );
         }
         elseif (variable_get('configurable_timezones', 1) && $user->uid && strlen($user->timezone) && (variable_get('event_timezone_input', 'site') == 'user')) {