Index: openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs-postgresql.xql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql	11 Aug 2003 12:14:15 -0000	1.10
+++ openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql	13 Aug 2003 16:08:33 -0000	1.11
@@ -14,7 +14,7 @@
 
     <fullquery name="calendar::item::get.select_item_data">      
       <querytext>
-       select
+      select
          i.cal_item_id,
          0 as n_attachments,
          to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
Index: openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl	11 Aug 2003 12:14:15 -0000	1.9
+++ openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl	13 Aug 2003 16:08:33 -0000	1.10
@@ -66,8 +66,8 @@
         # Timezonize
 
 
-        set row(start_date_ansi) [lc_time_utc_to_local $row(start_date_ansi)]
-        set row(end_date_ansi) [lc_time_utc_to_local $row(end_date_ansi)]
+        set row(start_date_ansi) [lc_time_system_to_conn $row(start_date_ansi)]
+        set row(end_date_ansi) [lc_time_system_to_conn $row(end_date_ansi)]
 
         # Localize
         set row(start_time) [lc_time_fmt $row(start_date_ansi) "%X"]
@@ -122,6 +122,7 @@
         {-edit_all_p 0}
     } {
         Edit the item
+
     } {
         cal_item_update $cal_item_id $start_date $end_date $name $description $item_type_id $edit_all_p
     }
Index: openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	17 May 2003 10:20:49 -0000	1.14
+++ openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	13 Aug 2003 16:08:33 -0000	1.15
@@ -52,7 +52,7 @@
 					:creation_ip
 	)
 
-      </querytext>
+     </querytext>
 </fullquery>
 
  
Index: openacs-4/packages/calendar/tcl/cal-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/calendar/tcl/cal-item-procs.tcl	11 Aug 2003 12:14:15 -0000	1.12
+++ openacs-4/packages/calendar/tcl/cal-item-procs.tcl	13 Aug 2003 16:08:33 -0000	1.13
@@ -86,8 +86,8 @@
     set date_format "YYYY-MM-DD HH24:MI"
 
     # Convert from user timezone to system timezone
-    set start_date [lc_time_local_to_utc $start_date]
-    set end_date [lc_time_local_to_utc $end_date]        
+    set start_date [lc_time_conn_to_system $start_date]
+    set end_date [lc_time_conn_to_system $end_date]        
 
     # find out the timespan_id
     set timespan_id [db_exec_plsql insert_timespan {
@@ -164,8 +164,8 @@
     set date_format "YYYY-MM-DD HH24:MI"
 
     # Convert from user timezone to system timezone
-    set start_date [lc_time_local_to_utc $start_date]
-    set end_date [lc_time_local_to_utc $end_date]        
+    set start_date [lc_time_conn_to_system $start_date]
+    set end_date [lc_time_conn_to_system $end_date]        
 
     # update the events
     db_dml update_event ""
Index: openacs-4/packages/calendar/www/cal-item-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/calendar/www/cal-item-edit.adp	11 Aug 2003 12:14:16 -0000	1.8
+++ openacs-4/packages/calendar/www/cal-item-edit.adp	13 Aug 2003 16:08:33 -0000	1.9
@@ -1,15 +1,24 @@
 <master>
-<property name="title">#calendar.Calendar_Edit_Item#</property>
-<property name="context">#calendar.Edit#</property>
-<property name="focus">cal_item.title</property>
+
+<if @ad_form_mode@ eq display>
+  <property name="title">#calendar.Calendar_Edit_Item#</property>
+  <property name="context">#calendar.Edit#</property>
+  <property name="focus">cal_item.title</property>
+</if>
+<else>
+  <property name="title">#calendar.Calendar_Add_Item#</property>
+  <property name="context">#calendar.Add#</property>
+  <property name="focus">cal_item.title</property>
+</else>
+
 <link href="calendar.css" rel="stylesheet" type="text/css">
 
 <table width="95%">
 
   <tr>
     <td valign=top width=150>
       <p>
-      <include src="mini-calendar" base_url="view" view="day" date="@date@">
+      <include src="mini-calendar" base_url="view" view="day" date="@date@">ROEDEL
       <p>
 	<include src="cal-options" calendar_list="@calendar_list@">	
     </td>	
@@ -22,4 +31,3 @@
   </tr>
 </table>
 </if>
-
Index: openacs-4/packages/calendar/www/cal-item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/calendar/www/cal-item-edit.tcl	11 Aug 2003 12:14:16 -0000	1.19
+++ openacs-4/packages/calendar/www/cal-item-edit.tcl	13 Aug 2003 16:08:33 -0000	1.20
@@ -12,6 +12,8 @@
     cal_item_id:integer,notnull
 } 
 
+set calendar_list [calendar::calendar_list]
+
 # Permissions
 # FIXME: we need to add a permissions check here!
 
Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/calendar/www/cal-item-new.adp	11 Aug 2003 12:14:16 -0000	1.10
+++ openacs-4/packages/calendar/www/cal-item-new.adp	13 Aug 2003 16:08:33 -0000	1.11
@@ -1,9 +1,18 @@
+
 <master>
-<property name="title">#calendar.Calendar_Add_Item#</property>
-<property name="context">#calendar.Add#</property>
-<property name="focus">cal_item.title</property>
+<if @ad_form_mode@ eq display>
+  <property name="title">#calendar.Calendar_Edit_Item#</property>
+  <property name="context">#calendar.Edit#</property>
+  <property name="focus">cal_item.title</property>
+</if>
+<else>
+  <property name="title">#calendar.Calendar_Add_Item#</property>
+  <property name="context">#calendar.Add#</property>
+  <property name="focus">cal_item.title</property>
+</else>
 <property name="onload">TimePChanged()</property>
 
+
 <link href="calendar.css" rel="stylesheet" type="text/css">
 
 <script language="JavaScript">
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/calendar/www/cal-item-new.tcl	11 Aug 2003 12:14:16 -0000	1.11
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	13 Aug 2003 16:08:33 -0000	1.12
@@ -1,72 +1,148 @@
 ad_page_contract {
     
     Creating a new Calendar Item
-    
+
+    @author Dirk Gomez (openacs@dirkgomez.de)
     @author Ben Adida (ben@openforce.net)
     @creation-date May 29, 2002
     @cvs-id $Id$
 } {
-    {calendar_id ""}
+    {calendar_id:integer ""}
+    cal_item_id:integer,optional
+    item_type_id:integer,optional
     {date ""}
     {julian_date ""}
     {start_time ""}
     {end_time ""}
 }
 
+if {![info exists item_type_id]} {
+    set item_type_id ""
+}
+
 set package_id [ad_conn package_id]
+set user_id [ad_conn user_id]
 
 set date [calendar::adjust_date -date $date -julian_date $julian_date]
 set calendar_list [calendar::calendar_list]
 
-if {[empty_string_p $calendar_id]} {
-    set calendar_list [calendar::calendar_list]
-
-    if {[llength $calendar_list] > 1} {
-        set return_url [ns_urlencode "cal-item-new?date=[ns_urlencode $date]&start_time=$start_time&end_time=$end_time"]
+if {![info exists cal_item_id]} {
+    if {[llength $calendar_list] > 1 && [empty_string_p $calendar_id]} {
+        set return_url [ad_urlencode "cal-item-new?date=[ns_urlencode $date]&start_time=$start_time&end_time=$end_time"]
         ad_returnredirect "calendar-choose?return_url=$return_url"
         ad_script_abort
+    } else {
+	set calendar_id [lindex [lindex $calendar_list 0] 1]
     }
+} else {
+    set calendar_id [db_string get_calendar_id {select 
+         on_which_calendar as calendar_id
+         from cal_items 
+        where cal_item_id = :cal_item_id} -default ""]
 
-    set calendar_id [lindex [lindex $calendar_list 0] 1]
 }
 
-# Create the form
-form create cal_item
+if { [exists_and_not_null cal_item_id] } {
+    set page_title "One calendar item"
+    set ad_form_mode display
+} else {
+    set page_title "Add a calendar item"
+    set ad_form_mode edit
+}
 
-element create cal_item calendar_id \
-        -label "Calendar ID" -datatype integer -widget hidden -value $calendar_id
+ad_form -name cal_item  -form {
+    cal_item_id:key
 
-element create cal_item title \
-        -label "[_ calendar.Title_1]" -datatype text -widget text -html {size 60} -maxlength 255
+    {title:text(text)
+        {label "[_ calendar.Title_1]"}
+        {html {size 60} maxlength 255}
+    }
 
-element create cal_item date \
-        -label "[_ calendar.Date_1]" -datatype date -widget date
+    {date:date
+        {label "[_ calendar.Date_1]"}
+    }
 
-element create cal_item time_p \
-        -label "&nbsp;" -datatype text -widget radio -html {onchange "javascript:TimePChanged();"} -options [list [list "[_ calendar.All_Day_Event]" 0] [list "[_ calendar.Use_Hours_Below]" 1]]
+    {time_p:text(radio)     
+        {label "&nbsp;"}
+        {html {onchange "javascript:TimePChanged();"}} 
+        {options {{"[_ calendar.All_Day_Event]" 0}
+                  {"[_ calendar.Use_Hours_Below]" 1} }}
+    }
 
-element create cal_item start_time \
-        -label "[_ calendar.Start_Time]" -datatype date -widget date \
-        -format [lc_get formbuilder_time_format] -optional
+    {start_time:date,optional
+        {label "[_ calendar.Start_Time]"}
+        {format {[lc_get formbuilder_time_format]}}
+    }
 
-element create cal_item end_time \
-        -label "[_ calendar.End_Time]" -datatype date -widget date \
-        -format [lc_get formbuilder_time_format] -optional
+    {end_time:date,optional
+        {label "[_ calendar.End_Time]"}
+        {format {[lc_get formbuilder_time_format]}}
+    }
 
-element create cal_item description \
-        -label "[_ calendar.Description]" -datatype text -widget textarea -html {cols 60 rows 3 wrap soft} -optional
+    {description:text(textarea),optional
+        {label "[_ calendar.Description]"}
+        {html {cols 60 rows 3 wrap soft} maxlength 255}
+    }
 
-element create cal_item item_type_id \
-        -label "[_ calendar.Type_1]" -datatype integer -widget select -options [calendar::get_item_types -calendar_id $calendar_id] -optional
+    {repeat_p:text(radio)     
+        {label "[_ calendar.Repeat_1]"}
+        {options {{"[_ calendar.Yes]" 1}
+                  {"[_ calendar.No]" 0} }}
+    }
 
-element create cal_item repeat_p \
-        -label "[_ calendar.Repeat_1]" -datatype text -widget radio -options [list [list "[_ calendar.Yes]" 1] [list "[_ calendar.No]" 0]] -value 0
+    {calendar_id:text(hidden) {value $calendar_id}}
+}
 
-# Process the form
-if {[form is_valid cal_item]} {
-    template::form get_values cal_item calendar_id title date time_p start_time end_time description item_type_id repeat_p
+set cal_item_types [calendar::get_item_types -calendar_id $calendar_id]
 
-    # Set up the datetimes
+if {[llength $cal_item_types] > 1} {
+    ad_form -extend -name cal_item -form {
+        {item_type_id:integer(select),optional
+            {label "[_ calendar.Type_1]"}
+            {options {$cal_item_types}}
+        }
+    }
+}
+
+
+ad_form -extend -name cal_item -validate { 
+    {title {[string length $title] <= 4000}
+        " TITLE MUST BE 4"
+    }
+} -new_request {
+    set date [template::util::date::from_ansi $date]
+    set time_p 0
+    set repeat_p 0
+} -edit_request {
+    calendar::item::get -cal_item_id $cal_item_id -array cal_item
+    set cal_item_id $cal_item(cal_item_id)
+    set n_attachments $cal_item(n_attachments)
+    set ansi_start_date $cal_item(start_date_ansi)
+    set ansi_end_date $cal_item(end_date_ansi)
+    set start_time $cal_item(start_time)
+    set end_time $cal_item(end_time)
+    set title $cal_item(name)
+    set description $cal_item(description)
+    set repeat_p $cal_item(recurrence_id)
+    set item_type $cal_item(item_type)
+    set item_type_id $cal_item(item_type_id)
+    set calendar_id $cal_item(calendar_id)
+
+    if {[string equal $start_time "12:00 AM"] && [string equal $end_time "12:00 AM"]} {
+        set time_p 0
+    } else {
+        set time_p 1
+    }
+
+    if {[empty_string_p $repeat_p]} {
+        set repeat_p 0
+    } else {
+        set repeat_p 1
+    }
+    set date [template::util::date::from_ansi $ansi_start_date]
+    set start_time [template::util::date::from_ansi $ansi_start_date [lc_get formbuilder_time_format]]
+    set end_time [template::util::date::from_ansi $ansi_end_date [lc_get formbuilder_time_format]]
+} -new_data {
     set start_date [calendar::to_sql_datetime -date $date -time $start_time -time_p $time_p]
     set end_date [calendar::to_sql_datetime -date $date -time $end_time -time_p $time_p]
 
@@ -76,42 +152,27 @@
             -description $description \
             -calendar_id $calendar_id \
             -item_type_id $item_type_id]
+} -edit_data {
+    # set up the datetimes
+    set start_date [calendar::to_sql_datetime -date $date -time $start_time -time_p $time_p]
+    set end_date [calendar::to_sql_datetime -date $date -time $end_time -time_p $time_p]
 
-    # If repeat_p, go to repetition page
+    # Do the edit
+    calendar::item::edit -cal_item_id $cal_item_id \
+            -start_date $start_date \
+            -end_date $end_date \
+            -name $title \
+            -description $description \
+            -item_type_id $item_type_id \
+            -edit_all_p $repeat_p
+} -after_submit {
     if {$repeat_p} {
         ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id"
     } else {
         ad_returnredirect "cal-item-view?cal_item_id=$cal_item_id"
     }
-    
-    # Stop here
     ad_script_abort
 }
-# Hide the type widget if there *are* no types to choose from
-if { [llength [element get_property cal_item item_type_id options]] <= 1 } {
-    element set_properties cal_item item_type_id -widget hidden
-}
 
-if { [form is_request cal_item] } {
-    # Set some properties
-    element set_properties cal_item date -value [calendar::from_sql_datetime -sql_date $date -format "YYYY-MM-DD"]
-    
-    if {[dt_no_time_p -start_time $start_time -end_time $end_time]} {
-        # No time event
-        element set_properties cal_item time_p -value 0
-    } else {
-        if {![empty_string_p $start_time]} {
-            set start_time_date [calendar::from_sql_datetime -sql_date $start_time -format {HH24}]
-            element set_properties cal_item start_time -value $start_time_date
-        }
-        
-        if {![empty_string_p $end_time]} {
-            set end_time_date [calendar::from_sql_datetime -sql_date $end_time -format {HH24}]
-            element set_properties cal_item end_time -value $end_time_date
-        }
-        
-        element set_properties cal_item time_p -value 1
-    }
-}
 
 ad_return_template
Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/calendar/www/cal-item-view.adp	21 Jul 2003 19:21:36 -0000	1.17
+++ openacs-4/packages/calendar/www/cal-item-view.adp	13 Aug 2003 16:08:33 -0000	1.18
@@ -81,7 +81,7 @@
     <tr>
     <td class="table-data-action">
     <a
-    href="cal-item-edit?cal_item_id=@cal_item_id@&return_url=@return_url@">#calendar.edit#</a>
+    href="cal-item-new?cal_item_id=@cal_item_id@&return_url=@return_url@">#calendar.edit#</a>
     </td>
     <td>Edit this calendar event</td>
     </tr>
Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/calendar/www/mini-calendar.tcl	21 Jul 2003 19:21:36 -0000	1.1
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	13 Aug 2003 16:08:33 -0000	1.2
@@ -4,7 +4,7 @@
 
 if {![exists_and_not_null date]} {
     set date [dt_sysdate]
-}
+} 
 
 # Create row with existing views
 multirow create views name text active_p
@@ -20,10 +20,14 @@
 set list_of_vars [list]
 
 # Get the current month, day, and the first day of the month
+if {[catch {
+    dt_get_info $date
+} errmsg]} {
+    set date "[lindex $date 0]-[lindex $date 1]-[lindex $date 2]"
+    dt_get_info $date
+}
 
-dt_get_info $date
 
-
 set now        [clock scan $date]
 set output ""
 
Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/www/view-list-display.tcl	11 Aug 2003 12:14:16 -0000	1.4
+++ openacs-4/packages/calendar/www/view-list-display.tcl	13 Aug 2003 16:08:33 -0000	1.5
@@ -50,9 +50,9 @@
     
 db_foreach select_list_items {} {
     # Timezonize
-    set ansi_start_date [lc_time_utc_to_local $ansi_start_date]
-    set ansi_end_date [lc_time_utc_to_local $ansi_end_date]
-    set ansi_today [lc_time_utc_to_local $ansi_today]
+    set ansi_start_date [lc_time_system_to_conn $ansi_start_date]
+    set ansi_end_date [lc_time_system_to_conn $ansi_end_date]
+    set ansi_today [lc_time_system_to_conn $ansi_today]
 
     # Localize
     set pretty_weekday [lc_time_fmt $ansi_start_date "%A"]
Index: openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-one-day-display-postgresql.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql	11 Aug 2003 12:14:16 -0000	1.5
+++ openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql	13 Aug 2003 16:08:33 -0000	1.6
@@ -84,4 +84,3 @@
 
 
 </queryset>
-
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	11 Aug 2003 12:14:16 -0000	1.5
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	13 Aug 2003 16:08:33 -0000	1.6
@@ -10,9 +10,6 @@
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 
-# LARS: ERROR:
-# calendar_id_list now contains {Personal 1961 t}
-
 # Loop through the calendars
 multirow create day_items_without_time name status_summary item_id calendar_name
 
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/calendar/www/view.adp	26 Jul 2003 20:55:11 -0000	1.14
+++ openacs-4/packages/calendar/www/view.adp	13 Aug 2003 16:08:33 -0000	1.15
@@ -11,7 +11,7 @@
     <include src="mini-calendar" base_url="view" view="@view@" date="@date@">
 </center>
 <p>
-    <a href="cal-item-new?julian_date=@julian_date@" title="#calendar.Add_Item#"><img border=0 align="left" valign="top" src="/shared/images/add.gif" alt="#calendar.Add_Item#">#calendar.Add_Item#</a>
+    <a href="cal-item-new?date=@date@" title="#calendar.Add_Item#"><img border=0 align="left" valign="top" src="/shared/images/add.gif" alt="#calendar.Add_Item#">#calendar.Add_Item#</a>
 <p>
 <if @admin_p@ eq 1>
     <a href="admin/">Administer Calendar</a>
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/calendar/www/view.tcl	11 Aug 2003 12:14:16 -0000	1.15
+++ openacs-4/packages/calendar/www/view.tcl	13 Aug 2003 16:08:33 -0000	1.16
@@ -9,7 +9,6 @@
 } {
     {view day}
     {date ""}
-    {julian_date ""}
     {sort_by ""}
     {start_date ""}
     {period_days:integer "31"}
@@ -29,7 +28,7 @@
 set admin_p [ad_permission_p $package_id calendar_admin]
 
 set calendar_list [calendar::calendar_list]
-set date [calendar::adjust_date -date $date -julian_date $julian_date]
+set date [calendar::adjust_date -date $date]
 
 if {$view == "list"} {
     if {[empty_string_p $start_date]} {