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 -r1.7 -r1.8
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 15 May 2002 22:34:52 -0000 1.7
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 15 May 2002 23:37:42 -0000 1.8
@@ -44,6 +44,8 @@
} {
dt_get_info $date
+ set today_date [dt_sysdate]
+
if [empty_string_p $calendar_details] {
set calendar_details [ns_set create calendar_details]
}
@@ -106,17 +108,13 @@
append output "
\n"
- # This is not necessary (ben)
-# if { $fill_all_days == 0 } {
-# for { set n 1} { $n < $first_day_of_month } { incr n } {
-# append output " | \n"
-# }
-# }
-
set day_of_week 1
set julian_date $first_julian_date
set day_number $first_day
+ set today_ansi_list [dt_ansi_to_list $today_date]
+ set today_julian_date [dt_ansi_to_julian [lindex $today_ansi_list 0] [lindex $today_ansi_list 1] [lindex $today_ansi_list 2]]
+
while {1} {
if {$julian_date < $first_julian_date_of_month} {
@@ -152,7 +150,13 @@
append output "[subst $day_number_template] "
}
} else {
- append output "[subst $day_number_template] "
+ if {$julian_date == $today_julian_date} {
+ set the_bgcolor $today_bgcolor
+ } else {
+ set the_bgcolor $day_bgcolor
+ }
+
+ append output " | [subst $day_number_template] "
}
if { (!$skip_day) && $large_calendar_p == 1 } {
Index: openacs-4/packages/calendar/tcl/calendar-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 15 May 2002 22:34:57 -0000 1.23
+++ openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 15 May 2002 23:37:49 -0000 1.24
@@ -312,6 +312,11 @@
if {[empty_string_p $calendar_id_list]} {
set calendar_id_list [list [calendar_have_private_p -return_id 1 [ad_get_user_id]]]
}
+
+ # sort by cannot be empty
+ if {[empty_string_p $sort_by]} {
+ set sort_by "item_type"
+ }
set date_format "YYYY-MM-DD HH24:MI"
set current_date $date
|