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.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	14 Sep 2016 10:22:11 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -18,8 +18,7 @@
              event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
-             return false;
-           });
+           }, false);
          }
       %>
       <div id='wikicmds'>
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.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 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,8 +19,7 @@
              event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
-             return false;
-           });
+           }, false);
          }
       %>
       <div id='wikicmds'>
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap.adp,v
diff -u -N
--- openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@
-<master>
-    <property name="doc(title)">@title;literal@</property>
-    <property name="context">@context;literal@</property>
-    <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-    <property name="&body">property_body</property>
-    <property name="&doc">property_doc</property>
-    <property name="head">
-                  
-        <style type='text/css'>
-            blockquote {font-size:inherit;}
-            div.xowiki-content {font-size:14px;}
-            div.xowiki-content h1,h2,h3 {margin-bottom:10px;margin-top:20px;}
-            div.xowiki-content h1 {border-bottom: none;color:font-weight:500;color:#cf8a00 !important;}
-            div.xowiki-content h2 {border-bottom: none;color:font-weight:500;}
-            div.xowiki-content h3 {font-weight:500;}
-            div.xowiki-content pre, div.code {font-size:100%;}
-            div.xowiki-content .item-footer {border-top:none;}
-        </style>
-        <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
-        <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
-        <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
-        @header_stuff;literal@
-    </property>
-    
-    <!-- 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'>
-          <if @view_link@ not nil><a href="@view_link;noi18n@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
-          <if @edit_link@ not nil><a href="@edit_link;noi18n@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
-          <if @rev_link@ not nil><a href="@rev_link;noi18n@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
-          <if @new_link@ not nil><a href="@new_link;noi18n@" accesskey='n' title='#xowiki.new_title#'>#xowiki.new_page#</a> &middot; </if>
-          <if @delete_link@ not nil><a href="@delete_link;noi18n@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
-          <if @admin_link@ not nil><a href="@admin_link;noi18n@" 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;noi18n@" 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;
-          <if @index_link@ not nil><a href="@index_link;noi18n@" 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;literal@" ></div></form>
-          </div>
-    </div>
- 
-    <div class="row"> 
-
-        <div class="col-md-9 col-sm-8 col-xs-12 col-md-push-3 col-sm-push-4"> <!-- content -->
-            @top_includelets;noquote@
-            <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
-            <else><h1>@title@</h1></else>
-            <if @folderhtml@ not nil> 
-                <div class='folders' style=''>@folderhtml;noquote@</div> 
-                <div class='content-with-folders'>@content;noquote@</div> 
-            </if>
-            <else>@content;noquote@</else>
-        </div> <!-- content -->
-
-        <div class="col-md-3 col-sm-4 col-xs-12 home-left col-md-pull-9 col-sm-pull-8" style="font-size:small;"> <!-- left panel in full view -->
-            <div class="thumbnail">
-                <div class="caption">
-                    <include src="/packages/xowiki/www/portlets/weblog-mini-calendar" &__including_page=page summary="0" noparens="0">
-                </div>
-            </div>
-            <div class="thumbnail">
-                <div class="caption">
-                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="tags -decoration plain">
-                </div>
-            </div>
-            <div class="thumbnail">
-                <div class="caption">
-                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="tags -popular 1 -limit 30 -decoration plain">
-                </div>
-            </div>
-            <div class="thumbnail">
-                <div class="caption">
-                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="presence -interval {30 minutes} -decoration plain">
-                    <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
-                </div>
-            </div> <!-- background -->
-
-            <div class="thumbnail">
-                <div class="caption">
-                    <include src="/packages/xowiki/www/portlets/include" &__including_page=page portlet="categories -open_page [list @name@] -decoration plain">
-                </div>
-            </div>  <!-- background -->
-        </div>
-    </div>
-    
-    <div class="row">
-        <div class="col-xs-12">
-            <hr>        
-            @footer;noquote@
-        </div>
-    </div>
-
-</div> <!-- /xowiki-content -->
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.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	10 Sep 2016 18:18:54 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3-bootstrap3.adp	14 Sep 2016 10:22:12 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -29,8 +29,7 @@
              event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
-             return false;
-           });
+           }, false);
          }
       %>
       <div id='wikicmds'>
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.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 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,8 +24,7 @@
              event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
-             return false;
-           });
+           }, false);
          }
       %>
       <div id='wikicmds'>
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.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 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,7 +10,23 @@
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
 
-<div style="float:left; width: 25%; font-size: .8em;
+
+<%
+if {$book_prev_link ne ""} {
+    template::add_body_script -script {
+      document.getElementById('bookNavPrev.a').addEventListener('click', function () {
+        TocTree.getPage("$book_prev_link")
+      }, false);
+    }
+}
+if {$book_next_link ne ""} {
+    template::add_body_script -script {
+      document.getElementById('bookNavNext.a').addEventListener('click', function () {
+        TocTree.getPage("$book_next_link")
+      }, false);
+    }
+}
+%>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
@@ -27,11 +43,11 @@
                       <tr>
                       <td>
                       <if @book_prev_link@ not nil>
-                      <a href="@book_prev_link@" accesskey='p' ID="bookNavPrev.a" onclick='return TocTree.getPage("@book_prev_link@");'>
+                      <a href="@book_prev_link@" accesskey='p' ID="bookNavPrev.a">
                       <img alt='Previous' src='/resources/xowiki/previous.png' width='15' ID="bookNavPrev.img"></a>
                       </if>
                       <else>
-                      <a href="" accesskey='p' ID="bookNavPrev.a" onclick="">
+                      <a href="" accesskey='p' ID="bookNavPrev.a">
                       <img alt='No Previous' src='/resources/xowiki/previous-end.png' width='15' ID="bookNavPrev.img"></a>
                       </else>
                       </td>
@@ -48,11 +64,11 @@
 
                       <td ID="bookNavNext">
                       <if @book_next_link@ not nil>
-                      <a href="@book_next_link@" accesskey='n' ID="bookNavNext.a" onclick='return TocTree.getPage("@book_next_link@");'>
+                      <a href="@book_next_link@" accesskey='n' ID="bookNavNext.a">
                       <img alt='Next' src='/resources/xowiki/next.png' width='15' ID="bookNavNext.img"></a>
                       </if>
                       <else>
-                      <a href="" accesskey='n' ID="bookNavNext.a" onclick="">
+                      <a href="" accesskey='n' ID="bookNavNext.a">
                       <img alt='No Next' src='/resources/xowiki/next-end.png' width='15' ID="bookNavNext.img"></a>
                       </else>
                       </td>
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.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 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,7 +10,23 @@
           <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>    
           <div class='xowiki-content'>
 
-<div style="float:left; width: 25%; font-size: .8em;
+
+<%
+if {$book_prev_link ne ""} {
+    template::add_body_script -script {
+      document.getElementById('bookNavPrev.a').addEventListener('click', function () {
+        TocTree.getPage("$book_prev_link")
+      }, false);
+    }
+}
+if {$book_next_link ne ""} {
+    template::add_body_script -script {
+      document.getElementById('bookNavNext.a').addEventListener('click', function () {
+        TocTree.getPage("$book_next_link")
+      }, false);
+    }
+}
+%>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
@@ -27,11 +43,11 @@
                       <tr>
                       <td>
                       <if @book_prev_link@ not nil>
-                      <a href="@book_prev_link@" accesskey='p' ID="bookNavPrev.a" onclick='return TocTree.getPage("@book_prev_link@");'>
+                      <a href="@book_prev_link@" accesskey='p' ID="bookNavPrev.a">
                       <img alt='Previous' src='/resources/xowiki/previous.png' width='15' ID="bookNavPrev.img"></a>
                       </if>
                       <else>
-                      <a href="" accesskey='p' ID="bookNavPrev.a" onclick="">
+                      <a href="" accesskey='p' ID="bookNavPrev.a">
                       <img alt='No Previous' src='/resources/xowiki/previous-end.png' width='15' ID="bookNavPrev.img"></a>
                       </else>
                       </td>
@@ -48,11 +64,11 @@
 
                       <td ID="bookNavNext">
                       <if @book_next_link@ not nil>
-                      <a href="@book_next_link@" accesskey='n' ID="bookNavNext.a" onclick='return TocTree.getPage("@book_next_link@");'>
+                      <a href="@book_next_link@" accesskey='n' ID="bookNavNext.a">
                       <img alt='Next' src='/resources/xowiki/next.png' width='15' ID="bookNavNext.img"></a>
                       </if>
                       <else>
-                      <a href="" accesskey='n' ID="bookNavNext.a" onclick="">
+                      <a href="" accesskey='n' ID="bookNavNext.a">
                       <img alt='No Next' src='/resources/xowiki/next-end.png' width='15' ID="bookNavNext.img"></a>
                       </else>
                       </td>
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.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -15,8 +15,7 @@
              event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
-             return false;
-           });
+           }, false);
          }
       %>
       <div id='wikicmds'>
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.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 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'>
@@ -9,8 +9,7 @@
              event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
-             return false;
-           });
+           }, false);
          }
       %>
       <div id='wikicmds'>
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 -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-page.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-page.adp	14 Sep 2016 10:22:12 -0000	1.1.2.2
@@ -1,25 +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>
-<!--
-<fieldset class='box'>
-<legend  style='position: inherit ! important; margin: auto ! important; display: block! important; text-align: right ! important;' id='wikicmds'>
--->
-<div style='top: -00px ! important; margin-bottom: 25px ! important;' id='wikicmds'>
-  <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
-  <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' >#xotcl-core.revisions#</a> &middot; </if>
-  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new_page#</a> &middot; </if>
-  <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
-  <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
-  <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
-    <a href="@notification_subscribe_link@">@notification_image;noquote@</a> &middot; </if>
-  <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'>#xowiki.search#</a> &middot;
-  <if @index_link@ not nil><a href="@index_link@" accesskey='i'>#xowiki.index#</a></if>
-<div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><div><INPUT  id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
-</div>
-</div> <!-- </legend> -->
-@top_includelets;noquote@
-<if @page_title@ not nil>
-<h2>@page_title@</h2>
-</if>
+  <div style='top: -00px ! 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>
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 -N -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	10 Sep 2016 18:18:54 -0000	1.1.2.5
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	14 Sep 2016 10:22:12 -0000	1.1.2.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Sep 10 20:17:26 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Wed Sep 14 12:17:32 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 -N -r1.45.2.5 -r1.45.2.6
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	11 Sep 2016 01:04:24 -0000	1.45.2.5
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	14 Sep 2016 10:22:12 -0000	1.45.2.6
@@ -40,8 +40,7 @@
              event.preventDefault();
              document.getElementById('do_search').style.display = 'inline';
              document.getElementById('do_search_q').focus(); 
-             return false;
-           });
+           }, false);
          }
       %>
       <div id='wikicmds'>
@@ -373,7 +372,23 @@
       } \
       -proc content_part {} {
         return [subst -novariables -nobackslashes \
-                    {<div style="float:left; width: 25%; font-size: .8em;
+                    {
+<%
+if {$book_prev_link ne ""} {
+    template::add_body_script -script {
+      document.getElementById('bookNavPrev.a').addEventListener('click', function () {
+        TocTree.getPage("$book_prev_link")
+      }, false);
+    }
+}
+if {$book_next_link ne ""} {
+    template::add_body_script -script {
+      document.getElementById('bookNavNext.a').addEventListener('click', function () {
+        TocTree.getPage("$book_next_link")
+      }, false);
+    }
+}
+%>                      <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
@@ -390,11 +405,11 @@
                       <tr>
                       <td>
                       <if @book_prev_link@ not nil>
-                      <a href="@book_prev_link@" accesskey='p' ID="bookNavPrev.a" onclick='return TocTree.getPage("@book_prev_link@");'>
+                      <a href="@book_prev_link@" accesskey='p' ID="bookNavPrev.a">
                       <img alt='Previous' src='/resources/xowiki/previous.png' width='15' ID="bookNavPrev.img"></a>
                       </if>
                       <else>
-                      <a href="" accesskey='p' ID="bookNavPrev.a" onclick="">
+                      <a href="" accesskey='p' ID="bookNavPrev.a">
                       <img alt='No Previous' src='/resources/xowiki/previous-end.png' width='15' ID="bookNavPrev.img"></a>
                       </else>
                       </td>
@@ -411,11 +426,11 @@
 
                       <td ID="bookNavNext">
                       <if @book_next_link@ not nil>
-                      <a href="@book_next_link@" accesskey='n' ID="bookNavNext.a" onclick='return TocTree.getPage("@book_next_link@");'>
+                      <a href="@book_next_link@" accesskey='n' ID="bookNavNext.a">
                       <img alt='Next' src='/resources/xowiki/next.png' width='15' ID="bookNavNext.img"></a>
                       </if>
                       <else>
-                      <a href="" accesskey='n' ID="bookNavNext.a" onclick="">
+                      <a href="" accesskey='n' ID="bookNavNext.a">
                       <img alt='No Next' src='/resources/xowiki/next-end.png' width='15' ID="bookNavNext.img"></a>
                       </else>
                       </td>