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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	14 Sep 2016 10:22:11 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -13,13 +13,10 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
-             event.preventDefault();
-             document.getElementById('do_search').style.display = 'inline';
-             document.getElementById('do_search_q').focus(); 
-           }, false);
-         }
+         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+            document.getElementById('do_search').style.display = 'inline';
+            document.getElementById('do_search_q').focus();
+          }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
@@ -29,8 +26,8 @@
       <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
       <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='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a>&middot; </if>
+      <if @::xowiki::search_mounted_p@ true><a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot; </if>
       <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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -14,13 +14,10 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
-             event.preventDefault();
-             document.getElementById('do_search').style.display = 'inline';
-             document.getElementById('do_search_q').focus(); 
-           }, false);
-         }
+         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+            document.getElementById('do_search').style.display = 'inline';
+            document.getElementById('do_search_q').focus();
+          }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
@@ -30,8 +27,8 @@
       <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
       <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='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a>&middot; </if>
+      <if @::xowiki::search_mounted_p@ true><a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot; </if>
       <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-bootstrap3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	14 Sep 2016 10:22:12 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	6 Oct 2016 09:24:47 -0000	1.1.2.4
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -24,13 +24,10 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
-             event.preventDefault();
-             document.getElementById('do_search').style.display = 'inline';
-             document.getElementById('do_search_q').focus(); 
-           }, false);
-         }
+         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+            document.getElementById('do_search').style.display = 'inline';
+            document.getElementById('do_search_q').focus();
+          }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
@@ -40,8 +37,8 @@
       <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
       <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='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a>&middot; </if>
+      <if @::xowiki::search_mounted_p@ true><a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot; </if>
       <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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -19,13 +19,10 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
-             event.preventDefault();
-             document.getElementById('do_search').style.display = 'inline';
-             document.getElementById('do_search_q').focus(); 
-           }, false);
-         }
+         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+            document.getElementById('do_search').style.display = 'inline';
+            document.getElementById('do_search_q').focus();
+          }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
@@ -35,8 +32,8 @@
       <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
       <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='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a>&middot; </if>
+      <if @::xowiki::search_mounted_p@ true><a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot; </if>
       <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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -13,18 +13,10 @@
 
 <%
 if {$book_prev_link ne ""} {
-    template::add_body_script -script {
-      document.getElementById('bookNavPrev.a').addEventListener('click', function () {
-        TocTree.getPage("$book_prev_link")
-      }, false);
-    }
+  template::add_event_listener  -id bookNavPrev.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_prev_link");}]
 }
 if {$book_next_link ne ""} {
-    template::add_body_script -script {
-      document.getElementById('bookNavNext.a').addEventListener('click', function () {
-        TocTree.getPage("$book_next_link")
-      }, false);
-    }
+  template::add_event_listener  -id bookNavNext.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_next_link");}]
 }
 %>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -13,18 +13,10 @@
 
 <%
 if {$book_prev_link ne ""} {
-    template::add_body_script -script {
-      document.getElementById('bookNavPrev.a').addEventListener('click', function () {
-        TocTree.getPage("$book_prev_link")
-      }, false);
-    }
+  template::add_event_listener  -id bookNavPrev.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_prev_link");}]
 }
 if {$book_next_link ne ""} {
-    template::add_body_script -script {
-      document.getElementById('bookNavNext.a').addEventListener('click', function () {
-        TocTree.getPage("$book_next_link")
-      }, false);
-    }
+  template::add_event_listener  -id bookNavNext.a  -prevent_preventdefault=false  -script [subst {TocTree.getPage("$book_next_link");}]
 }
 %>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -10,13 +10,10 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
-             event.preventDefault();
-             document.getElementById('do_search').style.display = 'inline';
-             document.getElementById('do_search_q').focus(); 
-           }, false);
-         }
+         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+            document.getElementById('do_search').style.display = 'inline';
+            document.getElementById('do_search_q').focus();
+          }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
@@ -26,8 +23,8 @@
       <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
       <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='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a>&middot; </if>
+      <if @::xowiki::search_mounted_p@ true><a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot; </if>
       <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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,16 +1,13 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 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'>
 
       <%
-         template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
-             event.preventDefault();
-             document.getElementById('do_search').style.display = 'inline';
-             document.getElementById('do_search_q').focus(); 
-           }, false);
-         }
+         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+            document.getElementById('do_search').style.display = 'inline';
+            document.getElementById('do_search_q').focus();
+          }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
@@ -20,8 +17,8 @@
       <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
       <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='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a>&middot; </if>
+      <if @::xowiki::search_mounted_p@ true><a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot; </if>
       <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.6 -r1.1.2.7
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	6 Oct 2016 09:24:47 -0000	1.1.2.7
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Oct 06 11:18:29 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.6 -r1.45.2.7
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	14 Sep 2016 10:22:12 -0000	1.45.2.6
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	6 Oct 2016 09:24:47 -0000	1.45.2.7
@@ -35,13 +35,12 @@
     if {![my wikicmds]} {return ""}
     return {
       <%
-         template::add_body_script -script {
-           document.getElementById('wiki-menu-do-search-control').addEventListener('click', function (event) {
-             event.preventDefault();
-             document.getElementById('do_search').style.display = 'inline';
-             document.getElementById('do_search_q').focus(); 
-           }, false);
-         }
+         template::add_event_listener \
+          -id wiki-menu-do-search-control \
+          -script {
+            document.getElementById('do_search').style.display = 'inline';
+            document.getElementById('do_search_q').focus();
+          }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
@@ -51,8 +50,8 @@
       <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
       <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='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a>&middot; </if>
+      <if @::xowiki::search_mounted_p@ true><a href='#' id='wiki-menu-do-search-control' title='#xowiki.search_title#'>#xowiki.search#</a> &middot; </if>
       <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>
@@ -371,22 +370,19 @@
         #::xo::cc set_parameter weblog_page weblog-portlet
       } \
       -proc content_part {} {
-        return [subst -novariables -nobackslashes \
-                    {
+        return {
 <%
 if {$book_prev_link ne ""} {
-    template::add_body_script -script {
-      document.getElementById('bookNavPrev.a').addEventListener('click', function () {
-        TocTree.getPage("$book_prev_link")
-      }, false);
-    }
+  template::add_event_listener \
+      -id bookNavPrev.a \
+      -prevent_preventdefault=false \
+      -script [subst {TocTree.getPage("$book_prev_link");}]
 }
 if {$book_next_link ne ""} {
-    template::add_body_script -script {
-      document.getElementById('bookNavNext.a').addEventListener('click', function () {
-        TocTree.getPage("$book_next_link")
-      }, false);
-    }
+  template::add_event_listener \
+      -id bookNavNext.a \
+      -prevent_preventdefault=false \
+      -script [subst {TocTree.getPage("$book_next_link");}]
 }
 %>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
@@ -451,7 +447,7 @@
                       &="top_includelets" &="folderhtml" &="page" &="doc" &="body">
                       </div>
                       </div>
-                    }]}
+                    }}
 
   ####################################################################################
   #
Index: openacs-4/packages/xowiki/tcl/xowiki-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-init.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/tcl/xowiki-init.tcl	27 Nov 2015 13:24:37 -0000	1.1.2.3
+++ openacs-4/packages/xowiki/tcl/xowiki-init.tcl	6 Oct 2016 09:24:47 -0000	1.1.2.4
@@ -11,6 +11,32 @@
     nsv_unset xowiki must_update_hkeys
 }
 
+set ::xowiki::search_mounted_p 1
+set search_driver [parameter::get -package_id [apm_package_id_from_key search] \
+                       -parameter FtsEngineDriver]
+
+#
+# Check, if search is configured. If not, we do not want to offer
+# e.g. a search link.
+#
+# For the time being, the check is just for xowiki, but in general, we
+# might want to have more global option, which allows to check for
+# example, if search is available for a certain subsite (when search
+# is subsite aware).
+#
+if { [site_node::get_package_url -package_key search] eq "" } { 
+  ns_log Warning "xowiki: Search package is not mounted."
+  set ::xowiki::search_mounted_p 0
+} elseif { $search_driver eq ""} {
+  ns_log Warning "xowiki: FtsEngineDriver parameter in package search is empty."
+  set ::xowiki::search_mounted_p 0
+} elseif { [apm_package_id_from_key $search_driver] == 0} { 
+  ns_log Warning "xowiki Search driver $search_driver is not installed."
+  set ::xowiki::search_mounted_p 0
+} else {
+  ::xowiki::search_mounted_p 1
+}
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 2