--- contrib/event_all_day/event_all_day.module.orig	2007-08-30 22:33:07.000000000 -0400
+++ contrib/event_all_day/event_all_day.module	2007-08-30 23:44:31.000000000 -0400
@@ -14,11 +14,11 @@ function event_all_day_form_alter($form_
   $type = (isset($form['type']) && isset($form['type']['#value'])) ? $form['type']['#value'] : NULL;
   if ($form_id == $type .'_node_form' && variable_get('event_nodeapi_'. $type, 'never') != 'never') {
     // add all day checkbox
-    $form['start_minute_all_day'] = array(
+    $form['event']['start_minute_all_day'] = array(
       '#type' => 'checkbox',
       '#title' => t('All day'),
       '#default_value' => 0,
-      '#weight' => -14,
+      '#weight' => -3,
     );
     
     $path = drupal_get_path('module', 'event_all_day');


--- event.module.orig	2007-08-30 22:08:47.000000000 -0400
+++ event.module	2007-08-31 00:52:21.000000000 -0400
@@ -250,6 +250,12 @@ function event_admin_overview_settings()
     '#title' => t('Content type filter controls'), '#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);
 }
 
@@ -1901,7 +1907,13 @@ function event_form_alter($form_id, &$fo
          */
         if (module_exists('jscalendar')) {
 
-          $form['start_date'] = array(
+          $form['event'] = array(
+            '#type' => 'fieldset',
+            '#title' => t('Event Time'),
+            '#weight' => variable_get('event_weight', -15),
+          );
+
+          $form['event']['start_date'] = array(
             '#title' => t('Start Date'),
             '#type' => 'textfield',
             '#default_value' => _event_date('Y-m-d H:i', $node->event_start ? $node->event_start : _event_user_time(), $node->start_offset),
@@ -1911,10 +1923,10 @@ function event_form_alter($form_id, &$fo
             '#jscalendar_timeFormat' => variable_get('event_ampm', '0') == 0 ? '24' : '12',
             '#size' => 19,
             '#maxlength' => 19,
-            '#weight' => -15,
+            '#weight' => -5,
             '#description' => t('YYYY-MM-DD HH:MM'),
             );
-          $form['end_date'] = array(
+          $form['event']['end_date'] = array(
             '#title' => t('End Date'),
             '#type' => 'textfield',
             '#default_value' => _event_date('Y-m-d H:i', $node->event_end ? $node->event_end : _event_user_time(), $node->end_offset),
@@ -1924,45 +1936,52 @@ function event_form_alter($form_id, &$fo
             '#jscalendar_timeFormat' => variable_get('event_ampm', '0') == 0 ? '24' : '12',
             '#size' => 19,
             '#maxlength' => 19,
-            '#weight' => -14,
+            '#weight' => 0,
             '#description' => t('YYYY-MM-DD HH:MM'),
             );
         }
         else {
-          $form['event_start'] = array(
+
+          $form['event'] = array(
+            '#type' => 'fieldset',
+            '#title' => t('Event Time'),
+            '#weight' => variable_get('event_weight', -15),
+          );
+
+          $form['event']['event_start'] = array(
             '#type' => 'fieldset',
             '#title' => t('Start date'),
-            '#weight' => -15
+            '#weight' => -5,
             );
-          $form['event_start']['date'] = event_form_date($node->event_start ? $node->event_start : _event_user_time(), 'start', $node->start_offset);
+          $form['event']['event_start']['date'] = event_form_date($node->event_start ? $node->event_start : _event_user_time(), 'start', $node->start_offset);
 
-          $form['event_end'] = array(
+          $form['event']['event_end'] = array(
             '#type' => 'fieldset',
             '#title' => t('End date'),
-            '#weight' => -14
+            '#weight' => 0,
             );
-          $form['event_end']['date'] = event_form_date(($node->event_end ? $node->event_end : _event_user_time()), 'end', $node->end_offset);
+          $form['event']['event_end']['date'] = event_form_date(($node->event_end ? $node->event_end : _event_user_time()), 'end', $node->end_offset);
 
         }
 
         if (variable_get('event_timezone_input', 'site') == 'input') {
-          $form['timezone'] = array(
+          $form['event']['timezone'] = array(
             '#type' => 'select',
             '#title' => t('Time zone'),
             '#default_value' => ($node->timezone ? $node->timezone : event_timezone_map(variable_get('date_default_timezone', 0))),
             '#options' => event_zonelist(),
             '#description' => t('Select the time zone this event occurs in.'),
-            '#weight' => -13
+            '#weight' => 5,
             );
         }
         elseif (variable_get('configurable_timezones', 1) && $user->uid && strlen($user->timezone) && (variable_get('event_timezone_input', 'site') == 'user')) {
-          $form['timezone'] = array(
+          $form['event']['timezone'] = array(
             '#type' => 'hidden',
             '#value' =>  event_timezone_map($user->timezone)
             );
         }
         else {
-          $form['timezone'] = array(
+          $form['event']['timezone'] = array(
             '#type' => 'hidden',
             '#value' => event_timezone_map(variable_get('date_default_timezone', 0))
             );
@@ -2066,7 +2085,7 @@ function event_nodeapi(&$node, $op, $tea
       case 'view':
         $node->content['event'] = array(
           '#value' => theme('event_nodeapi', $node),
-          '#weight' => -10,
+          '#weight' => variable_get('event_weight', -10),
         );
         break;
       case 'rss item':