Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -N -r1.25 -r1.25.2.1
--- openacs-4/packages/calendar/www/cal-item-new.adp	14 Jul 2015 22:36:43 -0000	1.25
+++ openacs-4/packages/calendar/www/cal-item-new.adp	27 Sep 2016 10:13:55 -0000	1.25.2.1
@@ -9,7 +9,7 @@
 </else>
 <property name="focus">cal_item.title</property>
 
-<script type="text/javascript">
+<script type="text/javascript" <if @::__csp_nonce@ not nil> nonce="@::__csp_nonce;literal@"</if>>
     function disableTime(form_name) {
           <multiple name="time_format_elms">
             document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = true;
@@ -22,18 +22,6 @@
             document.forms[form_name].elements["end_time.@time_format_elms.name@"].disabled = false;
           </multiple>
     }
-    function TimePChanged(elm) {
-      var form_name = "cal_item";
-
-      if (elm == null) return;
-      if (document.forms == null) return;
-      if (document.forms[form_name] == null) return;
-      if (elm.value == 0) {
-         disableTime(form_name);
-      } else {
-         enableTime(form_name);
-      }
-  }
 </script>
 
   <div id="viewadp-mini-calendar">
@@ -44,13 +32,3 @@
   <div id="viewadp-cal-table">   
     <formtemplate id="cal_item"></formtemplate>
   </div>
-
-
-<script type="text/javascript">
-      if (document.forms["cal_item"].time_p[0].checked == true ) {
-        // All day event
-        disableTime("cal_item");
-      } else {
-        enableTime("cal_item");
-      }
-</script>
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 -N -r1.39.2.2 -r1.39.2.3
--- openacs-4/packages/calendar/www/cal-item-new.tcl	20 May 2016 20:14:43 -0000	1.39.2.2
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	27 Sep 2016 10:13:55 -0000	1.39.2.3
@@ -47,7 +47,7 @@
     set calendar_id [lindex $calendar_options 0 1]
 }
 # TODO: Move into ad_form
-if { ([info exists cal_item_id] && $cal_item_id ne "") } {
+if { [info exists cal_item_id] && $cal_item_id ne "" } {
     set page_title [_ calendar.Calendar_Edit_Item]
     set ad_form_mode display
 } else {
@@ -65,10 +65,10 @@
     {date:date
         {label "[_ calendar.Date_1]"}
         {format "YYYY MM DD"}
-        {after_html {<input type="button" style="height:23px; width:23px; background: url('/resources/acs-templating/calendar.gif');" onclick ="return showCalendarWithDateWidget('date', 'y-m-d');" > \[<b>[_ calendar.y-m-d]</b>\]} } }
+        {after_html {<input type="button" style="height:23px; width:23px; background: url('/resources/acs-templating/calendar.gif');" id='cal_item.date-button'> \[<b>[_ calendar.y-m-d]</b>\]} }
+    }
     {time_p:text(radio)     
         {label "&nbsp;"}
-        {html {onClick "javascript:TimePChanged(this);"}} 
         {options {{"[_ calendar.All_Day_Event]" 0}
                   {"[_ calendar.Use_Hours_Below]" 1} }}
     }
@@ -93,6 +93,40 @@
     }
 }
 
+template::add_body_script -script {
+    function TimePChanged(elm) {
+      var form_name = "cal_item";
+
+      if (elm == null) return;
+      if (document.forms == null) return;
+      if (document.forms[form_name] == null) return;
+      if (elm.value == 0) {
+         disableTime(form_name);
+      } else {
+         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");
+    }
+}
+
+
 if { [ad_form_new_p -key cal_item_id] } {
     ad_form -extend -name cal_item -form {
         {repeat_p:text(radio)     
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 -N -r1.23 -r1.23.4.1
--- openacs-4/packages/calendar/www/mini-calendar.adp	10 Oct 2009 22:38:09 -0000	1.23
+++ openacs-4/packages/calendar/www/mini-calendar.adp	27 Sep 2016 10:13:55 -0000	1.23.4.1
@@ -44,18 +44,18 @@
           </if>
           <if @days.active_p@ true>
             <if @days.today_p@ true>
-              <td headers="day_@days.day_num@" class="today" onclick="javascript:location.href='@days.url@#calendar';" onkeypress="javascript:acs_KeypressGoto('@days.url@#calendar',event);">
+              <td headers="day_@days.day_num@" class="today" id="@days.id;literal@">
                 <a href="@days.url@#calendar" title="#calendar.goto_days_pretty_date#">@days.day_number@</a>
               </td>
             </if>
             <else>
-              <td headers="day_@days.day_num@" class="active" onclick="javascript:location.href='@days.url@#calendar';" onkeypress="javascript:acs_KeypressGoto('@days.url@#calendar',event);">
+              <td headers="day_@days.day_num@" class="active" id="@days.id;literal@">
                 <a href="@days.url@#calendar" title="#calendar.goto_days_pretty_date#">@days.day_number@</a>
               </td>
             </else>
           </if>
           <else>
-            <td headers="day_@days.day_num@" class="inactive" onclick="javascript:location.href='@days.url@#calendar';" onkeypress="javascript:acs_KeypressGoto('@days.url@#calendar',event);">
+            <td headers="day_@days.day_num@" class="inactive" id="@days.id;literal@">
               <a href="@days.url@#calendar" title="#calendar.goto_days_pretty_date#">@days.day_number@</a>
             </td>
           </else>
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 -N -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/calendar/www/mini-calendar.tcl	10 Sep 2015 08:30:15 -0000	1.21.2.1
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	27 Sep 2016 10:13:55 -0000	1.21.2.2
@@ -140,7 +140,7 @@
             $i
     }
 
-    multirow create days day_number beginning_of_week_p end_of_week_p today_p active_p url weekday day_num pretty_date
+    multirow create days day_number beginning_of_week_p end_of_week_p today_p active_p url weekday day_num pretty_date id
 
     set day_of_week 1
 
@@ -191,13 +191,26 @@
         }
 
         set weekday [lindex $long_weekdays $day_of_week]
-
+        set url "[export_vars -base $base_url {{date $ansi_date} view}]${page_num}${url_stub_period_days}"
         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}" \
+            $url \
             $weekday \
             $day_num \
-            $pretty_date
+            $pretty_date \
+            mini-calendar-$ansi_date
 
+        template::add_body_script -script [subst {
+            var e =  document.getElementById('mini-calendar-$ansi_date');
+            e.addEventListener('click', function (event) {
+                event.preventDefault();
+                location.href = '$url#calendar';
+            });
+            e.addEventListener('keypress', function (event) {
+                event.preventDefault();
+                acs_KeypressGoto('$url#calendar',event);
+            });
+        }]
+        
         incr day_number
         incr day_of_week
     }