Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/calendar/www/cal-item-new.adp	8 Aug 2006 21:26:18 -0000	1.16
+++ openacs-4/packages/calendar/www/cal-item-new.adp	26 Aug 2006 00:50:19 -0000	1.17
@@ -16,23 +16,28 @@
 
 
 <script language="JavaScript">
-    function TimePChanged(elm) {
-      var form_name = "cal_item";
-
-      if (elm == null) return;
-      if (document.forms == null) return;
-      if (document.forms[form_name] == null) return;
-
-      if (elm.value == 0) {
+    function disableTime(form_name) {
           <multiple name="time_format_elms">
             document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = true;
             document.forms[form_name].elements["end_time.@time_format_elms.name@"].disabled = true;
           </multiple>
-      } else {
+    }
+    function enableTime(form_name) {
           <multiple name="time_format_elms">
             document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = false;
             document.forms[form_name].elements["end_time.@time_format_elms.name@"].disabled = false;
           </multiple>
+    }
+    function TimePChanged(elm) {
+      var form_name = "cal_item";
+
+      if (elm == null) return;
+      if (document.forms == null) return;
+      if (document.forms[form_name] == null) return;
+      if (elm.value == 0) {
+         disableTime(form_name);
+      } else {
+         enableTime(form_name);
       }
   }
 </script>
@@ -47,6 +52,7 @@
 
 
 <script language="JavaScript">
-  TimePChanged();
+  // TimePChanged();
+  @js;noquote@
 </script>
 
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/calendar/www/cal-item-new.tcl	16 Aug 2006 17:52:14 -0000	1.28
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	26 Aug 2006 00:50:19 -0000	1.29
@@ -21,6 +21,7 @@
 
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
+set js ""
 
 if {![info exists item_type_id]} {
     set item_type_id ""
@@ -177,6 +178,7 @@
 	set start_hour $start_time
 	set start_time "{} {} {} 0 0 {} {HH24:MI}"
 	set end_time "{} {} {} 0 0 {} {HH24:MI}"
+        set js "disableTime('cal_item');"
     }
     # set the calendar_id before setting item_types form element (see top of script) DAVEB
     set calendar_id [lindex [lindex $calendar_options 0] 1]
@@ -201,6 +203,10 @@
     set calendar_id $cal_item(calendar_id)
     set time_p $cal_item(time_p)
 
+    if { $time_p == 0 } {
+	set js "disableTime('cal_item');"
+    }
+
     if { [empty_string_p $repeat_p] } {
         set repeat_p 0
     } else {
Index: openacs-4/packages/calendar/www/cal-item-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/calendar/www/cal-item-view.tcl	16 Aug 2006 17:52:14 -0000	1.17
+++ openacs-4/packages/calendar/www/cal-item-view.tcl	26 Aug 2006 00:50:19 -0000	1.18
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     cal_item_id:integer
-    {return_url ""}
+    {return_url [ad_return_url]}
 }
 
 set user_id [ad_conn user_id]
Index: openacs-4/packages/calendar/www/view-month-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/calendar/www/view-month-display.tcl	16 Aug 2006 17:52:14 -0000	1.19
+++ openacs-4/packages/calendar/www/view-month-display.tcl	26 Aug 2006 00:50:19 -0000	1.20
@@ -36,6 +36,10 @@
     set base_url ""
 }
 
+if {![info exists return_url]} {
+    set return_url [ad_urlencode "../"]
+}
+
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
     set page_num_urlvar "&page_num=$page_num"
     if {![info exists return_url]} {
@@ -198,7 +202,7 @@
                 $display_information(today_p) \
 		f \
 		0 \
-                "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
+                "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time&return_url=$return_url" \
 		$day_link 
 
         } 
@@ -243,7 +247,7 @@
         $display_information(today_p) \
 	f \
 	$time_p \
-        "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
+        "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time&return_url=$return_url" \
 	$day_link 
 
 }
@@ -274,7 +278,7 @@
 	$display_information(today_p) \
 	f \
         0 \
-	"${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
+	"${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time&return_url=$return_url" \
 	$day_link 
 
 }