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.33 -r1.34
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	5 Jun 2009 12:20:10 -0000	1.33
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	18 Jun 2009 11:46:17 -0000	1.34
@@ -8,11 +8,11 @@
 
 
 namespace eval ::xowiki {
-  
+
   Class ADP_Generator -parameter {
-    {master 1} 
-    {wikicmds 1} 
-    {footer 1} 
+    {master 1}
+    {wikicmds 1}
+    {footer 1}
     {recreate 0}
     {extra_header_stuff ""}
   }
@@ -52,7 +52,7 @@
 {<master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -76,12 +76,12 @@
   <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>  
+  <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='#' 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@" 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@" ></div></form> 
+<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@" ></div></form>
 </div>
 </div>}
   }
@@ -143,11 +143,11 @@
        return [subst -novariables -nobackslashes \
 {<div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;			
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8;">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8;">
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>
 <div style="float:right; width: 70%;">
@@ -172,11 +172,11 @@
        return [subst -novariables -nobackslashes \
 {<div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>
 <div style="float:right; width: 70%;">
@@ -189,21 +189,21 @@
 </div>  <!-- float left -->
 <div id='sidebar' class='column'>
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar"
+	 &__including_page=page
          summary="0" noparens="0">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -decoration plain">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -popular 1 -limit 30 -decoration plain">
 <hr>
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
 <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
@@ -238,34 +238,33 @@
 
 
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar"
+	 &__including_page=page
          summary="0" noparens="0">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -decoration plain">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -popular 1 -limit 30 -decoration plain">
 <hr>
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
 <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
 </div>
 </div> <!-- background -->
 
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>  <!-- background -->
 </div>
@@ -290,18 +289,17 @@
        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;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-  <div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<div style="position:relative; right:6px; bottom:6px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
 @toc;noquote@
 </div></div>
-<div style="float:right; width: 70%;">@top_includelets;noquote@
-
+<div style="float:right; width: 70%;">
 <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%' 
+  <div class="book-navigation" style="background: #fff; border: 1px dotted #000; padding-top:3px; margin-bottom:0.5em;">
+<table width='100%'
   summary='This table provides a progress bar and buttons for next and previous pages'>
-  <colgroup><col width='20'><col width='450'><col width='20'>
+  <colgroup><col width='20'><col><col width='20'>
   </colgroup>
    <tr>
    <td>
@@ -317,9 +315,10 @@
 
    <td>
    <if @book_relpos@ not nil>
-     <table style='display: inline; text-align: center;'>
-     <colgroup><col width='450'></colgroup>
-     <tr><td style='font-size: 75%'><div style='width: @book_relpos@;' ID='bookNavBar'></div><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
+     <table width='100%'>
+     <colgroup><col></colgroup>
+     <tr><td style='font-size: 75%'><div style='width: @book_relpos@;' ID='bookNavBar'></div></td></tr>
+  <tr><td style='font-size: 75%; text-align:center;'><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
      </table>
    </if>
    </td>
@@ -341,13 +340,13 @@
 
 <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" 
+      &="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>
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.121 -r1.122
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	16 Jun 2009 07:02:21 -0000	1.121
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	18 Jun 2009 11:46:17 -0000	1.122
@@ -2081,7 +2081,8 @@
 
                      document.getElementById('bookNavNext.a').setAttribute('onclick',onclick);
                      document.getElementById('bookNavRelPosText').innerHTML = percent;
-                     document.getElementById('bookNavBar').setAttribute('style', 'width: ' + percent + ';');
+                     //document.getElementById('bookNavBar').setAttribute('style', 'width: ' + percent + ';');
+                     document.getElementById('bookNavBar').style.width = percent;
 
                      fadeOutAnim.onComplete.subscribe(doFadeIn);
   		     fadeOutAnim.animate();
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -N -r1.59 -r1.60
--- openacs-4/packages/xowiki/www/oacs-view.adp	5 Jun 2009 12:20:10 -0000	1.59
+++ openacs-4/packages/xowiki/www/oacs-view.adp	18 Jun 2009 11:46:17 -0000	1.60
@@ -1,8 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -65,21 +65,21 @@
   <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>  
+  <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='#' 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@" 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@" ></div></form> 
+<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@" ></div></form>
 </div>
 </div>
 <div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;			
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8;">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8;">
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>
 <div style="float:right; width: 70%;">
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v
diff -u -N -r1.38 -r1.39
--- openacs-4/packages/xowiki/www/oacs-view2.adp	5 Jun 2009 12:20:10 -0000	1.38
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	18 Jun 2009 11:46:17 -0000	1.39
@@ -1,8 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -67,21 +67,21 @@
   <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>  
+  <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='#' 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@" 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@" ></div></form> 
+<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@" ></div></form>
 </div>
 </div>
 <div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>
 <div style="float:right; width: 70%;">
@@ -97,21 +97,21 @@
 </div>  <!-- float left -->
 <div id='sidebar' class='column'>
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar"
+	 &__including_page=page
          summary="0" noparens="0">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -decoration plain">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -popular 1 -limit 30 -decoration plain">
 <hr>
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
 <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/xowiki/www/oacs-view3.adp	5 Jun 2009 12:20:10 -0000	1.33
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	18 Jun 2009 11:46:17 -0000	1.34
@@ -1,8 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -77,46 +77,45 @@
   <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>  
+  <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='#' 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@" 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@" ></div></form> 
+<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@" ></div></form>
 </div>
 </div>
 <div style="float:left; width: 245px; font-size: 85%;">
 
 
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar"
+	 &__including_page=page
          summary="0" noparens="0">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -decoration plain">
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="tags -popular 1 -limit 30 -decoration plain">
 <hr>
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
 <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
 </div>
 </div> <!-- background -->
 
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
-     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
-
-<include src="/packages/xowiki/www/portlets/include" 
-	 &__including_page=page 
+<div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/include"
+	 &__including_page=page
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>  <!-- background -->
 </div>
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 -r1.15 -r1.16
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	5 Jun 2009 12:20:10 -0000	1.15
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	18 Jun 2009 11:46:17 -0000	1.16
@@ -1,8 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -57,18 +57,17 @@
 
 <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;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-  <div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<div style="position:relative; right:6px; bottom:6px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
 @toc;noquote@
 </div></div>
-<div style="float:right; width: 70%;">@top_includelets;noquote@
-
+<div style="float:right; width: 70%;">
 <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%' 
+  <div class="book-navigation" style="background: #fff; border: 1px dotted #000; padding-top:3px; margin-bottom:0.5em;">
+<table width='100%'
   summary='This table provides a progress bar and buttons for next and previous pages'>
-  <colgroup><col width='20'><col width='450'><col width='20'>
+  <colgroup><col width='20'><col><col width='20'>
   </colgroup>
    <tr>
    <td>
@@ -84,9 +83,10 @@
 
    <td>
    <if @book_relpos@ not nil>
-     <table style='display: inline; text-align: center;'>
-     <colgroup><col width='450'></colgroup>
-     <tr><td style='font-size: 75%'><div style='width: @book_relpos@;' ID='bookNavBar'></div><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
+     <table width='100%'>
+     <colgroup><col></colgroup>
+     <tr><td style='font-size: 75%'><div style='width: @book_relpos@;' ID='bookNavBar'></div></td></tr>
+  <tr><td style='font-size: 75%; text-align:center;'><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
      </table>
    </if>
    </td>
@@ -108,13 +108,13 @@
 
 <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" 
+      &="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>
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 -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/view-book-no-ajax.tcl	1 Mar 2008 16:25:51 -0000	1.1
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.tcl	18 Jun 2009 11:46:17 -0000	1.2
@@ -1,5 +1,6 @@
 set title [[$package_id folder_id] title]
-set toc   [$page include [list toc -ajax 0 -open_page $name -decoration plain -remove_levels 1]]
+#set toc   [$page include [list toc -ajax 0 -open_page $name -decoration plain -remove_levels 0]]
+set toc   [$page include [list toc -style list -open_page $name -expand_all 1 -decoration plain]]
 set i     [$page set __last_includelet]
 #my log "--last includelet = $i, class=[$i info class] [$page exists __is_book_page]"
 
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.26 -r1.27
--- openacs-4/packages/xowiki/www/view-book.adp	5 Jun 2009 12:20:10 -0000	1.26
+++ openacs-4/packages/xowiki/www/view-book.adp	18 Jun 2009 11:46:17 -0000	1.27
@@ -1,8 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -57,18 +57,17 @@
 
 <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;			    
+     margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
-  <div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<div style="position:relative; right:6px; bottom:6px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
 @toc;noquote@
 </div></div>
-<div style="float:right; width: 70%;">@top_includelets;noquote@
-
+<div style="float:right; width: 70%;">
 <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%' 
+  <div class="book-navigation" style="background: #fff; border: 1px dotted #000; padding-top:3px; margin-bottom:0.5em;">
+<table width='100%'
   summary='This table provides a progress bar and buttons for next and previous pages'>
-  <colgroup><col width='20'><col width='450'><col width='20'>
+  <colgroup><col width='20'><col><col width='20'>
   </colgroup>
    <tr>
    <td>
@@ -84,9 +83,10 @@
 
    <td>
    <if @book_relpos@ not nil>
-     <table style='display: inline; text-align: center;'>
-     <colgroup><col width='450'></colgroup>
-     <tr><td style='font-size: 75%'><div style='width: @book_relpos@;' ID='bookNavBar'></div><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
+     <table width='100%'>
+     <colgroup><col></colgroup>
+     <tr><td style='font-size: 75%'><div style='width: @book_relpos@;' ID='bookNavBar'></div></td></tr>
+  <tr><td style='font-size: 75%; text-align:center;'><span ID='bookNavRelPosText'>@book_relpos@</span></td></tr>
      </table>
    </if>
    </td>
@@ -108,13 +108,13 @@
 
 <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" 
+      &="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>
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/xowiki/www/view-default.adp	5 Jun 2009 12:20:10 -0000	1.55
+++ openacs-4/packages/xowiki/www/view-default.adp	18 Jun 2009 11:46:17 -0000	1.56
@@ -1,8 +1,8 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if> 
+  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
   <property name="&body">property_body</property>
   <property name="&doc">property_doc</property>
   <property name="header_stuff">
@@ -59,12 +59,12 @@
   <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>  
+  <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='#' 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@" 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@" ></div></form> 
+<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@" ></div></form>
 </div>
 </div>
 @top_includelets;noquote@
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v
diff -u -N -r1.45 -r1.46
--- openacs-4/packages/xowiki/www/view-links.adp	5 Jun 2009 12:20:10 -0000	1.45
+++ openacs-4/packages/xowiki/www/view-links.adp	18 Jun 2009 11:46:17 -0000	1.46
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <!-- 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,12 +9,12 @@
   <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>  
+  <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='#' 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@" 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@" ></div></form> 
+<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@" ></div></form>
 </div>
 </div>
 @top_includelets;noquote@
Index: openacs-4/packages/xowiki/www/view-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-page.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/view-page.adp	1 Mar 2008 18:36:01 -0000	1.6
+++ openacs-4/packages/xowiki/www/view-page.adp	18 Jun 2009 11:46:17 -0000	1.7
@@ -3,20 +3,21 @@
 <fieldset class='box'>
 <legend  style='position: inherit ! important; margin: auto ! important; display: block! important; text-align: right ! important;' id='wikicmds'>
 -->
-<div style='top: -50px ! 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 @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="@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>
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -N -r1.41 -r1.42
--- openacs-4/packages/xowiki/www/view-plain.adp	5 Jun 2009 12:20:10 -0000	1.41
+++ openacs-4/packages/xowiki/www/view-plain.adp	18 Jun 2009 11:46:17 -0000	1.42
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Jun 18 13:43:18 CEST 2009 -->
 <!-- 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/www/resources/xowiki.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v
diff -u -N -r1.46 -r1.47
--- openacs-4/packages/xowiki/www/resources/xowiki.css	11 Apr 2009 12:37:17 -0000	1.46
+++ openacs-4/packages/xowiki/www/resources/xowiki.css	18 Jun 2009 11:46:17 -0000	1.47
@@ -167,7 +167,7 @@
 #main div.column {text-align: left; margin-bottom: 1em;}
 #content      {float: left; width: 70%;}
 
-#bookNavBar { top: 0px; height: 2px; background-color: #859db8;}
+#bookNavBar { top: 0px; height: 2px; overflow:hidden; background-color: #859db8;float:left;}
 
 #content .box h2 {border-bottom: 1px solid #a1a5a9; padding: 5px; background: #f2f2f2; margin: 0 -5px 5px -5px; font-size: 12px;}
 #sidebar {float: right; top: 0px; width: 29%; font: 10px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;}