Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.153.2.17 -r1.153.2.18
--- openacs-4/packages/xowiki/xowiki.info	8 Sep 2016 09:45:18 -0000	1.153.2.17
+++ openacs-4/packages/xowiki/xowiki.info	10 Sep 2016 10:11:41 -0000	1.153.2.18
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.1d11" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d11.apm">
+    <version name="5.9.1d12" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d12.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,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.1d11"/>
+        <provides url="xowiki" version="5.9.1d12"/>
         <requires url="acs-datetime" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-tcl" version="5.9.1d11"/>
@@ -64,7 +64,7 @@
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.9.0"/>
         <requires url="general-comments" version="5.9.0"/>
-        <requires url="xotcl-core" version="0.148"/>
+        <requires url="xotcl-core" version="0.150"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
Index: openacs-4/packages/xowiki/lib/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/lib/view.tcl,v
diff -u -r1.12.4.1 -r1.12.4.2
--- openacs-4/packages/xowiki/lib/view.tcl	10 Sep 2015 08:10:40 -0000	1.12.4.1
+++ openacs-4/packages/xowiki/lib/view.tcl	10 Sep 2016 10:11:41 -0000	1.12.4.2
@@ -19,7 +19,7 @@
 }
 
 set html [::$package_id invoke -method $m]
-set ::xowiki_head [::xo::Page header_stuff]
+#set ::xowiki_head [::xo::Page header_stuff]
 
 if {![info exists css]} {
     set fn [get_server_root]/packages/xowiki/www/resources/xowiki.css
Index: openacs-4/packages/xowiki/resources/templates/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -11,7 +11,17 @@
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
-<div id='wikicmds'>
+
+      <%
+         template::add_body_script -script {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+             document.getElementById('do_search').style.display = 'inline';
+             document.getElementById('do_search_q').focus(); 
+             return false;
+           });
+         }
+      %>
+      <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
       <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
       <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
@@ -20,7 +30,7 @@
       <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
       <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
       <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
-      <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
       <form action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><input id='do_search_q' name='q' type='text'><input type="hidden" name="search_package_id" value="@package_id@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
Index: openacs-4/packages/xowiki/resources/templates/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view2.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -12,7 +12,17 @@
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
-<div id='wikicmds'>
+
+      <%
+         template::add_body_script -script {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+             document.getElementById('do_search').style.display = 'inline';
+             document.getElementById('do_search_q').focus(); 
+             return false;
+           });
+         }
+      %>
+      <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
       <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
       <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
@@ -21,7 +31,7 @@
       <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
       <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
       <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
-      <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
       <form action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><input id='do_search_q' name='q' type='text'><input type="hidden" name="search_package_id" value="@package_id@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -17,7 +17,17 @@
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
-<div id='wikicmds'>
+
+      <%
+         template::add_body_script -script {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+             document.getElementById('do_search').style.display = 'inline';
+             document.getElementById('do_search_q').focus(); 
+             return false;
+           });
+         }
+      %>
+      <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
       <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
       <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
@@ -26,7 +36,7 @@
       <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
       <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
       <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
-      <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
       <form action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><input id='do_search_q' name='q' type='text'><input type="hidden" name="search_package_id" value="@package_id@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
Index: openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/resources/templates/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-default.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -8,7 +8,17 @@
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
-<div id='wikicmds'>
+
+      <%
+         template::add_body_script -script {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+             document.getElementById('do_search').style.display = 'inline';
+             document.getElementById('do_search_q').focus(); 
+             return false;
+           });
+         }
+      %>
+      <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
       <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
       <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
@@ -17,7 +27,7 @@
       <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
       <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
       <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
-      <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
       <form action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><input id='do_search_q' name='q' type='text'><input type="hidden" name="search_package_id" value="@package_id@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
Index: openacs-4/packages/xowiki/resources/templates/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-links.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,8 +1,18 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
-<div id='wikicmds'>
+
+      <%
+         template::add_body_script -script {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+             document.getElementById('do_search').style.display = 'inline';
+             document.getElementById('do_search_q').focus(); 
+             return false;
+           });
+         }
+      %>
+      <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
       <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
       <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
@@ -11,7 +21,7 @@
       <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
       <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
       <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
-      <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
       <form action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><input id='do_search_q' name='q' type='text'><input type="hidden" name="search_package_id" value="@package_id@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
Index: openacs-4/packages/xowiki/resources/templates/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	10 Sep 2016 10:11:41 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 11:57:20 CEST 2016 -->
 <!-- The following DIV is needed for overlib to function! -->
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -r1.45.2.2 -r1.45.2.3
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	16 Jun 2016 09:36:47 -0000	1.45.2.2
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	10 Sep 2016 10:11:41 -0000	1.45.2.3
@@ -33,7 +33,17 @@
 
   ADP_Generator instproc wikicmds_part {} {
     if {![my wikicmds]} {return ""}
-    return {<div id='wikicmds'>
+    return {
+      <%
+         template::add_body_script -script {
+           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function () {
+             document.getElementById('do_search').style.display = 'inline';
+             document.getElementById('do_search_q').focus(); 
+             return false;
+           });
+         }
+      %>
+      <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
       <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
       <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
@@ -42,7 +52,7 @@
       <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
       <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
       <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
-      <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
       <form action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><input id='do_search_q' name='q' type='text'><input type="hidden" name="search_package_id" value="@package_id@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
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 -r1.200.2.12 -r1.200.2.13
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	5 Jun 2016 12:45:53 -0000	1.200.2.12
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	10 Sep 2016 10:11:41 -0000	1.200.2.13
@@ -39,6 +39,7 @@
       ::xo::Page requireCSS "/resources/ajaxhelper/yui/$path"
     } else {
       ::xo::Page requireCSS "//yui.yahooapis.com/$version/build/$path"
+      security::csp::require style-src yui.yahooapis.com
     }
   }
 
@@ -47,6 +48,7 @@
       ::xo::Page requireJS "/resources/ajaxhelper/yui/$path"
     } else {
       ::xo::Page requireJS "//yui.yahooapis.com/$version/build/$path"
+      security::csp::require script-src yui.yahooapis.com
     }
   }    
   
@@ -1402,8 +1404,8 @@
     set save_tag_link [$package_id make_link -link $p_link $__including_page \
                            save-tags return_url]
     set popular_tags_link [$package_id make_link -link $p_link $__including_page \
-                               popular-tags return_url weblog_page]
-
+                               popular-tags]
+    
     set tags [lsort [::xowiki::Page get_tags -user_id [::xo::cc user_id] \
                          -item_id [$__including_page item_id] -package_id $package_id]]
     set entries [list]
@@ -1414,16 +1416,30 @@
     }
     set tags_with_links [join [lsort $entries] {, }]
 
-    if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]}
-    set content [subst -nobackslashes {
+    if {![my exists id]} {
+      my set id [::xowiki::Includelet html_id [self]]
+    }
+    set content [subst {
       #xowiki.your_tags_label#: $tags_with_links
-      (<a href='#' onclick='document.getElementById("[my id]-edit_tags").style.display="block";return false;'>#xowiki.edit_link#</a>,
-       <a href='#' onclick='get_popular_tags("[ns_quotehtml $popular_tags_link]","[my id]");return false;'>#xowiki.popular_tags_link#</a>)
+      (<a id='[my id]-edit-tags-control' href='#'>#xowiki.edit_link#</a>,
+       <a id='[my id]-popular-tags-control' href='#'>#xowiki.popular_tags_link#</a>)
       <form id='[my id]-edit_tags' style='display: none' action="[ns_quotehtml $save_tag_link]" method='POST'>
-      <div><INPUT name='new_tags' type='text' value="[ns_quotehtml $tags]"></div>
+      <div><input name='new_tags' type='text' value="[ns_quotehtml $tags]"></div>
       </form>
       <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 () {
+        document.getElementById("[my id]-edit_tags").style.display="block";
+        return false;
+      });
+      document.getElementById('[my id]-popular-tags-control').addEventListener('click', function () {
+        get_popular_tags("[ns_quotehtml $popular_tags_link]","[my id]");
+        return false;
+      });
+    }]
+    
     return $content
   }
 
@@ -1492,9 +1508,11 @@
     my instvar __including_page
     set item_id [$__including_page item_id] 
     set gc_return_url [$package_id url]
+    #
     # Even, if general_comments is turned on, don't offer the
     # link to add comments, unless the user is logged in.
     # Otherwise, this attracts spammers and search bots
+    #
     if {[::xo::cc user_id] != 0} {
       set gc_link [general_comments_create_link \
                        -object_name [$__including_page title] \
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.327.2.21 -r1.327.2.22
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	16 Jun 2016 09:36:47 -0000	1.327.2.21
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	10 Sep 2016 10:11:41 -0000	1.327.2.22
@@ -1193,7 +1193,8 @@
              -groupby "tag" \
              -orderby "nr" \
              -limit $limit] {
-               lappend entries "<a href='[ns_quotehtml $href&ptag=[ad_urlencode $tag]]'>[ns_quotehtml $tag ($nr)]</a>"
+               set label [ns_quotehtml "$tag ($nr)"]
+               lappend entries "<a href='[ns_quotehtml $href&ptag=[ad_urlencode $tag]]'>$label</a>"
              }
     ns_return 200 text/html "[_ xowiki.popular_tags_label]: [join $entries {, }]"
   }
@@ -1220,7 +1221,7 @@
       }
     }
     #my show_fields $form_fields
-    lassign  [my get_form_data -field_names $query_field_names $form_fields] validation_erors category_ids
+    lassign [my get_form_data -field_names $query_field_names $form_fields] validation_erors category_ids
 
     if {$validation_errors == 0} {
       #
@@ -1559,7 +1560,7 @@
       #
       ::xo::Page requireCSS /resources/xowiki/xowiki.css
       if {$footer ne ""} {
-        ::xo::Page requireJS {
+        template::add_body_script -script {
           function get_popular_tags(popular_tags_link, prefix) {
             var http = getHttpObject();
             http.open('GET', popular_tags_link, true);
@@ -1579,6 +1580,7 @@
         }
       }
       set header_stuff [::xo::Page header_stuff]
+      #ns_log notice "=== HEADER STUFF <$header_stuff>"
       if {![my exists description]} {my set description [my get_description $content]}
 
       if {[info commands ::template::head::add_meta] ne ""} {