Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	12 Jul 2004 14:49:55 -0000	1.5
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	13 Jan 2005 13:56:28 -0000	1.6
@@ -54,28 +54,45 @@
         {options $recurrance_options}
     }
 
-    {recur_until:date
+    {recur_until:text,text
         {label "[_ calendar.lt_Repeat_this_event_unt]"}
+	{html {id sel1}}
+	{after_html {<input type='reset' value=' ... ' onclick=\"return showCalendar('sel1', 'y-m-d');\"> \[<b>y-m-d </b>\]
+        }}
+
     }
 
     {submit:text(submit) {label "[_ calendar.Add_Recurrence]"}}
 
 } -validate {
     {recur_until
         {
-            [calendar::item::dates_valid_p -start_date $cal_item(start_date) -end_date [calendar::to_sql_datetime -date $recur_until -time "" -time_p 0]]
+            [calendar::item::dates_valid_p -start_date $cal_item(start_date) -end_date $recur_until]
         }
-        {[_ calendar.start_time_before_end_time]}
+       {[_ calendar.start_time_before_end_time]}
     }
 } -edit_data {
+
+    # To support green calendar
+    set recur_until [split $recur_until "-"]
+    lappend recur_until ""
+    lappend recur_until ""
+    lappend recur_until ""
+    lappend recur_until "DD MONTH YYYY"
+ 
     calendar::item::add_recurrence \
         -cal_item_id $cal_item_id \
         -interval_type $interval_type \
         -every_n $every_n \
         -days_of_week $days_of_week \
         -recur_until [calendar::to_sql_datetime -date $recur_until -time "" -time_p 0]
 } -edit_request {
-    set recur_until [template::util::date::from_ansi $cal_item(start_date)]
+    set aux [template::util::date::from_ansi $cal_item(start_date)]
+    set recur_until [lindex $aux 0]
+    append recur_until "-"
+    append recur_until [lindex $aux 1]
+    append recur_until "-"
+    append recur_until [lindex $aux 2]
     set interval_type week
 } -after_submit {
     ad_returnredirect $return_url