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 -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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,10 +13,12 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+      if {$::::xowiki::search_mounted_p} {
+        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>
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 -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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,10 +14,12 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+      if {$::::xowiki::search_mounted_p} {
+        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>
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 -N -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	9 Oct 2016 08:47:29 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	11 Oct 2016 10:35:07 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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,10 +24,12 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+      if {$::::xowiki::search_mounted_p} {
+        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>
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 -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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,10 +19,12 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+      if {$::::xowiki::search_mounted_p} {
+        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>
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 -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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 -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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 -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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,10 +10,12 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+      if {$::::xowiki::search_mounted_p} {
+        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>
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 -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,13 +1,15 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 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_event_listener  -id wiki-menu-do-search-control  -script {
+      if {$::::xowiki::search_mounted_p} {
+        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>