Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v
diff -u -N -r1.41 -r1.41.8.1
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 29 Jun 2004 10:17:36 -0000 1.41
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 14 Oct 2008 18:58:24 -0000 1.41.8.1
@@ -73,11 +73,11 @@
@@ -120,9 +120,9 @@
append return_html "
[subst $hour_template] | "
- append return_html ""
+ append return_html "[subst $hour_template] | "
+ append return_html ""
# Go through events
while {1} {
@@ -270,7 +270,7 @@
ns_set delete $calendar_details $index
}
- append return_html "
+ append return_html "
| "
for {set hour $start_hour} {$hour <= $end_hour} {incr hour} {
@@ -319,7 +319,7 @@
}
set display_hour [subst $hour_template]
- append return_html "$display_hour | \n"
+ append return_html " $display_hour | \n"
set n_processed_events 0
@@ -359,7 +359,7 @@
set colspan 1
}
- append return_html "[lindex $one_item_val 2] | "
+ append return_html "[lindex $one_item_val 2] | "
} else {
append return_html "[ns_set value $calendar_details $index] \n"
}
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.2.1 -r1.23.2.2
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 4 Oct 2008 19:58:19 -0000 1.23.2.1
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 14 Oct 2008 18:58:24 -0000 1.23.2.2
@@ -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%"
@@ -221,7 +221,7 @@
-header_bgcolor "black"
-header_text_color "white"
-header_text_size "+1"
- -day_number_template {$day_number}
+ -day_number_template {$day_number}
-day_header_size 1
-day_header_bgcolor "#666666"
-calendar_width 0
@@ -267,7 +267,7 @@
-header_bgcolor "black"
-header_text_color "white"
-header_text_size "+1"
- -day_number_template {$day_number}
+ -day_number_template {$day_number}
-day_header_size 1
-day_header_bgcolor "#666666"
-calendar_width 0
@@ -319,7 +319,7 @@
-header_bgcolor "black"
-header_text_color "white"
-header_text_size "+1"
- -day_number_template {$day_number}
+ -day_number_template {$day_number}
-day_header_size 1
-day_header_bgcolor "#666666"
-calendar_width 0
@@ -376,7 +376,7 @@
-header_bgcolor "black"
-header_text_color "white"
-header_text_size "+1"
- -day_number_template {$day_number}
+ -day_number_template {$day_number}
-day_header_size 1
-day_header_bgcolor "#666666"
-calendar_width 0
@@ -455,13 +455,13 @@
if { $viewname == $view } {
# current view
append result "
- $text
+ $text
|
"
} else {
append result "
- $text
+ $text
|
"
}
@@ -593,7 +593,7 @@
}
append results "
- $curr_month"
+ $curr_month"
# Output link to next month only if it's a legal month
if {$next_month_legal_p != 0} {
@@ -694,7 +694,7 @@
if {$i == $curr_month} {
append output "
- $month
+ $month
| \n"
} else {
set target_date [clock format \
@@ -703,7 +703,7 @@
append output "
- $month
+ $month
| \n"
}
}
@@ -728,12 +728,12 @@
for {set year [expr $curr_year - 2]} {$year <= $end_year} {incr year} {
if {$year == $curr_year} {
append output "
- $year | \n"
+ $year | \n"
} else {
append output "
- $year
+ $year
| \n"
}
}
@@ -756,7 +756,7 @@
set days_of_week [list S M T W T F S]
foreach day_of_week $days_of_week {
- append output "$day_of_week | \n"
+ append output "$day_of_week | \n"
}
append output "
| "
@@ -795,18 +795,18 @@
append output "
|
- $day_number
+ $day_number
| "
} elseif {$julian_date == $julian_date_today} {
append output "
- $day_number
+ $day_number
| "
} else {
append output "
- $day_number
+ $day_number
| "
}
@@ -837,21 +837,23 @@