Index: openacs-4/packages/calendar/tcl/calendar-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/calendar/tcl/calendar-display-procs.tcl	16 Apr 2002 05:16:42 -0000	1.14
+++ openacs-4/packages/calendar/tcl/calendar-display-procs.tcl	16 Apr 2002 05:30:24 -0000	1.15
@@ -263,6 +263,11 @@
            set calendar_name [calendar_get_name $calendar_id]
            # ns_log Notice "bma: one calendar $calendar_name"
 
+           # In case we need to dispatch to a different URL (ben)
+           if {![empty_string_p $url_stub_callback]} {
+               set url_stub [eval $url_stub_callback $calendar_id]
+           }
+
            db_foreach select_day_items {} {
                # ns_log Notice "bma: one item"
                set item "$pretty_start_date - $pretty_end_date: $name ($calendar_name)"
Index: openacs-4/packages/calendar/www/cal-item-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/calendar/www/cal-item-create.tcl	10 Apr 2002 00:54:09 -0000	1.13
+++ openacs-4/packages/calendar/www/cal-item-create.tcl	16 Apr 2002 05:30:24 -0000	1.14
@@ -21,6 +21,7 @@
     {return_url ""}
     {recurrence_p 0}
     {item_type_id ""}
+    {show_cal_nav 1}
 } 
 
 if { $date == "now" } {
@@ -123,12 +124,12 @@
 
 # Fix up the return URL
 if {[empty_string_p $return_url]} {
-    set return_url "cal-item-view?[export_url_vars date action view cal_item_id]"
+    set return_url "cal-item-view?[export_url_vars date action view cal_item_id show_cal_nav return_url]"
 }
 
 if {$recurrence_p} {
     # We must ask for recurrence information
-    ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id&return_url=$return_url"
+    ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id&return_url=[ns_urlencode $return_url]"
     return
 }
 
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.10 -r1.11
--- openacs-4/packages/calendar/www/cal-item.adp	16 Mar 2002 21:06:44 -0000	1.10
+++ openacs-4/packages/calendar/www/cal-item.adp	16 Apr 2002 05:30:24 -0000	1.11
@@ -10,12 +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=show_cal_nav value=@show_cal_nav@>	
     <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=show_cal_nav value=@show_cal_nav@>	
     <input type=hidden name=return_url value="@return_url@">
 </if>
 </else>
Index: openacs-4/packages/calendar/www/cal-item.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/calendar/www/cal-item.tcl	16 Mar 2002 21:06:44 -0000	1.9
+++ openacs-4/packages/calendar/www/cal-item.tcl	16 Apr 2002 05:30:24 -0000	1.10
@@ -16,6 +16,7 @@
     {end_time "now"}
     {return_url ""}
     {force_calendar_id ""}
+    {show_cal_nav 1}
 } -properties {
     cal_item_id:onevalue
 
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	16 Apr 2002 05:16:29 -0000	1.13
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	16 Apr 2002 05:30:34 -0000	1.14
@@ -70,8 +70,8 @@
 }
 
 if {$create_p} {
-    set hour_template "<a href=calendar/?show_cal_nav=0&date=$current_date&force_calendar_id=$force_calendar_id&action=add&return_url=$encoded_return_url&start_time=\$start_time&end_time=\$end_time>\$hour</a>"
-    set item_add_template "<a href=calendar/?return_url=$encoded_return_url&show_cal_nav=0&action=add&force_calendar_id=$force_calendar_id&start_time=&end_time=&julian_date=\$julian_date>ADD</a>"
+    set hour_template "<a href=calendar/?show_cal_nav=0&date=$current_date&force_calendar_id=$force_calendar_id&action=add&start_time=\$start_time&end_time=\$end_time>\$hour</a>"
+    set item_add_template "<a href=calendar/?show_cal_nav=0&action=add&force_calendar_id=$force_calendar_id&start_time=&end_time=&julian_date=\$julian_date>ADD</a>"
 } else {
     set hour_template "\$hour"
     set item_add_template ""
@@ -109,7 +109,7 @@
 
 if {$view == "list"} {
     set cal_stuff [calendar::list_display \
-            -item_template {<a href=calendar/?return_url=$encoded_return_url&show_cal_nav=0&action=edit&cal_item_id=$item_id>$item</a>} \
+            -item_template $item_template \
             -date $current_date \
             -calendar_id_list $list_of_calendar_ids \
             -url_stub_callback "calendar_portlet_display::get_url_stub"]
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	16 Apr 2002 05:16:29 -0000	1.13
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	16 Apr 2002 05:30:34 -0000	1.14
@@ -51,8 +51,8 @@
 set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ns_urlencode "../"]&action=edit&cal_item_id=\$item_id>\$item</a>"
 
 if {$create_p} {
-    set hour_template "<a href=calendar/?show_cal_nav=0&date=$current_date&force_calendar_id=$force_calendar_id&action=add&return_url=[ns_urlencode "../"]&start_time=\$start_time&end_time=\$end_time>\$hour</a>"
-    set item_add_template "<a href=calendar/?return_url=../&show_cal_nav=0&action=add&force_calendar_id=$force_calendar_id&start_time=&end_time=&julian_date=\$julian_date>ADD</a>"
+    set hour_template "<a href=calendar/?show_cal_nav=0&date=$current_date&force_calendar_id=$force_calendar_id&action=add&start_time=\$start_time&end_time=\$end_time>\$hour</a>"
+    set item_add_template "<a href=calendar/?show_cal_nav=0&action=add&force_calendar_id=$force_calendar_id&start_time=&end_time=&julian_date=\$julian_date>ADD</a>"
 } else {
     set hour_template "\$hour"
     set item_add_template ""