Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp	8 Sep 2008 20:13:37 -0000	1.2
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp	12 Sep 2008 16:16:44 -0000	1.3
@@ -3,19 +3,21 @@
 </style>
 
  <switch @view@>
-   <case value="day">
-     <include src="/packages/calendar/www/view-one-day-display" 
-       date="@date@" 
-       start_display_hour="7"
-       end_display_hour="22"
-       page_num="@page_num@"
-       base_url="@base_url@"
-       calendar_url="@calendar_url@"
-       calendar_id_list="@calendar_id@">
-   </case>
+  <case value="day">
+    <include src="/packages/calendar/www/view-one-day-display" 
+      return_url="@return_url;noquote"
+      date="@date@" 
+      start_display_hour="7"
+      end_display_hour="22"
+      page_num="@page_num@"
+      base_url="@base_url@"
+      calendar_url="@calendar_url@"
+      calendar_id_list="@calendar_id@">
+  </case>
 
   <case value="list">
     <include src="/packages/calendar/www/view-list-display" 
+      return_url="@return_url;noquote"
       start_date="@start_date@"
       end_date="@end_date@"
       date="@date@"
@@ -27,6 +29,7 @@
  
   <case value="week">
     <include src="/packages/calendar/www/view-week-display" 
+      return_url="@return_url;noquote"
       date="@date@"
       calendar_id_list="@calendar_id@"
       page_num="@page_num@"
@@ -35,6 +38,7 @@
 
   <case value="month">
     <include src="/packages/calendar/www/view-month-display"
+      return_url="@return_url;noquote"
       date="@date@"
       calendar_id_list="@calendar_id@"
       base_url="@base_url@calendar/"
Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl	8 Sep 2008 20:13:37 -0000	1.4
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl	12 Sep 2008 16:16:44 -0000	1.5
@@ -23,6 +23,7 @@
 }
 
 template::head::add_css -href /resources/calendar/calendar.css
+set return_url "[ns_conn url]?[ns_conn query]"
 
 # set up some vars
 if {[empty_string_p $date]} {
Index: openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.adp	8 Sep 2008 20:13:37 -0000	1.2
+++ openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.adp	12 Sep 2008 16:16:44 -0000	1.3
@@ -1,4 +1,5 @@
 <include src="/packages/calendar/www/view-list-display" 
+  return_url="@return_url;noquote"
   start_date="@start_date@"
   date="@date@" 
   period_days="@period_days@"