Index: openacs-4/packages/calendar/www/admin/calendar-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-edit.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/calendar/www/admin/calendar-edit.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/calendar-edit.tcl	25 Nov 2003 00:07:19 -0000	1.2.6.1
@@ -1,31 +1,35 @@
-# /packages/calendar/www/admin/calendar-edit.tcl
-
 ad_page_contract {
     
-    edit the basic info
-    of an existing calendar
+    Add/Edit calendar
 
-    @author Gary Jin (gjin@arsdigita.com)
-    
-    @party_id  key to owner id
-    @calendar_name  the name of the calendar
-    @calendar_permission the permissions of the calendar
-
     @creation-date Dec 14, 2000
     @cvs-id $Id$
 } {
-    {action edit}
-    {party_id:integer,notnull}
-    {calendar_id:integer,notnull}
-    {calendar_name:notnull}
-    {calendar_permission "private"}
+    {calendar_id:integer,optional}
 }
 
-if { [string equal $action "edit"] } {
-    calendar_update $calendar_id $party_id $calendar_name $calendar_permission
+set page_title "Add/Edit Calendar"
+set context [list $page_title]
+
+ad_form -name calendar -form {
+    {calendar_id:key}
+    {calendar_name:text
+        {label "[_ calendar.Calendar_Name]"}
+        {html {size 50}}
+    }
+} -edit_request {
+    set calendar_name [calendar_get_name $calendar_id]
+} -new_data {
+    calendar::new \
+        -owner_id [ad_conn user_id] \
+        -calendar_name $calendar_name 
+} -edit_data {
+    calendar::update \
+        -calendar_id $calendar_id \
+        -calendar_name $calendar_name 
+} -after_submit {
+    ad_returnredirect .
+    ad_script_abort
 }
 
-ad_returnredirect "."
 
-
-