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.13 -r1.14 --- openacs-4/packages/calendar/www/view-one-day-display.tcl 4 Sep 2003 20:57:44 -0000 1.13 +++ openacs-4/packages/calendar/www/view-one-day-display.tcl 4 Sep 2003 21:49:38 -0000 1.14 @@ -10,6 +10,11 @@ set url_stub_callback "" } +if { ![info exists hour_template] } { + set hour_template {$localized_day_current_hour} +} + + if { ![info exists day_template] } { set day_template "\$day_number" } @@ -77,7 +82,7 @@ } # Quite some extra code here to be able to display overlapping items. -multirow create day_items_with_time current_hour localized_current_hour name item_id calendar_name status_summary start_hour end_hour start_time end_time colspan rowspan full_item +multirow create day_items_with_time current_hour_link current_hour localized_current_hour name item_id calendar_name status_summary start_hour end_hour start_time end_time colspan rowspan full_item for {set i $start_display_hour } { $i < $end_display_hour } { incr i } { set items_per_hour($i) 0 @@ -103,7 +108,6 @@ lappend day_items_per_hour [list $item_current_hour "" $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time] } incr items_per_hour($item_current_hour) - } } @@ -126,7 +130,7 @@ # 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" "%r"] - multirow append day_items_with_time $day_current_hour $localized_day_current_hour "" "" "" "" "" "" "" "" 0 0 "" + multirow append day_items_with_time "[subst $hour_template]" $day_current_hour $localized_day_current_hour "" "" "" "" "" "" "" "" 0 0 "" } } @@ -151,15 +155,17 @@ set item [lindex $this_item 1] set full_item "[subst $item_template]" - multirow append day_items_with_time [lindex $this_item 0] $localized_day_current_hour [lindex $this_item 1] [lindex $this_item 2] [lindex $this_item 3] [lindex $this_item 4] [lindex $this_item 5] [lindex $this_item 6] [lindex $this_item 7] [lindex $this_item 8] 0 $rowspan $full_item + set current_hour_link "[subst $hour_template]" + + multirow append day_items_with_time $current_hour_link $day_current_hour $localized_day_current_hour [lindex $this_item 1] [lindex $this_item 2] [lindex $this_item 3] [lindex $this_item 4] [lindex $this_item 5] [lindex $this_item 6] [lindex $this_item 7] [lindex $this_item 8] 0 $rowspan $full_item set day_current_hour [expr [lindex $this_item 0] +1 ] } 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 } { set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%r"] - multirow append day_items_with_time $day_current_hour $localized_day_current_hour "" "" "" "" "" 0 0 "" + multirow append day_items_with_time "[subst $hour_template]" $day_current_hour $localized_day_current_hour "" "" "" "" "" 0 0 "" } }