Index: openacs-4/packages/acs-admin/www/apm/package-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add.tcl,v
diff -u -N -r1.13.2.3 -r1.13.2.4
--- openacs-4/packages/acs-admin/www/apm/package-add.tcl	28 Sep 2016 12:56:29 -0000	1.13.2.3
+++ openacs-4/packages/acs-admin/www/apm/package-add.tcl	8 Nov 2016 11:50:33 -0000	1.13.2.4
@@ -54,7 +54,7 @@
 
 <tr>
   <th align="right" nowrap>Package Key:</th>
-  <td><input name="package_key" id="package_key" size="30"></td>
+  <td><input name="package_key" size="30" class="update-url"></td>
 </tr>
 
 <tr>
@@ -149,7 +149,7 @@
 
 <tr>
   <th align="right" nowrap>Initial Version:</th>
-  <td><input name="version_name" id="version_name" size="10"></td>
+  <td><input name="version_name" size="10" id="update-url"></td>
 </tr>
 
 <tr>
@@ -208,15 +208,15 @@
 </tr>
 <tr>
   <th align="right" nowrap>Primary Owner URL:</th>
-  <td><input name="owner_uri" size="30" value="mailto:$email" onChange="checkMailto(this)"></td>
+  <td><input name="owner_uri" size="30" value="mailto:$email" class="check-mailto"></td>
 </tr>
 <tr>
   <th align="right" nowrap>Secondary Owner:</th>
   <td><input name="owner_name" size="30"></td>
 </tr>
 <tr>
   <th align="right" nowrap>Secondary Owner URL:</th>
-  <td><input name="owner_uri" size="30" onChange="checkMailto(this)"></td>
+  <td><input name="owner_uri" size="30" class="check-mailto"></td>
 </tr>
 
 <tr>
@@ -255,18 +255,14 @@
 </table>
 }]
 
-ad_return_template apm
 
-# Add onChange event listener to package_key and version_name fields to comply with CSP.
-# No inline JS event handlers!
-template::add_body_script -script "
-    var elem = document.getElementById('package_key');
-    elem.addEventListener('change', function (event) {updateURLs();});
-    
-    var elem = document.getElementById('version_name');
-    elem.addEventListener('change', function (event) {updateURLs();});"
+# Add event listener for updating urls and checking mailto urls
 
+template::add_event_listener -CSSclass "update-url" -event change -script {updateURLs();}
+template::add_event_listener -CSSclass "check-mailto" -event change -script {checkMailto(this);}
 
+ad_return_template apm
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -N -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	27 Sep 2016 07:54:35 -0000	1.12.2.2
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	8 Nov 2016 11:50:33 -0000	1.12.2.3
@@ -43,11 +43,8 @@
     var form = document.forms\[0\];
     form.version_uri.value = "$version_uri_prefix" + form.version_name.value + "$version_uri_suffix";
 }
-</script>
-}]
-    set version_name_on_change "onChange=\"updateVersionURL()\""
-} else {
-    set version_name_on_change ""
+</script>}]
+    template::add_event_listener -CSSclass "update-version-url" -event change -script {updateVersionURL();}
 }
 
 append body [subst {
@@ -112,7 +109,7 @@
 
 <tr>
   <th style="text-align:right; white-space: nowrap">Version:</th>
-  <td><input name="version_name" size="10" value="$version_name" $version_name_on_change>
+  <td><input name="version_name" size="10" value="$version_name" class="update-version-url">
 </td>
 </tr>
 
@@ -194,7 +191,7 @@
 </tr>
 <tr>
   <th style="text-align:right; white-space: nowrap">$prompt URL:</th>
-  <td><input name="owner_uri" size="30" value="$owner_uri" onChange="checkMailto(this)"></td>
+  <td><input name="owner_uri" size="30" value="$owner_uri" class="check-mailto"></td>
 </tr>
     }]
 }
@@ -233,6 +230,8 @@
 </form>
 }]
 
+template::add_event_listener -CSSclass "check-mailto" -event change -script {checkMailto(this);}
+
 ad_return_template apm
 
 # Local variables: