Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v diff -u -N -r1.31 -r1.31.2.1 --- openacs-4/packages/calendar/tcl/calendar-procs.tcl 7 Oct 2007 22:36:55 -0000 1.31 +++ openacs-4/packages/calendar/tcl/calendar-procs.tcl 23 May 2008 19:36:02 -0000 1.31.2.1 @@ -224,7 +224,8 @@ return [list day_number $day_number \ today_p $today_p \ beginning_of_week_p $beginning_of_week_p \ - end_of_week_p $end_of_week_p] + end_of_week_p $end_of_week_p \ + weekday $weekday] } ad_proc -public calendar::from_sql_datetime { 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.22 -r1.22.2.1 --- openacs-4/packages/calendar/www/view-month-display.adp 3 Jan 2008 18:15:23 -0000 1.22 +++ openacs-4/packages/calendar/www/view-month-display.adp 23 May 2008 19:36:03 -0000 1.22.2.1 @@ -1,89 +1,64 @@ -<% ns_log notice "DAVEB 103 view-month-display.adp" %> + -

+

-
#calendar.prev_month#  @month_string@ @year@  - #calendar.next_month# - + #calendar.next_month# +
- - - - - + + + + + + + - - -
- @weekday_names.weekday_short@ -
+ @weekday_names.weekday_long@ +
+
+ - + + + - + + + + + + - + + - - - - - - + - - -
- - @items.start_time@ - @items.event_name@ - - - [@items.calendar_name@] - - -
- - + - - - - - - - - - - - - -
  + + + + +  [@items.day_number@ ] - + + +
+ + @items.start_time@ + @items.event_name@ + + + [@items.calendar_name@] + + +
+ + - -
  - - - - -  [@items.day_number@ ] + +
- - - - - - - - - -
-
#acs-kernel.common_Go#   #calendar.prev_month#
- 		-
#calendar.next_month#  #acs-kernel.common_Go#
-
- - - + + 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.22 -r1.22.2.1 --- openacs-4/packages/calendar/www/view-month-display.tcl 7 Oct 2007 22:36:55 -0000 1.22 +++ openacs-4/packages/calendar/www/view-month-display.tcl 23 May 2008 19:36:03 -0000 1.22.2.1 @@ -82,10 +82,12 @@ set first_day_of_week [lc_get firstdayofweek] set last_day_of_week [expr [expr $first_day_of_week + 6] % 7] +set week_days_short [lc_get abday] set week_days [lc_get day] -multirow create weekday_names weekday_short +multirow create weekday_names weekday_short weekday_long for {set i 0} {$i < 7} {incr i} { - multirow append weekday_names [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]] + set i_day [expr {[expr {$i + $first_day_of_week}] % 7}] + multirow append weekday_names [lindex $week_days_short $i_day] [lindex $week_days $i_day] } @@ -196,17 +198,18 @@ -current_day $current_day \ -today_julian_date $today_julian_date \ -first_julian_date_of_month $first_julian_date_of_month] + multirow append items \ "" \ "" \ "" \ "" \ + [lindex $week_days_short $display_information(weekday)] \ "" \ "" \ "" \ "" \ "" \ - "" \ $display_information(day_number) \ $display_information(beginning_of_week_p) \ $display_information(end_of_week_p) \ @@ -244,7 +247,7 @@ [subst $item_template] \ $description \ $calendar_name \ - $pretty_weekday \ + [lindex $week_days_short $display_information(weekday)] \ $pretty_start_date \ $pretty_end_date \ $pretty_start_time \ @@ -279,12 +282,12 @@ "" \ "" \ "" \ + [lindex $week_days_short $display_information(weekday)] \ "" \ "" \ "" \ "" \ "" \ - "" \ $display_information(day_number) \ $display_information(beginning_of_week_p) \ $display_information(end_of_week_p) \ 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.23.2.2 -r1.23.2.3 --- openacs-4/packages/calendar/www/view-one-day-display.adp 23 May 2008 11:40:36 -0000 1.23.2.2 +++ openacs-4/packages/calendar/www/view-one-day-display.adp 23 May 2008 19:36:03 -0000 1.23.2.3 @@ -1,5 +1,5 @@ - + 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.18.2.2 -r1.18.2.3 --- openacs-4/packages/calendar/www/view-week-display.adp 23 May 2008 16:25:48 -0000 1.18.2.2 +++ openacs-4/packages/calendar/www/view-week-display.adp 23 May 2008 19:36:03 -0000 1.18.2.3 @@ -1,5 +1,5 @@
@curr_day_name@ @curr_month@ @curr_day@ @curr_year@@curr_day_name@ @curr_month@ @curr_day@ @curr_year@
#calendar.Hours#
-
+ #calendar.prev_week#  #calendar.Week_of# @week_start_month@ @week_start_day@ @week_start_year@ – @week_end_month@ @week_end_day@ @week_end_year@  #calendar.next_week# Index: openacs-4/packages/calendar/www/resources/calendar-hc.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar-hc.css,v diff -u -N -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/calendar/www/resources/calendar-hc.css 23 May 2008 16:25:49 -0000 1.1.2.4 +++ openacs-4/packages/calendar/www/resources/calendar-hc.css 23 May 2008 19:36:03 -0000 1.1.2.5 @@ -34,13 +34,21 @@ border-left: 1px #ffffff solid; } -.cal-month-table td { +.cal-month-table th { + color: #000000; +} + +.cal-month-table td, .cal-month-table th { border-right: 1px #ffffff solid; border-bottom: 1px #ffffff solid; } /* END Month View ---------------------------------------------------*/ +.cal-table-caption { + color: inherit; +} + /* at-a-glance ---------------------------------------------------*/ /* This is the small cal that appears in month/week/day views on the left hand side*/ @@ -86,10 +94,6 @@ background-color: #ffffff; } -#cal-table-day caption, #cal-table-week caption { - color: inherit; -} - #cal-table-day th, #cal-table-week th { background-color: #ffffff; color: #000000; 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.12.2.4 -r1.12.2.5 --- openacs-4/packages/calendar/www/resources/calendar.css 23 May 2008 16:25:49 -0000 1.12.2.4 +++ openacs-4/packages/calendar/www/resources/calendar.css 23 May 2008 19:36:03 -0000 1.12.2.5 @@ -42,20 +42,22 @@ } .cal-month-table { - border: 0px none; margin: 0px; padding: 0px; border-top: 1px #89A2B3 solid; border-left: 1px #89A2B3 solid; } -.cal-month-table td { +.cal-month-table th { + background-color: #ffffff; +} + +.cal-month-table td, .cal-month-table th { border-right: 1px #89A2B3 solid; border-bottom: 1px #89A2B3 solid; padding: 2px; } - /* END Month View ---------------------------------------------------*/ .cal-input-field { @@ -67,6 +69,18 @@ } +.cal-table-caption { + font-size: 1.2em; + font-weight: bold; + color: #646c61; + margin: 1em; +} + +.cal-table-caption img { + border: 0; + vertical-align: middle; +} + /* at-a-glance ---------------------------------------------------*/ /* This is the small cal that appears in month/week/day views on the left hand side*/ @@ -152,38 +166,11 @@ } -/* Navigation at the bottom of Month/Week views */ - -.calendar-back-forward { - padding-top:6px; -} - -.calendar-back-forward img { - vertical-align:middle; - padding-bottom:2px; - border:0px; -} -/* /Navigation at the bottom of Month/Week views */ - - - /* Week/Day View Common Styles ---------------------------------------------------*/ #cal-table-day, #cal-table-week { background-color:#89A2B3; } -#cal-table-day caption, #cal-table-week caption { - font-size: 1.2em; - font-weight: bold; - color: #646c61; - margin: 1em; -} - -#cal-table-day caption img, #cal-table-week caption img { - border: 0; - vertical-align: middle; -} - #cal-table-day th, #cal-table-week th { background-color: #ffffff; }