Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 26 Apr 2002 19:50:41 -0000 1.15 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 26 Apr 2002 20:27:48 -0000 1.16 @@ -193,9 +193,7 @@ set start_time "" set display_hour "No Time" append return_html " [subst $hour_template]" - if {[ns_set find $calendar_details ""] != -1} { - append return_html "" - } + append return_html "" # Go through events while {1} { @@ -205,16 +203,18 @@ } if {$overlap_p} { - append return_html "[lindex [ns_set value $calendar_details $index] 2]" + append return_html "[lindex [ns_set value $calendar_details $index] 2]
" } else { append return_html "[ns_set value $calendar_details $index]
\n" } ns_set delete $calendar_details $index } + append return_html "
" + for {set hour $start_hour} {$hour <= $end_hour} {incr hour} { - + set next_hour [expr $hour + 1] if {$hour < 10} { @@ -305,15 +305,15 @@ if {$time == "00:00" || $time == ""} { return 1 } - + if {[regexp {00:00 *[aA][mM]} $time the_match]} { return 1 } - + if {[regexp {12:00 *[aA][mM]} $time the_match]} { return 1 } - + return 0 }