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 -r1.18 -r1.19
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	1 Mar 2008 16:25:50 -0000	1.18
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	1 Mar 2008 17:30:53 -0000	1.19
@@ -295,35 +295,36 @@
 
 <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%'>
+<table width='100%' 
+  summary='This table provides a progress bar and buttons for next and previous pages'>
    <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>
+        <img border='0' alt='Previous' src='/resources/xowiki/previous.png' width='15' 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>
+        <img border='0' alt='No Previous' src='/resources/xowiki/previous-end.png' width='15' 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>
+     <tr><td width='450' 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>
+        <img border='0' alt='Next' src='/resources/xowiki/next.png' width='15' 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>
+       <img border='0' alt='No Next' src='/resources/xowiki/next-end.png' width='15' ID="bookNavNext.img"></a>
     </else>
    </td>
    </tr>
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 -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	1 Mar 2008 16:25:51 -0000	1.1
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	1 Mar 2008 17:30:54 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Mar 01 17:21:20 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Mar 01 18:26:24 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -65,35 +65,36 @@
 
 <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%'>
+<table width='100%' 
+  summary='This table provides a progress bar and buttons for next and previous pages'>
    <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>
+        <img border='0' alt='Previous' src='/resources/xowiki/previous.png' width='15' 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>
+        <img border='0' alt='No Previous' src='/resources/xowiki/previous-end.png' width='15' 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>
+     <tr><td width='450' 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>
+        <img border='0' alt='Next' src='/resources/xowiki/next.png' width='15' 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>
+       <img border='0' alt='No Next' src='/resources/xowiki/next-end.png' width='15' ID="bookNavNext.img"></a>
     </else>
    </td>
    </tr>
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.12 -r1.13
--- openacs-4/packages/xowiki/www/view-book.adp	1 Mar 2008 16:25:51 -0000	1.12
+++ openacs-4/packages/xowiki/www/view-book.adp	1 Mar 2008 17:30:54 -0000	1.13
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sat Mar 01 17:21:20 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sat Mar 01 18:26:24 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -65,35 +65,36 @@
 
 <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%'>
+<table width='100%' 
+  summary='This table provides a progress bar and buttons for next and previous pages'>
    <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>
+        <img border='0' alt='Previous' src='/resources/xowiki/previous.png' width='15' 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>
+        <img border='0' alt='No Previous' src='/resources/xowiki/previous-end.png' width='15' 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>
+     <tr><td width='450' 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>
+        <img border='0' alt='Next' src='/resources/xowiki/next.png' width='15' 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>
+       <img border='0' alt='No Next' src='/resources/xowiki/next-end.png' width='15' ID="bookNavNext.img"></a>
     </else>
    </td>
    </tr>
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 -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/view-page.adp	19 Jul 2007 21:20:13 -0000	1.3
+++ openacs-4/packages/xowiki/www/view-page.adp	1 Mar 2008 17:30:54 -0000	1.4
@@ -13,13 +13,12 @@
     <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'> 
+<div 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> <!-- </legend> -->
 <if @page_title@ not nil>
 <h2>@page_title@</h2>
 </if>
-</if>
 @content;noquote@
 </div>