Index: openacs-4/packages/calendar/www/mini-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v
diff -u -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/calendar/www/mini-calendar.adp 22 May 2008 17:40:54 -0000 1.21.2.1
+++ openacs-4/packages/calendar/www/mini-calendar.adp 23 May 2008 10:48:35 -0000 1.21.2.2
@@ -1,32 +1,20 @@
-
-
+
+
-
-
- |
- @curr_month@ @curr_day@ @curr_year@ |
-
-
- |
+
+ @curr_month@ @curr_day@ @curr_year@
+
-
-
- |
- @curr_month@ @curr_day@ @curr_year@ |
-
-
- |
+
+ @curr_month@ @curr_day@ @curr_year@
+
-
-
-
-
+
+
-
-
-
-
+
+
@@ -38,40 +26,36 @@
-
- |
-
+
-
+
+
- @days_of_week.day_short@ |
+ @days_of_week.day_short@ |
-
+
+
-
-
-
- |
-
+
Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/calendar/www/mini-calendar.tcl 22 May 2008 17:40:55 -0000 1.18.2.1
+++ openacs-4/packages/calendar/www/mini-calendar.tcl 23 May 2008 10:48:35 -0000 1.18.2.2
@@ -126,16 +126,17 @@
set next_month_url "$base_url?view=$view&date=[ad_urlencode $next_month]${page_num}${url_stub_period_days}"
set first_day_of_week [lc_get firstdayofweek]
- #set week_days [list S M T W T F Sa]
set week_days [lc_get abday]
- multirow create days_of_week day_short
+ set long_weekdays [lc_get day]
+ multirow create days_of_week day_short day_long
for {set i 0} {$i < 7} {incr i} {
- multirow append days_of_week [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]]
+ multirow append days_of_week \
+ [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]] \
+ [lindex $long_weekdays [expr [expr $i + $first_day_of_week] % 7]]
}
+ multirow create days day_number beginning_of_week_p end_of_week_p today_p active_p url weekday
- multirow create days day_number beginning_of_week_p end_of_week_p today_p active_p url
-
set day_of_week 1
# Calculate number of active days
@@ -182,8 +183,12 @@
set end_of_week_p f
}
+ set weekday [lindex $long_weekdays $day_of_week]
+
multirow append days $day_number $beginning_of_week_p $end_of_week_p $today_p $active_p \
- "[export_vars -base $base_url {{date $ansi_date} view}]${page_num}${url_stub_period_days}"
+ "[export_vars -base $base_url {{date $ansi_date} view}]${page_num}${url_stub_period_days}" \
+ $weekday
+
incr day_number
incr day_of_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 -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/calendar/www/resources/calendar-hc.css 22 May 2008 11:34:32 -0000 1.1.2.1
+++ openacs-4/packages/calendar/www/resources/calendar-hc.css 23 May 2008 10:48:35 -0000 1.1.2.2
@@ -44,7 +44,12 @@
/* at-a-glance ---------------------------------------------------*/
/* This is the small cal that appears in month/week/day views on the left hand side*/
-#at-a-glance td {
+#at-a-glance {
+ border-top: 1px solid #ffffff;
+ border-left: 1px solid #ffffff;
+}
+
+#at-a-glance th, #at-a-glance td {
border-right: 1px solid #ffffff;
border-bottom: 1px solid #ffffff;
background-color: inherit;
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 -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/calendar/www/resources/calendar.css 23 May 2008 09:24:29 -0000 1.12.2.1
+++ openacs-4/packages/calendar/www/resources/calendar.css 23 May 2008 10:48:35 -0000 1.12.2.2
@@ -75,11 +75,17 @@
margin-right: 5px;
}
-.at-a-glance-head-current_view {
- text-align: center;
+#at-a-glance {
+ border-top: 1px solid #B8B8B8;
+ border-left: 1px solid #B8B8B8;
}
-#at-a-glance td {
+#at-a-glance caption img {
+ border: 0;
+ vertical-align: middle;
+}
+
+#at-a-glance th, #at-a-glance td {
width: 25px;
height:25px;
border-right: 1px solid #B8B8B8;
@@ -89,7 +95,7 @@
}
#at-a-glance td.months {
- width: 80px;
+ width: 70px;
}
#at-a-glance td.selected {