Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/calendar/www/view-week-display.tcl	19 Feb 2004 17:58:37 -0000	1.15
+++ openacs-4/packages/calendar/www/view-week-display.tcl	6 May 2004 15:21:41 -0000	1.16
@@ -1,23 +1,29 @@
 if {[info exists url_stub_callback]} {
     # This parameter is only set if this file is called from .LRN.
     # This way I make sure that for the time being this adp/tcl
-    # snippet is backwards-compatible.  Will be fixed in OpenACS 5.1.
-    set portled_mode_p 1
+    # snippet is backwards-compatible.
+    set portlet_mode_p 1
+} else {
+    set portlet_mode_p 0 
 }
 
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
-    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>"
+    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id"
     set url_stub_callback "calendar_portlet_display::get_url_stub"
     set page_num_formvar [export_form_vars page_num]
-    set page_num "&page_num=$page_num"
+    set page_num_urlvar "&page_num=$page_num"
 } else {
     set item_template "cal-item-view?cal_item_id=\$item_id"
     set url_stub_callback ""
     set page_num_formvar ""
-    set page_num ""
+    set page_num_urlvar ""
     set base_url ""
 }
 
+if { ![info exists show_calendar_name_p] } {
+    set show_calendar_name_p 1
+}
+
 if {[exists_and_not_null calendar_id_list]} {
     set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
 } else {
@@ -100,7 +106,7 @@
             "" \
             "" \
             "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \
-            "?view=day&date=$ansi_this_date&page_num=${page_num}"
+            "?view=day&date=$ansi_this_date&page_num_urlvar"
     }
 
     set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]]
@@ -131,7 +137,7 @@
         $start_time \
         $end_time \
         $no_time_p \
-        "?view=day&date=$ansi_start_date&page_num=${page_num}" \
+        "?view=day&date=$ansi_start_date&page_num_urlvar" \
         "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" 
     set current_weekday $day_of_week
 }
@@ -152,11 +158,16 @@
             "" \
             "" \
             "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \
-            "?view=day&date=$ansi_this_date&page_num=${page_num}" 
+            "?view=day&date=$ansi_this_date&page_num_urlvar" 
     }
 }
 
 # Navigation Bar
 set dates "[lc_time_fmt $first_weekday_date "%q"] - [lc_time_fmt $last_weekday_date "%q"]"
-set previous_week_url "view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]"
-set next_week_url "view?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]"
+if {$portlet_mode_p} {
+    set previous_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]"
+    set next_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]"
+} else {
+    set previous_week_url "view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]"
+    set next_week_url "?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]"
+}