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.9 -r1.10
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	19 Jul 2007 21:20:12 -0000	1.9
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	13 Sep 2007 09:41:08 -0000	1.10
@@ -74,9 +74,9 @@
       <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>}
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -r1.94 -r1.95
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Sep 2007 08:59:15 -0000	1.94
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Sep 2007 09:41:08 -0000	1.95
@@ -1706,8 +1706,10 @@
 	set html [$p include_portlet [list $b -book_mode true]]
 	if {$html ne ""} {lappend menu $html}
       }
-      append output "<h$level class='book'>" \
-          "<div style='float: right'>" [join $menu "&nbsp;"] "</div>" \
+      #div not allowed in h*: style='float: right; position: relative; top: -32px
+      append output \
+          "<h$level class='book'>" \
+          "<span style='float: right;'>" [join $menu "&nbsp;"] "</span>" \
           "<a name='[toc anchor $name]'></a>$page_order $title</h$level>" \
           $content
     }
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.168 -r1.169
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	13 Sep 2007 08:22:24 -0000	1.168
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	13 Sep 2007 09:41:08 -0000	1.169
@@ -214,7 +214,7 @@
   Page proc header_stuff {} {
     set result ""
     foreach file [array names ::need_css] {
-      append result "<link rel='stylesheet' href='$file' media='all' >\n"
+      append result "<link type='text/css' rel='stylesheet' href='$file' media='all' >\n"
     }
     if {[info exists ::js_order]} {
       foreach file $::js_order  {
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/xowiki/www/oacs-view.adp	19 Jul 2007 21:20:13 -0000	1.39
+++ openacs-4/packages/xowiki/www/oacs-view.adp	13 Sep 2007 09:41:08 -0000	1.40
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:17:44 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -63,10 +63,10 @@
       <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>
 <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;			    
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/xowiki/www/oacs-view2.adp	19 Jul 2007 21:20:13 -0000	1.18
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	13 Sep 2007 09:41:08 -0000	1.19
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:17:44 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -65,10 +65,10 @@
       <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>
 <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;			    
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view3.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/xowiki/www/oacs-view3.adp	19 Jul 2007 21:20:13 -0000	1.13
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	13 Sep 2007 09:41:08 -0000	1.14
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:17:44 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -65,10 +65,10 @@
       <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>
 <div style="float:left; width: 245px; font-size: 85%;">
 <style type='text/css'>
 table.mini-calendar {width: 227px ! important;font-size: 80%;}
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/xowiki/www/view-default.adp	19 Jul 2007 21:20:13 -0000	1.35
+++ openacs-4/packages/xowiki/www/view-default.adp	13 Sep 2007 09:41:08 -0000	1.36
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:17:44 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -57,10 +57,10 @@
       <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>
 @top_portlets;noquote@
 @content;noquote@
 @footer;noquote@
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-links.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/xowiki/www/view-links.adp	19 Jul 2007 21:20:13 -0000	1.25
+++ openacs-4/packages/xowiki/www/view-links.adp	13 Sep 2007 09:41:08 -0000	1.26
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:17:44 CEST 2007 -->
 <!-- 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'>
@@ -12,10 +12,10 @@
       <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>
 @top_portlets;noquote@
 @content;noquote@
 
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-plain.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xowiki/www/view-plain.adp	19 Jul 2007 21:20:13 -0000	1.21
+++ openacs-4/packages/xowiki/www/view-plain.adp	13 Sep 2007 09:41:08 -0000	1.22
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:17:44 CEST 2007 -->
 <!-- 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'>