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.16 -r1.17
--- openacs-4/packages/calendar/www/mini-calendar.tcl 8 Aug 2006 21:26:18 -0000 1.16
+++ openacs-4/packages/calendar/www/mini-calendar.tcl 15 May 2007 20:14:21 -0000 1.17
@@ -6,6 +6,22 @@
set date [dt_sysdate]
}
+ad_form -name go-to-date -method get -has_submit 1 -action $base_url -export [lappend list_of_vars page_num] -html {class inline-form} -form {
+ {date:text,nospell,optional
+ {label ""}
+ {html {size 10}}
+ {after-html "
[_ acs-datetime.Date_as_YYYYMMDD]"}
+ }
+ {btn_ok:text(submit)
+ {label "[_ calendar.Go_to_date]"}
+ }
+ {view:text(hidden)
+ {label ""}
+ {value "day"}
+ }
+} -on_submit { }
+
+
if {[exists_and_not_null page_num]} {
set page_num_formvar [export_form_vars page_num]
set page_num "&page_num=$page_num"
@@ -67,8 +83,10 @@
set months_list [dt_month_names]
set curr_month_idx [expr [dt_trim_leading_zeros [clock format $now -format "%m"]]-1]
+set curr_day [clock format $now -format "%d"]
+set curr_month [clock format $now -format "%B"]
+set curr_year [clock format $now -format "%Y"]
if [string equal $view month] {
- set curr_year [clock format $now -format "%Y"]
set prev_year [clock format [clock scan "1 year ago" -base $now] -format "%Y-%m-%d"]
set next_year [clock format [clock scan "1 year" -base $now] -format "%Y-%m-%d"]
set prev_year_url "$base_url?view=$view&date=[ad_urlencode $prev_year]${page_num}${url_stub_period_days}"
@@ -84,11 +102,12 @@
# show 3 months in a row
- if {($i != 0) && ([expr $i % 3] == 0)} {
- set new_row_p t
- } else {
- set new_row_p f
- }
+ set new_row_p [expr $i / 3]
+# if {($i != 0) && ([expr $i % 3] == 0)} {
+# set new_row_p t
+# } else {
+# set new_row_p f
+# }
if {$i == $curr_month_idx} {
set current_month_p t
@@ -102,13 +121,13 @@
}
} else {
- set curr_month [lindex $months_list $curr_month_idx ]
set prev_month [clock format [clock scan "1 month ago" -base $now] -format "%Y-%m-%d"]
set next_month [clock format [clock scan "1 month" -base $now] -format "%Y-%m-%d"]
set prev_month_url "$base_url?view=$view&date=[ad_urlencode $prev_month]${page_num}${url_stub_period_days}"
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
for {set i 0} {$i < 7} {incr i} {
@@ -151,7 +170,7 @@
set today_p t
}
- if { $day_of_week == 0} {
+ if { $day_of_week == 1} {
set beginning_of_week_p t
} else {
set beginning_of_week_p f
@@ -184,3 +203,9 @@
foreach var $list_of_vars {
append form_vars ""
}
+
+ad_form -name choose_new_date -show_required_p f -has_edit 0 -has_submit 0 -form {
+ {new_date:date
+ {label ""}
+ {format {MM DD YYYY}}}
+}