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>