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