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 -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-item-edit.tcl	15 Sep 2001 07:14:32 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-item-edit.tcl	11 Feb 2002 20:53:47 -0000	1.3
@@ -16,6 +16,7 @@
     {end_time:array ""}
     {name ""}
     {description ""}
+    {return_url ""}
 } 
 
 # find out the user_id 
@@ -31,7 +32,7 @@
 
  cal_item_delete $cal_item_id
 
- ad_returnredirect "?[export_url_vars date action view]"
+    ad_returnredirect "${return_url}?[export_url_vars date action view]"
 
 }
 
@@ -64,41 +65,4 @@
 set action "view"
 set date [calendar_make_date [array get event_date]]
 
-ad_returnredirect "?[export_url_vars date action view]"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ad_returnredirect "${return_url}?[export_url_vars date action view]"
Index: openacs-4/packages/calendar/www/cal-item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-item.adp	23 Jan 2002 08:11:16 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-item.adp	11 Feb 2002 20:53:47 -0000	1.3
@@ -10,13 +10,14 @@
 <if @action@ eq edit or @action@ eq delete>
   <form action="cal-item-edit" method=post>
     <input type=hidden name=cal_item_id value=@cal_item_id@>	
+    <input type=hidden name=return_url value=@return_url@>
 </if>
 
 <else>
   <if @action@ eq add>
     <form action="cal-item-create" method=post>
     <input type=hidden name=return_url value="@return_url@">
-  </if>
+</if>
 </else>
 
 <table>
@@ -109,6 +110,7 @@
    <if @delete_p@ eq 1> 
       <if @action@ eq edit or @action@ eq delete>       
         <form action="cal-item-edit" method=post>
+          <input type=hidden name=return_url value=@return_url@>
           <input type=hidden name=action value=delete>
 	  <input type=hidden name=cal_item_id value=@cal_item_id@>
 	  <td valign=top align=left>