Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/view-book.adp	5 Jan 2007 12:11:02 -0000	1.4
+++ openacs-4/packages/xowiki/www/view-book.adp	7 Jan 2007 21:52:38 -0000	1.5
@@ -28,21 +28,6 @@
   <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 
-<div 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#</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>
-<span id='do_search' style='display: none'> 
-  <FORM action='/search/search'><INPUT  id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" /></FORM> 
-</span>
-</div>
-
 <div style="float:left; width: 25%; font-size: .8em;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
@@ -58,36 +43,49 @@
    <tr>
    <td width='20'>
    <if @book_prev_link@ not nil>
-        <a href="@book_prev_link@" accesskey='p'>
-        <img border='0' alt='Previous' src='/resources/xowiki/previous.png' width='15px'></a>
+        <a href="@book_prev_link@" accesskey='p' ID="bookNavPrev.a" onclick='return TocTree.getPage("@book_prev_link@");'>
+        <img border='0' alt='Previous' src='/resources/xowiki/previous.png' width='15px' ID="bookNavPrev.img"></a>
     </if>
-    <else><img border='0' alt='No Previous' src='/resources/xowiki/previous-end.png' width='15px'></else>
+    <else>
+        <a href="" accesskey='p' ID="bookNavPrev.a" onclick="">
+        <img border='0' alt='No Previous' src='/resources/xowiki/previous-end.png' width='15px' ID="bookNavPrev.img"></a>
+    </else>
      </td>
 
    <td>
    <if @book_relpos@ not nil>
      <table style='display: inline; text-align: center;'>
-     <tr><td width='450px' style='font-size: 75%'><div style='top: 0px; height: 2px; background-color: #859db8; width: @book_relpos@;'></div>@book_relpos@</td></tr>
+     <tr><td width='450px' style='font-size: 75%'><div style='width: @book_relpos@;' ID='bookNavBar'></div><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
      </table>
    </if>
    </td>
 
-   <td width='20'>
+   <td width='20' ID="bookNavNext">
    <if @book_next_link@ not nil>
-        <a href="@book_next_link@" accesskey='n'>
-        <img border='0' alt='Next' src='/resources/xowiki/next.png' width='15px'></a>
+        <a href="@book_next_link@" accesskey='n' ID="bookNavNext.a" onclick='return TocTree.getPage("@book_next_link@");'>
+        <img border='0' alt='Next' src='/resources/xowiki/next.png' width='15px' ID="bookNavNext.img"></a>
    </if>
-    <else><img border='0' alt='No Next' src='/resources/xowiki/next-end.png' width='15px'></else>
+    <else>
+        <a href="" accesskey='n' ID="bookNavNext.a" onclick="">
+       <img border='0' alt='No Next' src='/resources/xowiki/next-end.png' width='15px' ID="bookNavNext.img"></a>
+    </else>
    </td>
    </tr>
 </table>
 </div>
-<if @page_title@ not nil>
-@page_title;noquote@
 </if>
-</if>
 
-@content;noquote@
+<div id='book-page'>
+<include src="view-page" &="package_id"
+      &="references" &="name" &="title" &="item_id" &="page" &="context" &="header_stuff" &="return_url" 
+      &="content" &="references" &="lang_links" &="package_id" 
+      &="rev_link" &="edit_link" &="delete_link" &="new_link" &="admin_link" &="index_link" 
+      &="tags" &="no_tags" &="tags_with_links" &="save_tag_link" &="popular_tags_link" 
+      &="per_object_categories_with_links" 
+      &="digg_link" &="delicious_link" &="my_yahoo_link" 
+      &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image" 
+      &="top_portlets" &="page">
+</div>
 
 </div>
 <div style="clear: both; text-align: left; font-size: 85%;">