Index: openacs-4/packages/calendar/www/view-month-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/calendar/www/view-month-display.adp 11 Dec 2003 21:39:59 -0000 1.9 +++ openacs-4/packages/calendar/www/view-month-display.adp 30 Dec 2003 23:30:09 -0000 1.10 @@ -40,20 +40,18 @@ - + - + - - #calendar.Add_Item# @days_of_a_month.day_number@ -
@days_of_a_month.ansi_start_time@ +
+ @days_of_a_month.ansi_start_time@ @days_of_a_month.full_item;noquote@ [@days_of_a_month.calendar_name@] 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.10 -r1.11 --- openacs-4/packages/calendar/www/view-month-display.tcl 5 Nov 2003 18:05:28 -0000 1.10 +++ openacs-4/packages/calendar/www/view-month-display.tcl 30 Dec 2003 23:30:09 -0000 1.11 @@ -85,7 +85,7 @@ set today_julian_date [dt_ansi_to_julian [lindex $today_ansi_list 0] [lindex $today_ansi_list 1] [lindex $today_ansi_list 2]] -multirow create days_of_a_month calendar_item item_id ansi_start_date ansi_start_time day_number calendar_name beginning_of_week_p end_of_week_p today_p outside_month_p full_item +multirow create days_of_a_month calendar_item item_id ansi_start_date ansi_start_time day_number calendar_name beginning_of_week_p end_of_week_p today_p outside_month_p full_item time_p # Calculate number of greyed days @@ -109,6 +109,12 @@ # Convert from system timezone to user timezone set ansi_start_date [lc_time_system_to_conn $ansi_start_date] set ansi_end_date [lc_time_system_to_conn $ansi_end_date] + + if { [string equal $ansi_start_date $ansi_end_date] && [string equal [lc_time_fmt $ansi_start_date "%T"] "00:00:00"] } { + set time_p 0 + } else { + set time_p 1 + } set ansi_start_time [lc_time_fmt $ansi_start_date "%X"] set ansi_end_time [lc_time_fmt $ansi_end_date "%X"] @@ -118,7 +124,7 @@ if {$current_day < $julian_start_date} { for {} {$current_day < $julian_start_date} {incr current_day} { array set display_information [calendar::get_month_multirow_information -current_day $current_day -today_julian_date $today_julian_date -first_julian_date_of_month $first_julian_date_of_month] - multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] "" $display_information(day_number) "" $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f "" + multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] "" $display_information(day_number) "" $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f "" 0 } } @@ -143,20 +149,20 @@ set full_item "[subst $item_template]" array set display_information [calendar::get_month_multirow_information -current_day $current_day -today_julian_date $today_julian_date -first_julian_date_of_month $first_julian_date_of_month] - multirow append days_of_a_month $name $item_id [dt_julian_to_ansi $current_day] $ansi_start_time $display_information(day_number) $calendar_name $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f $full_item + multirow append days_of_a_month $name $item_id [dt_julian_to_ansi $current_day] $ansi_start_time $display_information(day_number) $calendar_name $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f $full_item $time_p } for {} {$current_day <= $last_julian_date_in_month} {incr current_day} { array set display_information [calendar::get_month_multirow_information -current_day $current_day -today_julian_date $today_julian_date -first_julian_date_of_month $first_julian_date_of_month] - multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] "" $display_information(day_number) "" $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f "" + multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] "" $display_information(day_number) "" $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f "" 0 incr number_day_cells } set remaining_days [expr [expr $first_day_of_week + 6 - $current_day % 7] % 7] if {$remaining_days > 0} { for {} {$current_day <= [expr $last_julian_date_in_month + $remaining_days]} {incr current_day} { - multirow append days_of_a_month "" "" "" "" "" "" f f "" t "" + multirow append days_of_a_month "" "" "" "" "" "" f f "" t "" 0 } } Index: openacs-4/packages/calendar/www/resources/calendar.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar.css,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/www/resources/calendar.css 19 Sep 2003 11:35:04 -0000 1.1 +++ openacs-4/packages/calendar/www/resources/calendar.css 30 Dec 2003 23:30:10 -0000 1.2 @@ -57,13 +57,31 @@ BORDER: 0px none; color: #003366; font-weight: bold; - font-size: 90%; + font-size: 80%; vertical-align: top; + height: 60px; +} +.cal-month-day:hover { + BACKGROUND: #cccccc; + cursor: pointer; +} +.cal-month-today { + font-weight: bold; + background-color: #003366; + text-align: left; + color: #FFFFFF; + border: 0px solid; + font-size: 80%; + vertical-align: top; - - - } +.cal-month-today:hover { + BACKGROUND: #666666; + cursor: pointer; +} +.cal-month-today a { + color: #DDEEFF; +} .cal-no-border { BORDER-RIGHT: medium none; BORDER-TOP: medium none; BORDER-LEFT: medium none; BORDER-BOTTOM: medium none; @@ -366,19 +384,6 @@ font-size: 90%; } -.cal-month-today { - font-weight: bold; - background-color: #003366; - text-align: left; - color: #FFFFFF; - border: 0px solid; - font-size: 90%; - vertical-align: top; - -} -.cal-month-today a { - color: #DDEEFF; -} .cal-month { font-weight: bold; background-color: #DDEEFF; @@ -418,7 +423,6 @@ .cal-month-event { text-align: left; font-weight: normal; - font-size: 120%; } .cal-month-event a { font-weight: normal; @@ -451,17 +455,13 @@ .cal-day-time { font-weight: bold; text-align: right; - - - - - - + font-size: 80%; } .cal-day-event { text-align: left; white-space: nowrap; vertical-align: top; + font-size: 80%; } .cal-week-event-notime { background-color: #DDEEFF;