Index: openacs-4/packages/xowiki/resources/templates/view-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-page.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/resources/templates/view-page.adp	7 Aug 2017 23:48:30 -0000	1.2
@@ -0,0 +1,34 @@
+<%
+  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);
+  }
+%>
+
+<div>
+  <div style='top: -30px ! important; margin-bottom: 25px ! important;' id='wikicmds'>
+    <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>
+      <if @new_link@ not nil><a href="@new_link@" accesskey='n' title='#xowiki.new_title#'>#xowiki.new_page#</a> &middot; </if>
+      <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;
+      <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>
+      </div>
+    </div>
+  </div>
+<!--  @top_includelets;noquote@ -->
+  <if @page_title@ not nil>
+    <h2>@page_title@</h2>
+  </if>
+@content;noquote@
+</div>