Index: openacs-4/packages/calendar/www/view-list-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.adp,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/calendar/www/view-list-display.adp 24 Oct 2003 11:37:50 -0000 1.9 +++ openacs-4/packages/calendar/www/view-list-display.adp 19 Feb 2004 17:58:37 -0000 1.10 @@ -1,3 +1,6 @@ + + + + +
@@ -16,7 +19,7 @@ - +
@@ -27,27 +30,27 @@ - + - + - + - - - - - - + + + + + @@ -60,4 +63,6 @@ #calendar.No_Items# - + + +
#calendar.Type_1# Title
@calendar_items.pretty_weekday@@calendar_items.pretty_start_date@@calendar_items.pretty_start_time@@calendar_items.pretty_end_time@@calendar_items.item_type@@calendar_items.full_item;noquote@ + @items.weekday@@items.start_date@@items.start_time@@items.end_time@@items.item_type@@items.event_name@ - (@calendar_items.calendar_name@) + (@items.calendar_name@)
Index: openacs-4/packages/calendar/www/view-list-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/calendar/www/view-list-display.tcl 21 Jan 2004 11:41:11 -0000 1.20 +++ openacs-4/packages/calendar/www/view-list-display.tcl 19 Feb 2004 17:58:37 -0000 1.21 @@ -1,13 +1,27 @@ -# Calendar-portlet makes use of this stuff -if { ![info exists url_stub_callback] } { +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 +} + +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 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" +} else { + set item_template "cal-item-view?cal_item_id=\$item_id" set url_stub_callback "" + set page_num_formvar "" + set page_num "" + set base_url "" } + if { ![info exists url_template] } { set url_template {?sort_by=$sort_by} } -if { ![info exists item_template] } { - set item_template "\[ad_quotehtml \$item\]" -} + if { ![info exists show_calendar_name_p] } { set show_calendar_name_p 1 } @@ -21,11 +35,10 @@ set end_date [clock format [clock scan "+30 days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] } - if {[exists_and_not_null calendar_id_list]} { - set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))" + set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] } else { - set calendars_clause "and ((cals.package_id= :package_id and cals.private_p='f') or (cals.private_p='t' and cals.owner_id= :user_id))" + set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] } if { ![info exists period_days] } { @@ -72,16 +85,23 @@ set flip -1 -multirow create calendar_items calendar_name item_id name item_type pretty_weekday pretty_start_date pretty_end_date pretty_start_time pretty_end_time flip today full_item +multirow create items \ + event_name \ + event_url \ + calendar_name \ + item_type \ + weekday \ + start_date \ + end_date \ + start_time \ + end_time \ + flip \ + today set last_pretty_start_date "" # Loop through the events, and add them -if {[string match [db_type] "postgresql"]} { - set interval_limitation_clause " to_timestamp(:start_date,'YYYY-MM-DD HH24:MI:SS') and to_timestamp(:end_date, 'YYYY-MM-DD HH24:MI:SS')" -} else { - set interval_limitation_clause " to_date(:start_date,'YYYY-MM-DD HH24:MI:SS') and to_date(:end_date, 'YYYY-MM-DD HH24:MI:SS')" -} +set interval_limitation_clause [db_map dbqd.calendar.www.views.list_interval_limitation] set order_by_clause " order by $sort_by" set additional_limitations_clause "" @@ -149,9 +169,16 @@ set url_stub $url_stubs($calendar_id) } - set item "$name" - set full_item "[subst $item_template]" - - multirow append calendar_items $calendar_name $item_id $name $item_type $pretty_weekday $pretty_start_date $pretty_end_date $pretty_start_time $pretty_end_time $flip $today $full_item - + multirow append items \ + $name \ + [subst $item_template] \ + $calendar_name \ + $item_type \ + $pretty_weekday \ + $pretty_start_date \ + $pretty_end_date \ + $pretty_start_time \ + $pretty_end_time \ + $flip \ + $today } 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 -N -r1.11 -r1.12 --- openacs-4/packages/calendar/www/view-month-display.adp 15 Feb 2004 12:16:25 -0000 1.11 +++ openacs-4/packages/calendar/www/view-month-display.adp 19 Feb 2004 17:58:37 -0000 1.12 @@ -1,9 +1,9 @@ - +
@@ -20,37 +20,36 @@ - - + + - + - - - + 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 -N -r1.15 -r1.16 --- openacs-4/packages/calendar/www/view-month-display.tcl 15 Feb 2004 12:16:25 -0000 1.15 +++ openacs-4/packages/calendar/www/view-month-display.tcl 19 Feb 2004 17:58:37 -0000 1.16 @@ -5,37 +5,36 @@ set date [lc_time_fmt $user_now_time "%x"] } -if { ![info exists url_stub_callback] } { - set url_stub_callback "" -} +dt_get_info $date -if { ![info exists day_template] } { - set day_template "\$day   -   \$pretty_date" +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 } -if { ![info exists item_template] } { - set item_template "\[ad_quotehtml \$item\]" -} - -if {[exists_and_not_null page_num]} { +if {[info exists portlet_mode_p] && $portlet_mode_p} { set page_num "&page_num=$page_num" + 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 prev_month_template "?view=month&date=\[ad_urlencode \$prev_month\]&page_num=$page_num" + set prev_month_template "?view=month&date=\[ad_urlencode \$next_month\]&page_num=$page_num" + set url_stub_callback "calendar_portlet_display::get_url_stub" } else { + set item_template "cal-item-view?cal_item_id=\$item_id" + set prev_month_template "view?view=month&\date=[ad_urlencode $prev_month]" + set next_month_template "view?view=month&\date=[ad_urlencode $next_month]" + set url_stub_callback "" set page_num "" -} - -if {![exists_and_not_null base_url]} { set base_url "" } if {[exists_and_not_null calendar_id_list]} { - set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) \ - and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))" + set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] } else { - set calendars_clause "and ((cals.package_id= :package_id and cals.private_p='f') \ - or (cals.private_p='t' and cals.owner_id= :user_id))" + set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] } -dt_get_info $date set date_list [dt_ansi_to_list $date] set this_year [dt_trim_leading_zeros [lindex $date_list 0]] set this_month [dt_trim_leading_zeros [lindex $date_list 1]] @@ -47,24 +46,9 @@ set user_id [ad_conn user_id] set today_date [dt_sysdate] -if { [info exists prev_month_template] } { - set prev_month_url "[subst $prev_month_template]" -} else { - set prev_month_url "\"back" -} - +set previous_month_url "[subst $prev_month_template]" +set next_month_url "[subst $next_month_template]" -if { [info exists next_month_template] } { - set next_month_url "[subst $next_month_template]" -} else { - set next_month_url "\"forward" -} - - set first_day_of_week [lc_get firstdayofweek] set last_day_of_week [expr [expr $first_day_of_week + 7] % 7] @@ -88,9 +72,20 @@ # Create the multirow that holds the calendar information -multirow create days_of_a_month calendar_item item_url ansi_start_date \ - ansi_start_time day_number calendar_name beginning_of_week_p end_of_week_p \ - today_p outside_month_p time_p url +multirow create items \ + event_name \ + event_url \ + calendar_name \ + status_summary \ + ansi_start_time \ + day_number \ + beginning_of_week_p \ + end_of_week_p \ + today_p \ + outside_month_p \ + time_p \ + add_url \ + day_url # Calculate number of greyed days and then add them to the calendar mulitrow set greyed_days_before_month [expr [expr [dt_first_day_of_month $this_year $this_month]] -1 ] @@ -102,9 +97,20 @@ } else { set beginning_of_week_p f } - multirow append days_of_a_month "" "" \ - [dt_julian_to_ansi [expr $first_julian_date_of_month + $current_day -1]] \ - "" "" "" $beginning_of_week_p f "" t "" "" + multirow append items \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + $beginning_of_week_p \ + f \ + "" \ + t \ + "" \ + "" \ + "" } set current_day $first_julian_date_of_month @@ -138,12 +144,20 @@ -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) "" \ + multirow append items \ + "" \ + "" \ + "" \ + "" \ + "" \ + $display_information(day_number) \ $display_information(beginning_of_week_p) \ $display_information(end_of_week_p) \ - $display_information(today_p) f 0 \ - "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" + $display_information(today_p) \ + f \ + 0 \ + "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \ + "?view=day&date=[dt_julian_to_ansi $current_day]&page_num=${page_num}" } } @@ -164,22 +178,26 @@ set url_stub $url_stubs($calendar_id) } - set item "$name" - 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 $full_item \ - "cal-item-view?cal_item_id=$item_id" [dt_julian_to_ansi $current_day] \ - $ansi_start_time $display_information(day_number) $calendar_name \ + multirow append items \ + $name \ + [subst $item_template] \ + $calendar_name \ + "" \ + $ansi_start_time \ + $display_information(day_number) \ $display_information(beginning_of_week_p) \ $display_information(end_of_week_p) \ - $display_information(today_p) f $time_p \ - "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" + $display_information(today_p) \ + f \ + $time_p \ + "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \ + "?view=day&date=[dt_julian_to_ansi $current_day]&page_num=${page_num}" } # Add cells for remaining days inside the month @@ -190,17 +208,40 @@ -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 \ - 0 "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" + multirow append items \ + "" \ + "" \ + "" \ + "" \ + "" \ + $display_information(day_number) \ + $display_information(beginning_of_week_p) \ + $display_information(end_of_week_p) \ + $display_information(today_p) \ + f \ + 0 \ + "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \ + "?view=day&date=[dt_julian_to_ansi $current_day]&page_num=${page_num}" } # Add cells for remaining days outside the month 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 0 + multirow append items \ + "" \ + "" \ + "" \ + "" \ + "" \ + "" \ + f \ + f \ + "" \ + t \ + 0 \ + "" \ + "" } } Index: openacs-4/packages/calendar/www/view-one-day-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/calendar/www/view-one-day-display.adp 11 Dec 2003 21:39:59 -0000 1.14 +++ openacs-4/packages/calendar/www/view-one-day-display.adp 19 Feb 2004 17:58:37 -0000 1.15 @@ -1,73 +1,61 @@ -
- @prev_month_url;noquote@ + back one month @month_string@ @year@ - @next_month_url;noquote@ + forward one month
  + + - + + @items.day_number@ - @days_of_a_month.day_number@ - - - + +
- @days_of_a_month.ansi_start_time@ - @days_of_a_month.calendar_item;noquote@ - [@days_of_a_month.calendar_name@] + @items.ansi_start_time@ + @items.event_name@ + [@items.calendar_name@]
- -
- - +
+ - -
- @url_previous_week;noquote@ - - @dates;noquote@ - @url_next_week;noquote@ - + back one day + @dates@ + forward one day
-
- + + + + + + + + + + + + +
-
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -
-
@item_add_without_time;noquote@ - - - + + + + - -
@day_items_without_time.full_item;noquote@
+
No Time + + + + + + +
+ @items_without_time.event_name@ +
+
- @day_items_with_time.current_hour_link;noquote@ - - @day_items_with_time.full_item;noquote@ - - @day_items_with_time.calendar_name@ + + + +
  
+ + 		+ @items.localized_current_hour@ + + @items.event_name@ + + @items.calendar_name@ + +
+
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 -N -r1.27 -r1.28 --- openacs-4/packages/calendar/www/view-one-day-display.tcl 15 Feb 2004 12:16:25 -0000 1.27 +++ openacs-4/packages/calendar/www/view-one-day-display.tcl 19 Feb 2004 17:58:37 -0000 1.28 @@ -1,35 +1,20 @@ -# Show calendar items per one day. -# -# Parameters: -# hour_item -# date (YYYY-MM-DD) - optional -# start_display_hour and end_display_hour +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 +} -# Calendar-portlet makes use of this stuff -if { ![info exists url_stub_callback] } { +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 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" +} else { + set item_template "cal-item-view?cal_item_id=\$item_id" set url_stub_callback "" + set hour_template {cal-item-new?date=$current_date&start_time=$day_current_hour} } -if { ![info exists hour_template] } { - set hour_template {$localized_day_current_hour} -} - -if { ![info exists day_template] } { - set day_template "\$day_number" -} - -if { ![info exists item_template] } { - set item_template "\[ad_quotehtml \$item\]" -} - -if { ![info exists prev_nav_template] } { - set prev_nav_template {\"back} -} - -if { ![info exists next_nav_template] } { - set next_nav_template {\"forward} -} - if { ![info exists show_calendar_name_p] } { set show_calendar_name_p 1 } @@ -39,20 +24,16 @@ } if { ![info exists end_display_hour]} { - set end_display_hour 24 + set end_display_hour 23 } if {[exists_and_not_null calendar_id_list]} { - set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))" + set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] } else { - set calendars_clause { - and ((cals.package_id = :package_id and cals.private_p = 'f') - or (cals.private_p = 't' and cals.owner_id = :user_id)) - } + set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] } set current_date $date -set current_date_system "$date 00:00:00" if {[empty_string_p $date]} { # Default to todays date in the users (the connection) timezone set server_now_time [dt_systime] @@ -65,18 +46,16 @@ set user_id [ad_conn user_id] # Loop through the items without time -multirow create day_items_without_time name status_summary item_id calendar_name full_item +multirow create items_without_time \ + event_name \ + event_url \ + calendar_name \ + status_summary -# Set the necessary variables for the unified calendar query in views.xql. -if {[string match [db_type] "postgresql"]} { - set interval_limitation_clause " to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') and to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') + cast('23 hours 59 minutes 59 seconds' as interval)" -} else { - set interval_limitation_clause " to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') and (to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') + (24 - 1/3600)/24) " -} - set additional_limitations_clause " and to_char(start_date, 'HH24:MI') = '00:00' and to_char(end_date, 'HH24:MI') = '00:00'" set additional_select_clause "" set order_by_clause " order by name" +set interval_limitation_clause [db_map dbqd.calendar.www.views.day_interval_limitation] db_foreach dbqd.calendar.www.views.select_items {} { # reset url stub @@ -92,23 +71,29 @@ set url_stub $url_stubs($calendar_id) } - set item $name - set full_item [subst $item_template] - - multirow append day_items_without_time $name $status_summary $item_id $calendar_name $full_item + set event_url [subst $item_template] + multirow append items_without_time $name $event_url $calendar_name $status_summary } set day_current_hour 0 -set localized_day_current_hour {No Time} +set localized_day_current_hour "" set item_add_without_time [subst $hour_template] # Now items with time +multirow create items \ + event_name \ + event_url \ + calendar_name \ + status_summary \ + add_url \ + localized_current_hour \ + current_hour \ + start_time \ + end_time \ + colspan \ + rowspan -# There's quite some extra code here to be able to display overlapping -# items. Will be properly implemented in OpenACS 5.1 (or so) -- Dirk -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 0 } { $i < 24 } { incr i } { set items_per_hour($i) 0 } @@ -126,14 +111,17 @@ set start_time [lc_time_fmt $ansi_start_date "%X"] set end_time [lc_time_fmt $ansi_end_date "%X"] - regexp {([1-9][0-9]*)} $start_hour match start_hour_no - regexp {([1-9][0-9]*)} $end_hour match end_hour_no + if {![regexp {([1-9][0-9]*)} $start_hour match start_hour_no]} { + set start_hour_no 0 + } + 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 } { - 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 { @@ -161,11 +149,23 @@ 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 && \ + $item_end_hour <= $end_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 day_items_with_time [subst $hour_template] $day_current_hour $localized_day_current_hour "" "" "" "" "" "" "" "" 0 0 "" + multirow append items \ + "" \ + "" \ + "" \ + "" \ + [subst $hour_template] \ + $localized_day_current_hour \ + $day_current_hour \ + 0 \ + 0 \ + "" \ + "" } } @@ -184,20 +184,23 @@ set url_stub $url_stubs($calendar_id) } - set start_time [lindex $this_item 7] - set end_time [lindex $this_item 8] - set item [lindex $this_item 1] set item_id [lindex $this_item 2] - set full_item [subst $item_template] 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 + multirow append items \ + $item \ + [subst $item_template] \ + [lindex $this_item 3] \ + [lindex $this_item 4] \ + $current_hour_link \ + $localized_day_current_hour \ + $day_current_hour \ + [lindex $this_item 7] \ + [lindex $this_item 8] \ + 0 \ + $rowspan set day_current_hour [expr [lindex $this_item 0] +1 ] } @@ -206,41 +209,23 @@ # 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" "%X" [ad_conn locale]] - multirow append day_items_with_time "[subst $hour_template]" $day_current_hour $localized_day_current_hour "" "" "" "" "" 0 0 "" + multirow append items \ + "" \ + "" \ + "" \ + "" \ + "[subst $hour_template]" \ + $localized_day_current_hour \ + $day_current_hour \ + "" \ + 0 \ + 0 } } db_1row dbqd.calendar.www.views.select_day_info {} -# Check that the previous and next days are in the tcl boundaries -# so that the calendar widget doesn't bomb when it creates the next/prev links -if {[catch {set yest [clock format [clock scan "1 day ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} { - set previous_link "" -} else { - if {[catch {clock scan $yest}]} { - set previous_link "" - } else { - set previous_link "<" - } -} +set previous_week_url "view?view=day&date=[ns_urlencode $yesterday]" +set next_week_url "view?view=day&date=[ns_urlencode $tomorrow]" -if {[catch {set tomor [clock format [clock scan "1 day" -base [clock scan $date]] -format "%Y-%m-%d"]}]} { - set next_link "" -} else { - if {[catch {clock scan $tomor}]} { - set next_link "" - } else { - set next_link ">" - } -} - set dates [lc_time_fmt $date "%q"] -set ansi_list [split $date "- "] -set ansi_year [lindex $ansi_list 0] -set ansi_month [string trimleft [lindex $ansi_list 1] "0"] -set ansi_day [string trimleft [lindex $ansi_list 2] "0"] -set julian_date [dt_ansi_to_julian $ansi_year $ansi_month $ansi_day] - -set url_previous_week [subst $prev_nav_template] -set url_next_week [subst $next_nav_template] - Index: openacs-4/packages/calendar/www/view-week-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/calendar/www/view-week-display.adp 11 Dec 2003 21:39:59 -0000 1.7 +++ openacs-4/packages/calendar/www/view-week-display.adp 19 Feb 2004 17:58:37 -0000 1.8 @@ -1,56 +1,50 @@ - - -
- - +
+ - -
- @url_previous_week;noquote@ - - @dates;noquote@ - @url_next_week;noquote@ - + back one week + @dates@ + forward one week
-
- - +
+
- @week_items.start_date_weekday@: + @items.start_date_weekday@: - - #calendar.Add_Item#@week_items.start_date@ + + #calendar.Add_Item# + + @items.start_date@
- - + +
- + @@ -68,8 +62,3 @@
- + - - @week_items.start_time@ - @week_items.end_time@ + + @items.start_time@ - @items.end_time@ - @week_items.full_item;noquote@ - + @items.event_name@ + - [@week_items.calendar_name@] + [@items.calendar_name@]
- - - - - 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 -N -r1.14 -r1.15 --- openacs-4/packages/calendar/www/view-week-display.tcl 10 Jan 2004 00:19:03 -0000 1.14 +++ openacs-4/packages/calendar/www/view-week-display.tcl 19 Feb 2004 17:58:37 -0000 1.15 @@ -1,35 +1,27 @@ -if { ![info exists url_stub_callback] } { - set url_stub_callback "" +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 } -if { ![info exists day_template] } { - set day_template "\$day   -   \$pretty_date" -} - -if { ![info exists item_template] } { - set item_template "\[ad_quotehtml \$item\]" -} - -if {[exists_and_not_null page_num]} { +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 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" } else { + set item_template "cal-item-view?cal_item_id=\$item_id" + set url_stub_callback "" set page_num_formvar "" set page_num "" -} - -if {![exists_and_not_null base_url]} { set base_url "" } -if { ![info exists url_stub_callback] } { - set url_stub_callback "" -} - if {[exists_and_not_null calendar_id_list]} { - set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))" + set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] } else { - set calendars_clause "and ((cals.package_id= :package_id and cals.private_p='f') or (cals.private_p='t' and cals.owner_id= :user_id))" + set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] } if {[empty_string_p $date]} { @@ -56,16 +48,30 @@ set current_weekday 0 -multirow create week_items name item_id ansi_start_date start_date calendar_name status_summary day_of_week start_date_weekday start_time end_time no_time_p full_item +#s/item_id/url +multirow create items \ + event_name \ + event_url \ + calendar_name \ + status_summary \ + start_date \ + day_of_week \ + start_date_weekday \ + start_time \ + end_time \ + no_time_p \ + add_url \ + day_url # Convert date from user timezone to system timezone set first_weekday_of_the_week_tz [lc_time_conn_to_system "$first_weekday_of_the_week 00:00:00"] set last_weekday_of_the_week_tz [lc_time_conn_to_system "$last_weekday_of_the_week 00:00:00"] set order_by_clause " order by to_char(start_date, 'J'), to_char(start_date,'HH24:MI')" -set interval_limitation_clause " to_date(:first_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') and to_date(:last_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS')" +set interval_limitation_clause [db_map dbqd.calendar.www.views.week_interval_limitation] set additional_limitations_clause "" set additional_select_clause " , (to_date(start_date,'YYYY-MM-DD HH24:MI:SS') - to_date(:first_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS')) as day_of_week" + db_foreach dbqd.calendar.www.views.select_items {} { # Convert from system timezone to user timezone set ansi_start_date [lc_time_system_to_conn $ansi_start_date] @@ -82,9 +88,22 @@ # need to add dummy entries to show all days for { } { $current_weekday < $day_of_week } { incr current_weekday } { set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]] - multirow append week_items "" "" $ansi_this_date [lc_time_fmt $ansi_this_date "%x"] "" "" $current_weekday [lc_time_fmt $ansi_this_date %A] "" "" "" "" + multirow append items \ + "" \ + "" \ + "" \ + "" \ + [lc_time_fmt $ansi_this_date "%x"] \ + $current_weekday \ + [lc_time_fmt $ansi_this_date %A] \ + "" \ + "" \ + "" \ + "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \ + "?view=day&date=$ansi_this_date&page_num=${page_num}" } + set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]] if {[string equal $start_time "12:00 AM"] && [string equal $end_time "12:00 AM"]} { set no_time_p t } else { @@ -100,34 +119,44 @@ set url_stub $url_stubs($calendar_id) } - - set item "$name" - set full_item "[subst $item_template]" - multirow append week_items $name $item_id $ansi_start_date $start_date $calendar_name $status_summary $day_of_week $start_date_weekday $start_time $end_time $no_time_p $full_item + + multirow append items \ + $name \ + [subst $item_template] \ + $calendar_name \ + $status_summary \ + $start_date \ + $day_of_week \ + $start_date_weekday \ + $start_time \ + $end_time \ + $no_time_p \ + "?view=day&date=$ansi_start_date&page_num=${page_num}" \ + "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" set current_weekday $day_of_week } if {$current_weekday < 7} { # need to add dummy entries to show all hours for { } { $current_weekday < 7 } { incr current_weekday } { set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]] - multirow append week_items "" "" $ansi_this_date [lc_time_fmt $ansi_this_date "%x"] "" "" $current_weekday [lc_time_fmt $ansi_this_date %A] "" "" "" "" + multirow append items \ + "" \ + "" \ + "" \ + "" \ + [lc_time_fmt $ansi_this_date "%x"] \ + $current_weekday \ + [lc_time_fmt $ansi_this_date %A] \ + "" \ + "" \ + "" \ + "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \ + "?view=day&date=$ansi_this_date&page_num=${page_num}" } } # Navigation Bar set dates "[lc_time_fmt $first_weekday_date "%q"] - [lc_time_fmt $last_weekday_date "%q"]" -if { ![info exists prev_week_template] } { - set url_previous_week "\"back" -} else { - set url_previous_week [subst $prev_week_template] -} - -if { ![info exists next_week_template] } { - set url_next_week "\"forward" - set next_week_template "" -} else { - set url_next_week [subst $next_week_template] -} - - +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]]]" Index: openacs-4/packages/calendar/www/views-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/calendar/www/views-oracle.xql 15 Feb 2004 12:16:25 -0000 1.3 +++ openacs-4/packages/calendar/www/views-oracle.xql 19 Feb 2004 17:58:37 -0000 1.4 @@ -4,52 +4,68 @@ oracle8.1.6 - - select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + + select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, nvl(e.name, a.name) as name, nvl(e.status_summary, a.status_summary) as status_summary, e.event_id as item_id, (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, cals.calendar_name -$additional_select_clause -from acs_activities a, + $additional_select_clause + from acs_activities a, acs_events e, timespans s, time_intervals t, cal_items ci, calendars cals -where e.timespan_id = s.timespan_id -and s.interval_id = t.interval_id -and e.activity_id = a.activity_id -and start_date between $interval_limitation_clause -and ci.cal_item_id = e.event_id -and cals.calendar_id = ci.on_which_calendar -and e.event_id = ci.cal_item_id -$additional_limitations_clause -$calendars_clause -$order_by_clause - + where e.timespan_id = s.timespan_id + and s.interval_id = t.interval_id + and e.activity_id = a.activity_id + and start_date between $interval_limitation_clause + and ci.cal_item_id = e.event_id + and cals.calendar_id = ci.on_which_calendar + and e.event_id = ci.cal_item_id + $additional_limitations_clause + $calendars_clause + $order_by_clause + - -select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'Day, DD Month YYYY') -as day_of_the_week, -to_char((to_date(:current_date, 'yyyy-mm-dd') - 1), 'yyyy-mm-dd') -as yesterday, -to_char((to_date(:current_date, 'yyyy-mm-dd') + 1), 'yyyy-mm-dd') -as tomorrow -from dual - + + select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'Day, DD Month YYYY') as day_of_the_week, + to_char((to_date(:current_date, 'yyyy-mm-dd') - 1), 'yyyy-mm-dd') as yesterday, + to_char((to_date(:current_date, 'yyyy-mm-dd') + 1), 'yyyy-mm-dd') as tomorrow + from dual + + + + to_date(:current_date,'YYYY-MM-DD') + and (to_date(:current_date,'YYYY-MM-DD') + (24 - 1/3600)/24) + + + + + + to_date(:first_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') and to_date(:last_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') + + + - + to_date(:first_date_of_month_system,'YYYY-MM-DD HH24:MI:SS') and to_date(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS') - + + + + to_date(:start_date,'YYYY-MM-DD HH24:MI:SS') and to_date(:end_date, 'YYYY-MM-DD HH24:MI:SS') + + + Index: openacs-4/packages/calendar/www/views-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-postgresql.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/calendar/www/views-postgresql.xql 15 Feb 2004 12:16:25 -0000 1.2 +++ openacs-4/packages/calendar/www/views-postgresql.xql 19 Feb 2004 17:58:37 -0000 1.3 @@ -4,55 +4,71 @@ postgresql7.1 - -select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, - to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, - coalesce(e.name, a.name) as name, - coalesce(e.status_summary, a.status_summary) as status_summary, - e.event_id as item_id, - (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, - cals.calendar_id, - cals.calendar_name -$additional_select_clause -from acs_activities a, - acs_events e, - timespans s, - time_intervals t, - cal_items ci, - calendars cals -where e.timespan_id = s.timespan_id -and s.interval_id = t.interval_id -and e.activity_id = a.activity_id -and start_date between $interval_limitation_clause -and ci.cal_item_id= e.event_id -and cals.calendar_id = ci.on_which_calendar -and e.event_id = ci.cal_item_id -$additional_limitations_clause -$calendars_clause -$order_by_clause - + + select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, + coalesce(e.name, a.name) as name, + coalesce(e.status_summary, a.status_summary) as status_summary, + e.event_id as item_id, + (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, + cals.calendar_id, + cals.calendar_name + $additional_select_clause + from acs_activities a, + acs_events e, + timespans s, + time_intervals t, + cal_items ci, + calendars cals + where e.timespan_id = s.timespan_id + and s.interval_id = t.interval_id + and e.activity_id = a.activity_id + and start_date between $interval_limitation_clause + and ci.cal_item_id= e.event_id + and cals.calendar_id = ci.on_which_calendar + and e.event_id = ci.cal_item_id + $additional_limitations_clause + $calendars_clause + $order_by_clause + + - - select to_char(to_date(:current_date, 'yyyy-mm-dd'), - 'Day, DD Month YYYY') as day_of_the_week, - to_char(to_date(:current_date, 'yyyy-mm-dd') - - cast('1 day' as interval), 'yyyy-mm-dd') as yesterday, - to_char(to_date(:current_date, 'yyyy-mm-dd') + - cast('1 day' as interval), 'yyyy-mm-dd') - as tomorrow -from dual - + + select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'Day, DD Month YYYY') as day_of_the_week, + to_char(to_date(:current_date, 'yyyy-mm-dd') - cast('1 day' as interval), 'yyyy-mm-dd') as yesterday, + to_char(to_date(:current_date, 'yyyy-mm-dd') + cast('1 day' as interval), 'yyyy-mm-dd') as tomorrow + from dual + - + to_timestamp(:first_date_of_month_system,'YYYY-MM-DD HH24:MI:SS') and to_timestamp(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS') - + + + + to_date(:current_date,'YYYY-MM-DD') + and to_date(:current_date,'YYYY-MM-DD') + cast('23 hours 59 minutes 59 seconds' as interval) + + + + + to_date(:first_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') and to_date(:last_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') + + + + + to_timestamp(:start_date,'YYYY-MM-DD HH24:MI:SS') and to_timestamp(:end_date, 'YYYY-MM-DD HH24:MI:SS') + + + + + 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 -N -r1.4 -r1.5 --- openacs-4/packages/calendar/www/resources/calendar.css 15 Feb 2004 12:16:26 -0000 1.4 +++ openacs-4/packages/calendar/www/resources/calendar.css 19 Feb 2004 17:56:12 -0000 1.5 @@ -1,10 +1,9 @@ .cal-table-header { - BACKGROUND: #99CCFF; + background: #99CCFF; color: #000000; margin: 0px; padding: 0px; font-weight: bold; - } .cal-month-title-text { @@ -15,63 +14,43 @@ color: #FFFFFF; } - .cal-table-header a { color: #0055AA; } + .cal-table-header a:hover { - TEXT-DECORATION: underline; + text-decoration: underline; } .cal-table-title { background: #FFFFFF; font-weight: bold; - border-top-width: 0px; - border-right-width: 0px; - border-bottom-width: 1px; - border-left-width: 0px; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-color: #99CCFF; - border-right-color: #99CCFF; - border-bottom-color: #99CCFF; - border-left-color: #99CCFF; + border-width: 0px 0px 1px 0px; + border-style: solid; + border-color: #99CCFF; } .cal-week { - BACKGROUND: #FFFFFF; - VALIGN: top; + background: #FFFFFF; + valign: top; font-weight: bold; - border-top-width: 0px; - border-right-width: 0px; - border-bottom-width: 1px; - border-left-width: 0px; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-color: #99CCFF; - border-right-color: #99CCFF; - border-bottom-color: #99CCFF; - border-left-color: #99CCFF; - - - + border-width: 0px 0px 1px 0px; + border-style: solid; + border-color: #99CCFF; } .cal-month-day { - BACKGROUND: #DDEEFF; - BORDER: 0px none; + background: #DDEEFF; + border: 0px none; color: #003366; font-weight: bold; font-size: 80%; vertical-align: top; height: 60px; } + .cal-month-day:hover { - BACKGROUND: #cccccc; + background: #cccccc; cursor: pointer; } @@ -86,21 +65,21 @@ } .cal-month-today:hover { - BACKGROUND: #666666; + 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; + border: medium none; } .mini-calendar .view-list { - COLOR: #999999; - TEXT-DECORATION: none; - FONT-SIZE: 8pt; + color: #999999; + text-decoration: none; + font-size: 8pt; white-space: nowrap; font-weight: bold; border-top: 0px solid #99CCFF; @@ -134,17 +113,14 @@ } .mini-calendar .view-list a:visited { - COLOR: #999999; + color: #999999; } .mini-calendar .view-list a:hover { - COLOR: #000000; - TEXT-DECORATION: none; + color: #000000; + text-decoration: none; } - - - .mini-calendar a { text-decoration: none; } @@ -168,11 +144,11 @@ } .cal-navbar-spacer { - COLOR: #000000; - FONT-SIZE: 8pt; + color: #000000; + font-size: 8pt; text-align: center; font-weight: bold; - TEXT-DECORATION: none; + text-decoration: none; padding-top: 4px; padding-bottom:4px; padding-right: 8px; @@ -186,11 +162,11 @@ } .cal-navbar-spacer-end { - COLOR: #000000; - FONT-SIZE: 8pt; + color: #000000; + font-size: 8pt; text-align: center; font-weight: bold; - TEXT-DECORATION: none; + text-decoration: none; padding-top: 4px; padding-bottom:4px; padding-right: 8px; @@ -204,89 +180,58 @@ } .cal-navbar-end { - COLOR: #000000; - FONT-SIZE: 8pt; + color: #000000; + font-size: 8pt; text-align: center; font-weight: bold; - TEXT-DECORATION: none; + text-decoration: none; padding-top: 4px; padding-bottom:4px; padding-right: 8px; padding-left: 8px; white-space: nowrap; - border-top: 0px solid #99CCFF; - border-right: 0px solid #99CCFF; - border-bottom: 0px solid #99CCFF; - border-left: 1px solid #99CCFF; + border-width: 0px 0px 0px 1px; + border-style: solid; + border-color: #99CCFF; } .cal-navbar-spacer-start { - border-top-width: 1px; - border-right-width: 0px; - border-bottom-width: 0px; - border-left-width: 0px; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-color: #000000; - border-left-color: #000000; - border-right-color: #000000; - border-bottom-color: #000000; + border-width: 1px 0px 0px 0px; + border-style: solid; + border-color: #000000; background-color: #CEE6FF; } .cal-navbar-spacer-selected { - COLOR: #000000; - FONT-SIZE: 8pt; + color: #000000; + font-size: 8pt; text-align: center; font-weight: bold; - TEXT-DECORATION: none; - padding-top: 4px; - padding-bottom:4px; - padding-right: 8px; - padding-left: 8px; + text-decoration: none; white-space: nowrap; + padding: 4px 8px; background-color: #CEE6FF; border: 0px solid #000000; } .cal-navbar-spacer-body { background-color: #DDDDFF; - COLOR: #000000; - FONT-SIZE: 8pt; - TEXT-DECORATION: none; - padding-top: 4px; - padding-bottom:4px; - padding-right: 8px; - padding-left: 8px; + color: #000000; + font-size: 8pt; + text-decoration: none; + padding: 4px 8px; white-space: nowrap; - border-top-width: 0px; - border-right-width: 1px; - border-bottom-width: 0px; - border-left-width: 1px; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; + border-width: 0px 1px; + border-style: solid; border-right-color: #663399; border-left-color: #FFFFFF; } .cal-navbar-spacer-selected-start { background-color: #CEE6FF; - border-top-width: 0px; - border-right-width: 0px; - border-bottom-width: 0px; - border-left-width: 1px; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-color: #FFFFFF; - border-right-color: #FFFFFF; - border-bottom-color: #FFFFFF; - border-left-color: #FFFFFF; + border-width: 0px 0px 0px 1px; + border-style: solid; + border-color: #FFFFFF; } .cal-button-sml { @@ -302,17 +247,16 @@ } .cal-row-dark { - BACKGROUND: #DDEEFF; + background: #DDEEFF; } .cal-row-light { - BACKGROUND: #FFFFFF; + background: #FFFFFF; } .cal-row-hi { font-weight: bold; border: 0px solid #7D7DFF; - } .cal-row-lo { @@ -400,7 +344,7 @@ } #jump { - BACKGROUND: #99CCFF; + background: #99CCFF; color: #000000; margin: 0px; padding: 0px; @@ -411,7 +355,7 @@ } #jump a:hover { - TEXT-DECORATION: underline; + text-decoration: underline; } #jump tr { @@ -495,30 +439,32 @@ } .cal-month-day-title { - BACKGROUND: #FFFFFF; - BORDER: 0px none; + background: #FFFFFF; + border: 0px none; color: #000000; font-weight: bold; text-align: center; margin: 0px; padding: 0px; - - } + .cal-month-event { text-align: left; font-weight: normal; } + .cal-month-event a { font-weight: normal; } + .cal-month-table { width: 100%; border: 0px none; margin: 0px; padding: 0px; } + .cal-month-thismonth { font-weight: bold; background-color: #003366; @@ -527,70 +473,68 @@ line-height: 160%; border: 0px solid; } + .cal-month-day-inactive { - BACKGROUND: #EEEEEE; - BORDER: 0px none; + background: #EEEEEE; + border: 0px none; color: #999999; } + .cal-month-event-notime { text-align: left; font-weight: bold; font-size: 120%; } + .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; font-weight: bold; } + .cal-week-event-notime a { background-color: #DDEEFF; } + .cal-day-event-notime { font-weight: bold; } + .cal-day-event-notime a { font-weight: bold; } + .cal-day-event-spans { text-align: left; white-space: nowrap; vertical-align: top; - border-top-width: 0px; - border-right-width: 0px; - border-bottom-width: 0px; - border-left-width: 2px; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-top-color: #000066; - border-right-color: #000066; - border-bottom-color: #000066; - border-left-color: #000066; - + border-width: 0px 0px 0px 2px; + border-style: solid; + border-color: #000066; } + .cal-table-data-title { background: #FFFFFF; font-weight: bold; border: 0px solid #99CCFF; text-align: right; - padding-top: 0px; - padding-right: 10px; - padding-bottom: 0px; - padding-left: 0px; + padding-top: 0px 10px 0px 0px; width: 1%; white-space: nowrap; } + .cal-table-data-action { background: #DDEEFF; font-weight: bold; @@ -602,8 +546,6 @@ font-size: 95%; } - -/* view.adp styles */ #viewadp-mini-calendar { width: 240px; float: left;