Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	19 Feb 2004 17:58:37 -0000	1.28
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	6 May 2004 15:21:41 -0000	1.29
@@ -1,14 +1,18 @@
 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 
 }
 
+set current_date $date
+
 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 hour_template "calendar/cal-item-new?date=$current_date&start_time=\$localized_day_current_hour"
+    set hour_template "calendar/cal-item-new?date=foofoo$current_date&start_time=\$day_current_hour"
 } else {
     set item_template "cal-item-view?cal_item_id=\$item_id"
     set url_stub_callback ""
@@ -33,7 +37,6 @@
     set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] 
 }
 
-set current_date $date
 if {[empty_string_p $date]} {
     # Default to todays date in the users (the connection) timezone
     set server_now_time [dt_systime]
@@ -106,22 +109,18 @@
     set ansi_start_date [lc_time_system_to_conn $ansi_start_date]
     set ansi_end_date [lc_time_system_to_conn $ansi_end_date]
 
-    set start_hour [lc_time_fmt $ansi_start_date "%H"]
-    set end_hour [lc_time_fmt $ansi_end_date "%H"]
     set start_time [lc_time_fmt $ansi_start_date "%X"]
     set end_time [lc_time_fmt $ansi_end_date "%X"]
 
-    if {![regexp {([1-9][0-9]*)} $start_hour match start_hour_no]} {
-        set start_hour_no 0
+    if {($start_hour == $end_hour) || ($end_minutes > 0)} {
+        incr end_hour
     }
-    if {![regexp {([1-9][0-9]*)} $end_hour match end_hour_no]} {
-        set end_hour_no 0
-    }
 
     for { set item_current_hour $start_hour } { $item_current_hour < $end_hour } { incr item_current_hour } {
         set item_current_hour [expr [string trimleft $item_current_hour 0]+0]
 
-        if { $start_hour_no == $item_current_hour } {
+        if { $start_hour == $item_current_hour } {
+
             lappend day_items_per_hour \
                 [list $item_current_hour $name $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]
         } else {
@@ -147,11 +146,10 @@
     set item_start_hour [expr [string trimleft [lindex $this_item 5] 0]+0]
     set item_end_hour [expr [string trimleft [lindex $this_item 6] 0]+0]
     set rowspan [expr $item_end_hour - $item_start_hour]
-
     if {$item_start_hour > $day_current_hour && \
-            $item_start_hour >= $start_display_hour && \
-            $item_end_hour <= $end_display_hour} {
+            $item_start_hour >= $start_display_hour} {
         # need to add dummy entries to show all hours
+
         for {  } { $day_current_hour < $item_start_hour } { incr day_current_hour } {
 	    set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X"]
             multirow append items \
@@ -207,7 +205,7 @@
 
 if {$day_current_hour < $end_display_hour } {
     # need to add dummy entries to show all hours
-    for {  } { $day_current_hour <= $end_display_hour } { incr day_current_hour } {
+    for {  } { $day_current_hour < $end_display_hour } { incr day_current_hour } {
 	set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X" [ad_conn locale]]
         multirow append items \
             "" \
@@ -225,7 +223,11 @@
 
 db_1row dbqd.calendar.www.views.select_day_info {}
 
-set previous_week_url "view?view=day&date=[ns_urlencode $yesterday]"
-set next_week_url "view?view=day&date=[ns_urlencode $tomorrow]"
-
+if {$portlet_mode_p} {
+    set previous_week_url "?page_num=$page_num&date=[ns_urlencode $yesterday]"
+    set next_week_url "?page_num=$page_num&&date=[ns_urlencode $tomorrow]"
+} else {
+    set previous_week_url "view?view=day&date=[ns_urlencode $yesterday]"
+    set next_week_url "view?view=day&date=[ns_urlencode $tomorrow]"
+}
 set dates [lc_time_fmt $date "%q"]