Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.56.2.16 -r1.56.2.17
--- openacs-4/packages/acs-templating/acs-templating.info	1 Oct 2016 11:00:31 -0000	1.56.2.16
+++ openacs-4/packages/acs-templating/acs-templating.info	2 Oct 2016 16:40:25 -0000	1.56.2.17
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1d6" url="http://openacs.org/repository/download/apm/acs-templating-5.9.1d6.apm">
+    <version name="5.9.1d7" url="http://openacs.org/repository/download/apm/acs-templating-5.9.1d7.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Templating library.</summary>
         <release-date>2015-10-04</release-date>
@@ -27,7 +27,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-templating" version="5.9.1d6"/>
+        <provides url="acs-templating" version="5.9.1d7"/>
         <requires url="acs-kernel" version="5.9.0"/>
 
         <callbacks>
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -r1.49.2.3 -r1.49.2.4
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl	28 May 2016 09:40:24 -0000	1.49.2.3
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl	2 Oct 2016 16:40:25 -0000	1.49.2.4
@@ -1290,11 +1290,19 @@
   }
 
   if {$element(mode) eq "edit"} {
-      append output "<input type=\"text\" name=\"$element(id)\" size=\"10\" maxlength=\"10\" id=\"$element(id)_input_field\" value=\"[ns_quotehtml $textdate]\" >"
-      append output "<input type=\"button\" style=\"border-width: 0px; height: 17px; width: 19px; background-image: url('/resources/acs-templating/calendar.gif'); background-repeat: no-repeat; cursor: pointer;\" onclick=\"return showCalendarWithDefault('$element(id)_input_field', '$javascriptdate', '[template::util::textdate_localized_format]');\" >"
+      set id $element(id)_input_field
+      append output [subst {
+          <input type="text" name="$element(id)" size="10" maxlength="10" id="$id" value="[ns_quotehtml $textdate]">
+          <input type="button" style="border-width: 0px; height: 17px; width: 19px; background-image: url('/resources/acs-templating/calendar.gif'); background-repeat: no-repeat; cursor: pointer;" id="$id-control"> 
+      }]
+
+      template::add_event_listener \
+          -id $id-control \
+          -script [subst {
+              showCalendarWithDefault('$element(id)_input_field', '$javascriptdate', '[template::util::textdate_localized_format]');
+          }]
   } else {
-      append output $textdate
-      append output "<input type=\"hidden\" name=\"$element(id)\" value=\"[ns_quotehtml $textdate]\">"
+      append output $textdate [subst {<input type="hidden" name="$element(id)" value="[ns_quotehtml $textdate]">}]
   }
       
   return $output
Index: openacs-4/packages/acs-templating/tcl/head-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/head-procs.tcl,v
diff -u -r1.20.2.12 -r1.20.2.13
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	1 Oct 2016 11:10:45 -0000	1.20.2.12
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	2 Oct 2016 16:40:25 -0000	1.20.2.13
@@ -759,17 +759,19 @@
 }
 
 ad_proc template::add_confirm_handler {
+    {-event click}
     {-message "Are you sure?"}
     {-CSSclass "acs-confirm"}
-    {-event click}
     {-id}
 } {
     Register an event handler for confirmation dialogs
     for elements either with an specified ID or for elements
     of a CSS class (default "acs_confirm").
 
-    @id      optional ID for HTML element
-    @message Message to be displayed in the confirmation dialog
+    @event    register confirm handler for this type of event
+    @id       register confirm handler for this HTML ID
+    @CSSclass register confirm handler for this CSS class
+    @message  Message to be displayed in the confirmation dialog
     @author  Gustaf Neumann
 } {
     if {[info exists id]} {
@@ -792,11 +794,48 @@
             }
         }]
     }
-    #template::add_body_script -script $script
 }
 
 
+ad_proc template::add_event_listener {
+    {-event click}
+    {-CSSclass "acs-listen"}
+    {-id}
+    {-usecapture:boolean false}
+    {-preventdefault:boolean true}
+    {-script:required}
+} {
+    
+    Register an event handler for elements either with an specified ID
+    or for elements of a CSS class.
 
+    @event    register confirm handler for this type of event
+    @id       register confirm handler for this HTML ID
+    @CSSclass register confirm handler for this CSS class
+    @message  Message to be displayed in the confirmation dialog
+    @author  Gustaf Neumann
+} {
+    set prevent [expr {$preventdefault_p ? "event.preventDefault();" : ""}]
+
+    if {[info exists id]} {
+        template::add_body_script -script [subst {
+            document.getElementById('$id').addEventListener('$event', function (event) {
+                $prevent$script
+            }, $usecapture_p);
+        }]
+    } else {
+        template::add_body_script -script [subst {
+            var elems = document.getElementsByClassName('$CSSclass');
+            for (var i = 0, l = elems.length; i < l; i++) {
+                elems\[i\].addEventListener('$event', function (event) {
+                    $prevent;$script
+                }, $usecapture_p);
+            }
+        }]
+    }
+}
+
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -r1.60.2.13 -r1.60.2.14
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	29 Aug 2016 09:23:03 -0000	1.60.2.13
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	2 Oct 2016 16:40:25 -0000	1.60.2.14
@@ -348,10 +348,21 @@
             error "You cannot have bulk_actions without providing a key for list '$name'"
         }
         # Create the checkbox element
-        set label [subst {<input type="checkbox" name="_dummy" onclick="acs_ListCheckAll('[ns_quotehtml $name]', this.checked)"
-            onkeypress="acs_ListCheckAll('[ns_quotehtml $name]', this.checked)" title="[_ acs-templating.lt_Checkuncheck_all_rows]">}]
+        set label [subst {
+            <input type="checkbox" name="_dummy" id="$name-bulkaction-control" title="[_ acs-templating.lt_Checkuncheck_all_rows]">
+        }]
+        template::add_event_listener \
+            -id $name-bulkaction-control \
+            -preventdefault=false \
+            -script [subst {acs_ListCheckAll('[ns_quotehtml $name]', this.checked);}]
+        template::add_event_listener \
+            -id $name-bulkaction-control \
+            -event keypress \
+            -preventdefault=false \
+            -script [subst {acs_ListCheckAll('[ns_quotehtml $name]', this.checked);}]
+
         if {[info exists ::__csrf_token]} {
-            append label \n [subst {<input type="hidden" name="__csrf_token" value="$::__csrf_token">}]
+            append label [subst {<input type="hidden" name="__csrf_token" value="$::__csrf_token">}]
         }
         
         # We only ulevel 1 here, because we want the subst to be done in this namespace