--- event.module	2006-03-13 02:56:44.000000000 -0800
+++ event.module.patched	2006-03-13 02:59:10.000000000 -0800
@@ -156,6 +156,23 @@
     $form['event_settings_default']['event_timezone_display'] = array('#type' => 'radios', '#title' => t('Event time zone display'), '#default_value' => variable_get('event_timezone_display', 'event'), '#options' => array('event' => t("Use the event's time zone"), 'site' => t('Use the sitewide time zone')), '#description' => t("Events are saved with a time zone value. This setting allows you to determine if the event's time zone, the sitewide time zone, or the user's personal time zone setting is used to display the time for an event. You must have 'Configurable time zones' enabled in %url before you can enable user's time zones for this feature.", array('%url' => l(t('site configuration'), 'admin/settings'))), '#required' => TRUE);
   }
   $form['event_settings_default']['event_ampm'] = array('#type' => 'radios', '#title' =>  t('Time notation preference'), '#default_value' => variable_get('event_ampm', '0'), '#options' => array('0' => t('24h'),'1' => t('12h')), '#description' => t('The time notation system used for entering event times.'), '#required' => TRUE);
+
+  $ex_date_small = format_date(time(), 'small', '');
+  $ex_date_med   = format_date(time(), 'medium', '');
+  $ex_date_large = format_date(time(), 'large', '');
+  $form['event_settings_default']['event_start_end_format'] = array(
+    '#type' => 'radios', 
+    '#title' =>  t('Start/End Time Display format'), 
+    '#default_value' => variable_get('event_start_end_format', 'small'), 
+    '#options' => array(
+      'small' => t("small ( ex: $ex_date_small )"),
+      'medium' => t("medium ( ex: $ex_date_med )"), 
+      'large' => t("long ( ex: $ex_date_large )")
+    ), 
+    '#description' => t('The format to display event start/end times.  You can specify each of these formats %link.', array('%link' => l(t('here'), 'admin/settings'))), 
+    '#required' => TRUE,
+  );
+
   $form['event_settings_default']['event_upcoming_limit'] = array('#type' => 'textfield', '#title' => t('Upcoming event block limit'), '#default_value' => variable_get('event_upcoming_limit', '6'), '#maxlength' => 5, '#size' => 2, '#description' => t('Limit the amount of events displayed in the upcoming events block by this amount.'));
 
   $form['event_overview_options'] = array('#type' => 'fieldset', '#title' => t('Event overview options'));
@@ -1862,10 +1879,10 @@
           'event_end'         => $object->event_end,
           'timezone'          => $object->timezone,
           'start_offset'      => $start_offset,
-          'start_format'      => format_date($object->event_start, 'small', '', $start_offset),
+          'start_format'      => format_date($object->event_start, (variable_get('event_start_end_format', 'small')), '', $start_offset),
           'start_time_format' => format_date($object->event_start, 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'), $start_offset),
           'end_offset'        => $end_offset,
-          'end_format'        => format_date($object->event_end, 'small', '', $end_offset),
+          'end_format'        => format_date($object->event_end, (variable_get('event_start_end_format', 'small')), '', $end_offset),
           'end_time_format'   => format_date($object->event_end, 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'), $end_offset),
           'event_node_title'  => ($ctype->name ? $ctype->name : $node->type));
         break;