Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.153.2.20 -r1.153.2.21
--- openacs-4/packages/xowiki/xowiki.info	13 Sep 2016 08:30:37 -0000	1.153.2.20
+++ openacs-4/packages/xowiki/xowiki.info	2 Oct 2016 16:50:47 -0000	1.153.2.21
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.1d13" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d13.apm">
+    <version name="5.9.1d14" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d14.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2016-09-08</release-date>
@@ -55,10 +55,11 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.1d13"/>
+        <provides url="xowiki" version="5.9.1d14"/>
         <requires url="acs-datetime" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-tcl" version="5.9.1d12"/>
+	<requires url="acs-templating" version="5.9.1d7"/>
         <requires url="acs-subsite" version="5.9.0"/>
 	<requires url="richtext-xinha" version="0.2"/>
         <requires url="categories" version="1.0d3"/>
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.200.2.19 -r1.200.2.20
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	1 Oct 2016 11:04:31 -0000	1.200.2.19
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	2 Oct 2016 16:50:47 -0000	1.200.2.20
@@ -574,19 +574,19 @@
     set parent_id [[my set __including_page] parent_id]
     set url [$package_id pretty_link -absolute 1 -siteurl $siteurl -parent_id $parent_id news-item]
     if {$label eq ""} {set label "Add to [$package_id instance_name]"}
-    template::add_body_script -script [subst {
-      document.getElementById('[my id]').addEventListener('click', function (event) {
-        event.preventDefault();
-        d=document;w=window;t='';
-        if(d.selection){t=d.selection.createRange().text;}
-        else if(d.getSelection){t=d.getSelection();}
-        else if(w.getSelection){t=w.getSelection();}
-        void(open('$url?m=create-new&title='+escape(d.title)+
-                  '&detail_link='+escape(d.location.href)+'&text='+escape(t),'_blank',
-                  'scrollbars=yes,width=700,height=575,status=yes,resizable=yes,scrollbars=yes'));
-        return false;
-      }, false);
-    }]
+
+    template::add_event_listener \
+        -id [my id] \
+        -script [subst {
+          d=document;w=window;t='';
+          if(d.selection){t=d.selection.createRange().text;}
+          else if(d.getSelection){t=d.getSelection();}
+          else if(w.getSelection){t=w.getSelection();}
+          void(open('$url?m=create-new&title='+escape(d.title)+
+                    '&detail_link='+escape(d.location.href)+'&text='+escape(t),'_blank',
+                    'scrollbars=yes,width=700,height=575,status=yes,resizable=yes,scrollbars=yes'));
+        }]
+    
     return "<a id='[my id]' href='#' title='[ns_quotehtml $label]' class='rss'>[ns_quotehtml $label]</a>"
   }
 
@@ -1432,19 +1432,14 @@
       <span id='[my id]-popular_tags' style='display: none'></span><br >
     }]
 
-    template::add_body_script -script [subst {
-      document.getElementById('[my id]-edit-tags-control').addEventListener('click', function (event) {
-        event.preventDefault();
-        document.getElementById("[my id]-edit_tags").style.display="block";
-        return false;
-      });
-      document.getElementById('[my id]-popular-tags-control').addEventListener('click', function (event) {
-        event.preventDefault();
-        get_popular_tags("[ns_quotehtml $popular_tags_link]","[my id]");
-        return false;
-      });
-    }]
-    
+    template::add_event_listener \
+        -id [my id]-edit-tags-control \
+        -script [subst {document.getElementById("[my id]-edit_tags").style.display="block";}]
+
+    template::add_event_listener \
+        -id [my id]-popular-tags-control \
+        -script [subst {get_popular_tags("[ns_quotehtml $popular_tags_link]","[my id]");}]
+
     return $content
   }
 
@@ -2443,13 +2438,9 @@
       </span>
     }]
 
-    template::add_body_script -script [subst {
-      document.getElementById("$id-control").addEventListener('click', function (event) {
-        event.preventDefault();
-        document.getElementById("$id").style.display="inline";
-        return false;
-      });
-    }]
+    template::add_event_listener \
+        -id $id-control \
+        -script [subst {document.getElementById("$id").style.display="inline";}]
 
     return $inner_html$save_form
   }