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.17 -r1.18
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	8 Jan 2008 16:22:05 -0000	1.17
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	1 Mar 2008 16:25:50 -0000	1.18
@@ -272,4 +272,90 @@
      }
 
 
-}
+
+  #
+  # view-book, wiki cmds in rhs
+  #
+  ADP_Generator create view-book -master 1 -footer 1  -wikicmds 0 \
+    -extra_header_stuff {
+    } \
+    -proc before_render {page} {
+      #::xo::cc set_parameter weblog_page weblog-portlet
+    } \
+    -proc content_part {} {
+       return [subst -novariables -nobackslashes \
+{<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;			    
+">
+<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+@toc;noquote@
+</div></div>
+<div style="float:right; width: 70%;">@top_includelets;noquote@
+
+<if @book_prev_link@ not nil or @book_relpos@ not nil or @book_next_link@ not nil>
+<div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9;  width: 500px;">
+<table width='100%'>
+   <tr>
+   <td width='20'>
+   <if @book_prev_link@ not nil>
+        <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>
+        <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='width: @book_relpos@;' ID='bookNavBar'></div><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
+     </table>
+   </if>
+   </td>
+
+   <td width='20' 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@");'>
+        <img border='0' alt='Next' src='/resources/xowiki/next.png' width='15px' ID="bookNavNext.img"></a>
+   </if>
+    <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>
+
+<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_includelets" &="page">
+</div>
+</div>
+}]}
+
+
+  #
+  # view-book-no-ajax, adp identical to view-book.
+  #
+  ADP_Generator create view-book-no-ajax -master 1 -footer 1 -wikicmds 0 \
+    -extra_header_stuff {
+    } \
+    -proc before_render {page} {
+      #::xo::cc set_parameter weblog_page weblog-portlet
+    } \
+    -proc content_part {} {
+      return [view-book content_part]
+    }
+}
\ No newline at end of file
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book-no-ajax.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	1 Mar 2008 16:25:51 -0000	1.1
@@ -0,0 +1,118 @@
+<!-- Generated by ::xowiki::ADP_Generator on Sat Mar 01 17:21:20 CET 2008 -->
+<master>
+  <property name="title">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="&body">property_body</property>
+  <property name="&doc">property_doc</property>
+  <property name="header_stuff">
+  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
+  @header_stuff;noquote@
+    
+  <script type="text/javascript">
+function get_popular_tags(popular_tags_link, prefix) {
+  var http = getHttpObject();
+  http.open('GET', popular_tags_link, true);
+  http.onreadystatechange = function() {
+    if (http.readyState == 4) {
+      if (http.status != 200) {
+	alert('Something wrong in HTTP request, status code = ' + http.status);
+      } else {
+       var e = document.getElementById(prefix + '-popular_tags');
+       e.innerHTML = http.responseText;
+       e.style.display = 'block';
+      }
+    }
+  };
+  http.send(null);
+}
+</script>
+  </property>
+  <property name="head">
+  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
+  @header_stuff;noquote@
+    
+  <script type="text/javascript">
+function get_popular_tags(popular_tags_link, prefix) {
+  var http = getHttpObject();
+  http.open('GET', popular_tags_link, true);
+  http.onreadystatechange = function() {
+    if (http.readyState == 4) {
+      if (http.status != 200) {
+	alert('Something wrong in HTTP request, status code = ' + http.status);
+      } else {
+       var e = document.getElementById(prefix + '-popular_tags');
+       e.innerHTML = http.responseText;
+       e.style.display = 'block';
+      }
+    }
+  };
+  http.send(null);
+}
+</script>
+  </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 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;			    
+">
+<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+@toc;noquote@
+</div></div>
+<div style="float:right; width: 70%;">@top_includelets;noquote@
+
+<if @book_prev_link@ not nil or @book_relpos@ not nil or @book_next_link@ not nil>
+<div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9;  width: 500px;">
+<table width='100%'>
+   <tr>
+   <td width='20'>
+   <if @book_prev_link@ not nil>
+        <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>
+        <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='width: @book_relpos@;' ID='bookNavBar'></div><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
+     </table>
+   </if>
+   </td>
+
+   <td width='20' 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@");'>
+        <img border='0' alt='Next' src='/resources/xowiki/next.png' width='15px' ID="bookNavNext.img"></a>
+   </if>
+    <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>
+
+<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_includelets" &="page">
+</div>
+</div>
+
+@footer;noquote@
+</div> <!-- class='xowiki-content' -->
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book-no-ajax.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.tcl	1 Mar 2008 16:25:51 -0000	1.1
@@ -0,0 +1,21 @@
+set title [[$package_id folder_id] title]
+set toc   [$page include [list toc -ajax 0 -open_page $name -decoration plain -remove_levels 1]]
+set i     [$page set __last_includelet]
+#my log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
+
+# prevent recursive books
+if {$i ne "" && ![$page exists __is_book_page]} {
+  set p     [$i position]
+  set count [$i count]
+
+  if {$count > 0} {
+    set book_relpos [format %.2f%% [expr {100.0 * $p / $count}]]
+    if {$p>1}      {set book_prev_link [$package_id pretty_link [$i page_name [expr {$p - 1}]]]}
+    if {$p<$count} {set book_next_link [$package_id pretty_link [$i page_name [expr {$p + 1}]]]}
+    set page_title "<h2>[$i current] $title</h2>"
+  } else {
+    set book_relpos 0.0%
+    set page_title "<h2>$title</h2>"    
+  }
+}
+set header_stuff [::xo::Page header_stuff]
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 -N -r1.11 -r1.12
--- openacs-4/packages/xowiki/www/view-book.adp	13 Nov 2007 11:36:12 -0000	1.11
+++ openacs-4/packages/xowiki/www/view-book.adp	1 Mar 2008 16:25:51 -0000	1.12
@@ -1,11 +1,14 @@
+<!-- Generated by ::xowiki::ADP_Generator on Sat Mar 01 17:21:20 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <property name="header_stuff">@header_stuff;noquote@
-<link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all'/>
-<script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
-<link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
-<script type="text/javascript">
+  <property name="&body">property_body</property>
+  <property name="&doc">property_doc</property>
+  <property name="header_stuff">
+  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
+  @header_stuff;noquote@
+    
+  <script type="text/javascript">
 function get_popular_tags(popular_tags_link, prefix) {
   var http = getHttpObject();
   http.open('GET', popular_tags_link, true);
@@ -23,12 +26,34 @@
   http.send(null);
 }
 </script>
-</property>
-  
-  <!-- The following DIV is needed for overlib to function! -->
+  </property>
+  <property name="head">
+  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
+  @header_stuff;noquote@
+    
+  <script type="text/javascript">
+function get_popular_tags(popular_tags_link, prefix) {
+  var http = getHttpObject();
+  http.open('GET', popular_tags_link, true);
+  http.onreadystatechange = function() {
+    if (http.readyState == 4) {
+      if (http.status != 200) {
+	alert('Something wrong in HTTP request, status code = ' + http.status);
+      } else {
+       var e = document.getElementById(prefix + '-popular_tags');
+       e.innerHTML = http.responseText;
+       e.style.display = 'block';
+      }
+    }
+  };
+  http.send(null);
+}
+</script>
+  </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 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;			    
@@ -87,7 +112,7 @@
       &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image" 
       &="top_includelets" &="page">
 </div>
-
 </div>
+
 @footer;noquote@
 </div> <!-- class='xowiki-content' -->
Index: openacs-4/packages/xowiki/www/view-book.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/view-book.tcl	13 Nov 2007 11:36:12 -0000	1.7
+++ openacs-4/packages/xowiki/www/view-book.tcl	1 Mar 2008 16:25:51 -0000	1.8
@@ -1,18 +1,17 @@
 set title [[$package_id folder_id] title]
-set toc [$page include [list toc -open_page $name  -decoration plain -remove_levels 1]]
-set i [$page set __last_includelet]
+set toc   [$page include [list toc -open_page $name -decoration plain -remove_levels 1]]
+set i     [$page set __last_includelet]
 #my log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
 
+# prevent recursive books
 if {$i ne "" && ![$page exists __is_book_page]} {
-  set p [$i position]
+  set p     [$i position]
   set count [$i count]
-  #my log "--toc count=$count size=[$i array size page_name] indices=[lsort -integer [$i array names page_name]]"
+
   if {$count > 0} {
     set book_relpos [format %.2f%% [expr {100.0 * $p / $count}]]
-  
     if {$p>1}      {set book_prev_link [$package_id pretty_link [$i page_name [expr {$p - 1}]]]}
     if {$p<$count} {set book_next_link [$package_id pretty_link [$i page_name [expr {$p + 1}]]]}
-  #ns_log notice "--p=$p, count=$count, relpos=$book_relpos, {100.0 * $p / $count} next=[info exists next_link], prev=[info exists prev_link]"
     set page_title "<h2>[$i current] $title</h2>"
   } else {
     set book_relpos 0.0%