--- /var/www/drupal-cvs/modules/event/event.module	2004-06-11 13:00:57.000000000 -0700
+++ event.module	2004-06-18 12:48:03.000000000 -0700
@@ -409,7 +409,19 @@ function event_form(&$node, &$error) {
   if (module_exist('taxonomy')) {
     $output .= implode('', taxonomy_node_form('event', $node));
   }
-  $output .= form_item(t('Start'), event_form_date($node->start), t('When is this event taking place.'));
+  if (arg(3) && arg(4) && arg(5)) {
+    $start = 0;
+    $date = getdate($node->start);
+    $start = _event_mktime($date['hours'], $date['minutes'], 0, arg(4), arg(5), arg(3));
+    if (variable_get('event_timezone', '1')) {
+      $start -= $GLOBALS['user']->timezone;
+    }
+    $output .= form_item(t('Start'), event_form_date($start), t('When is this event taking place.'));
+  }
+  else {
+    $start = $node->start;
+    $output .= form_item(t('Start'), event_form_date($node->start), t('When is this event taking place.'));
+  }
   $fields = event_fields();
   foreach ($fields as $field => $def) {
     $function = "form_$def[0]";
@@ -605,7 +617,10 @@ function event_calendar_expanded($year, 
   }
 
   $fields = event_fields();
-  $output = "<div class=\"day\">$day</div>\n";
+  $output = "<div class=\"day\">";
+  $output .= "<span class='this'>$day</span>";
+  $output .= "<span class='add'><a href='node/add/event/$year/$month/$day'>+</a></span>";
+  $output .= "</div><br>";
   if (count($data = event_calendar_data($year, $month, $day))) {
     foreach ($data as $node) {
       $output .= '<div class="event">';