Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl 20 May 2016 20:14:43 -0000 1.9.2.2
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl 2 Oct 2016 16:43:51 -0000 1.9.2.3
@@ -61,7 +61,7 @@
{recur_until:date
{label "[_ calendar.lt_Repeat_this_event_unt]"}
{format "YYYY MM DD"}
- {after_html { \[[_ calendar.y-m-d]\]}
+ {after_html { \[[_ calendar.y-m-d]\]}
}
}
@@ -105,6 +105,9 @@
ad_script_abort
} -has_submit 1
+template::add_event_listener \
+ -id cal-item-recur-until \
+ -script {showCalendarWithDateWidget('recur_until', 'y-m-d');}
ad_return_template
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.39.2.3 -r1.39.2.4
--- openacs-4/packages/calendar/www/cal-item-new.tcl 27 Sep 2016 10:13:55 -0000 1.39.2.3
+++ openacs-4/packages/calendar/www/cal-item-new.tcl 2 Oct 2016 16:43:51 -0000 1.39.2.4
@@ -106,24 +106,6 @@
enableTime(form_name);
}
}
-
- document.getElementById('cal_item:elements:time_p:0').addEventListener('click', function (event) {
- TimePChanged(this); return false;
- });
- document.getElementById('cal_item:elements:time_p:1').addEventListener('click', function (event) {
- TimePChanged(this); return false;
- });
- document.getElementById('cal_item.date-button').addEventListener('click', function (event) {
- event.preventDefault();
- return showCalendarWithDateWidget('date', 'y-m-d');
- });
-
- if (document.forms["cal_item"].time_p[0].checked == true ) {
- // All day event
- disableTime("cal_item");
- } else {
- enableTime("cal_item");
- }
}
@@ -360,10 +342,25 @@
ad_returnredirect [export_vars -base cal-item-view { cal_item_id }]
}
ad_script_abort
+
+} -on_request {
+ template::add_event_listener -id cal_item:elements:time_p:0 -script {TimePChanged(this);}
+ template::add_event_listener -id cal_item:elements:time_p:1 -script {TimePChanged(this);}
+ template::add_event_listener -id cal_item.date-button -script {showCalendarWithDateWidget('date', 'y-m-d');}
+
+ template::add_body_script -script {
+ if (document.forms["cal_item"].time_p[0].checked == true ) {
+ // All day event
+ disableTime("cal_item");
+ } else {
+ enableTime("cal_item");
+ }
+ }
}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4
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.21.2.2 -r1.21.2.3
--- openacs-4/packages/calendar/www/mini-calendar.tcl 27 Sep 2016 10:13:55 -0000 1.21.2.2
+++ openacs-4/packages/calendar/www/mini-calendar.tcl 2 Oct 2016 16:43:51 -0000 1.21.2.3
@@ -1,28 +1,31 @@
-if {(![info exists base_url] || $base_url eq "")} {
+if {![info exists base_url] || $base_url eq ""} {
set base_url [ad_conn url]
}
-if {(![info exists date] || $date eq "")} {
+if {![info exists date] || $date eq ""} {
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 "[_ acs-datetime.Date]"}
- {html {size 10}}
- }
- {btn_ok:text(submit)
- {label "[_ calendar.Go_to_date]"}
- }
- {view:text(hidden)
- {value "day"}
- }
-} -on_submit {}
+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 "[_ acs-datetime.Date]"}
+ {html {size 10}}
+ }
+ {btn_ok:text(submit)
+ {label "[_ calendar.Go_to_date]"}
+ }
+ {view:text(hidden)
+ {value "day"}
+ }
+ } -on_submit {}
-if {([info exists page_num] && $page_num ne "")} {
+if {[info exists page_num] && $page_num ne ""} {
set page_num_formvar [export_vars -form {page_num}]
- set page_num "&page_num=$page_num"
+ set page_num "&page_num=$page_num"
} else {
set page_num_formvar ""
set page_num ""
@@ -75,17 +78,17 @@
dt_get_info $date
}
-set now [clock scan $date]
-set date_list [dt_ansi_to_list $date]
-set year [dt_trim_leading_zeros [lindex $date_list 0]]
-set month [dt_trim_leading_zeros [lindex $date_list 1]]
-set day [dt_trim_leading_zeros [lindex $date_list 2]]
+set now [clock scan $date]
+set date_list [dt_ansi_to_list $date]
+set year [dt_trim_leading_zeros [lindex $date_list 0]]
+set month [dt_trim_leading_zeros [lindex $date_list 1]]
+set day [dt_trim_leading_zeros [lindex $date_list 2]]
-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"]
+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"]
set curr_date_pretty [lc_time_fmt $date "%q"]
set today [lc_time_fmt [dt_sysdate] "%q"]
@@ -95,23 +98,16 @@
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}"
set next_year_url "$base_url?view=$view&date=[ad_urlencode $next_year]${page_num}${url_stub_period_days}"
+ set now [clock scan $date]
- set now [clock scan $date]
-
multirow create months name current_month_p new_row_p url
for {set i 0} {$i < 12} {incr i} {
set month [lindex $months_list $i]
# show 3 months in a row
-
set new_row_p [expr {$i / 3}]
-# if {($i != 0) && ($i % 3 == 0)} {
-# set new_row_p t
-# } else {
-# set new_row_p f
-# }
if {$i == $curr_month_idx} {
set current_month_p t
@@ -136,7 +132,7 @@
multirow create days_of_week day_short day_num
for {set i 0} {$i < 7} {incr i} {
multirow append days_of_week \
- [lindex $week_days [expr {[expr {$i + $first_day_of_week}] % 7}]] \
+ [lindex $week_days [expr {($i + $first_day_of_week) % 7}]] \
$i
}
Index: openacs-4/packages/calendar/www/navbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.adp,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/calendar/www/navbar.adp 30 Aug 2008 19:51:23 -0000 1.4
+++ openacs-4/packages/calendar/www/navbar.adp 2 Oct 2016 16:43:51 -0000 1.4.6.1
@@ -4,7 +4,7 @@
|
class="active">
- onclick="@views.onclick@">
+
@views.name;noquote@@views.spacer;noquote@
|
Index: openacs-4/packages/calendar/www/navbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/calendar/www/navbar.tcl 10 Sep 2015 08:30:15 -0000 1.6.2.1
+++ openacs-4/packages/calendar/www/navbar.tcl 2 Oct 2016 16:43:51 -0000 1.6.2.2
@@ -34,39 +34,35 @@
set link "[export_vars -base $base_url {date {view day}}]&export=print"
}
-multirow create views name text url spacer selected_p onclick
+multirow create views name text url spacer selected_p
multirow append views \
[_ calendar.Day] \
"day" \
"[export_vars -base $base_url {date {view day}}]${page_num}\#calendar" \
" | " \
- $day_selected_p \
- ""
+ $day_selected_p
multirow append views \
[_ calendar.Week] \
"week" \
"[export_vars -base $base_url {date {view week}}]${page_num}\#calendar" \
" | " \
- $week_selected_p \
- ""
+ $week_selected_p
multirow append views \
[_ calendar.Month] \
"month" \
"[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
" | " \
- $month_selected_p \
- ""
+ $month_selected_p
multirow append views \
[_ calendar.List] \
"list" \
"[export_vars -base $base_url {date {view list}}]${page_num}${url_stub_period_days}\#calendar" \
"" \
- $list_selected_p \
- ""
+ $list_selected_p
# Local variables: