Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 15 May 2007 20:14:14 -0000 1.23 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 9 Nov 2008 23:29:22 -0000 1.24 @@ -19,7 +19,7 @@ -header_bgcolor "black" -header_text_color "white" -header_text_size "+2" - -day_number_template {$day_number} + -day_number_template {$day_number} -day_header_size 2 -day_header_bgcolor "#666666" -calendar_width "100%" @@ -75,42 +75,46 @@ # in the title bar if { $prev_next_links_in_title == 0 } { - set title " -
$prev_month_url | -- $month_heading - | -$next_month_url | -
$prev_month_url | ++ + $month_heading + + | +$next_month_url | +
- - $day_of_week - - | \n" + append output [subst { ++ + $day_of_week + + | \n}] } - append output "|||||
" - if { $fill_all_days == 0 } { - set skip_day 1 - } else { - append output "[subst $day_number_template] " - } - } else { + if {$before_month_p || $after_month_p} { + append output " | " + if { $fill_all_days == 0 } { + set skip_day 1 + } else { + append output "[subst $day_number_template] " + } + } else { if {$julian_date == $today_julian_date} { set the_bgcolor $today_bgcolor - set the_class "cal-month-today" + set the_class "cal-month-today" } else { set the_bgcolor $day_bgcolor - set the_class "cal-month-day" + set the_class "cal-month-day" } - append output " | [subst $day_number_template] " - } + append output " | [subst $day_number_template] "
+ }
- if { (!$skip_day) && $large_calendar_p == 1 } {
- append output " "
+ if { (!$skip_day) && $large_calendar_p == 1 } {
+ append output " "
+ }
- append output ""
- set calendar_day_index [ns_set find $calendar_details $julian_date]
-
- while { $calendar_day_index >= 0 } {
- set calendar_day [ns_set value $calendar_details $calendar_day_index]
+ set calendar_day_index [ns_set find $calendar_details $julian_date]
+
+ while { $calendar_day_index >= 0 } {
+ set calendar_day [ns_set value $calendar_details $calendar_day_index]
- ns_set delete $calendar_details $calendar_day_index
+ ns_set delete $calendar_details $calendar_day_index
- append output "$calendar_day"
+ append output "$calendar_day"
- set calendar_day_index [ns_set find $calendar_details $julian_date]
- }
- append output " "
- }
+ set calendar_day_index [ns_set find $calendar_details $julian_date]
+ }
+ append output " | \n"
+ append output "\n"
- incr day_of_week
- incr julian_date
+ incr day_of_week
+ incr julian_date
incr day_number
- if { $day_of_week > 7 } {
- set day_of_week 1
- append output "|||
$prev_month_url$next_month_url | -||||||
$prev_month_url$next_month_url | +
- " + " if { $view == "day" && [dt_sysdate] == $date } { - append output "Today" + append output "Today" } else { append output " - Today " + Today " } append output " - is [dt_ansi_to_pretty] |