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.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>