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.36 -r1.37
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	25 May 2011 12:40:44 -0000	1.36
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	26 May 2011 07:51:05 -0000	1.37
@@ -259,6 +259,13 @@
     } \
     -proc content_part {} {
       return [subst -novariables -nobackslashes {\
+
+<div style="width: 100%; float: left"> <!-- contentwrap -->
+<div style="margin-left: 258px;"> <!-- content -->
+[next]
+</div> <!-- content -->
+</div> <!-- contentwrap -->
+
 <div style="float:left; width: 245px; font-size: 85%;">
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 6px; margin-top: 6px; padding: 0px;
@@ -291,9 +298,7 @@
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>  <!-- background -->
 </div>
-<div style="margin-left: 258px;">
-[next]
-</div> <!-- right 70% -->
+
 }]
      }
 
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.61 -r1.62
--- openacs-4/packages/xowiki/www/oacs-view.adp	25 May 2011 06:40:26 -0000	1.61
+++ openacs-4/packages/xowiki/www/oacs-view.adp	26 May 2011 07:51:05 -0000	1.62
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
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.40 -r1.41
--- openacs-4/packages/xowiki/www/oacs-view2.adp	25 May 2011 06:40:26 -0000	1.40
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	26 May 2011 07:51:05 -0000	1.41
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
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.35 -r1.36
--- openacs-4/packages/xowiki/www/oacs-view3.adp	25 May 2011 06:40:26 -0000	1.35
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	26 May 2011 07:51:05 -0000	1.36
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -85,7 +85,17 @@
   <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="width: 100%; float: left"> <!-- contentwrap -->
+<div style="margin-left: 258px;"> <!-- content -->
+@top_includelets;noquote@
+ <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
+ <else><h1>@title@</h1></else>
+ @content;noquote@
+</div> <!-- content -->
+</div> <!-- contentwrap -->
+
+<div style="float:left; width: 245px; font-size: 85%;">
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 6px; margin-top: 6px; padding: 0px;
 ">
@@ -117,12 +127,7 @@
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>  <!-- background -->
 </div>
-<div style="margin-left: 258px;">
-@top_includelets;noquote@
- <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
- <else><h1>@title@</h1></else>
- @content;noquote@
-</div> <!-- right 70% -->
 
+
 @footer;noquote@
 </div> <!-- class='xowiki-content' -->
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.17 -r1.18
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	25 May 2011 06:40:26 -0000	1.17
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	26 May 2011 07:51:05 -0000	1.18
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
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.28 -r1.29
--- openacs-4/packages/xowiki/www/view-book.adp	25 May 2011 06:40:26 -0000	1.28
+++ openacs-4/packages/xowiki/www/view-book.adp	26 May 2011 07:51:05 -0000	1.29
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
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.57 -r1.58
--- openacs-4/packages/xowiki/www/view-default.adp	25 May 2011 06:40:26 -0000	1.57
+++ openacs-4/packages/xowiki/www/view-default.adp	26 May 2011 07:51:05 -0000	1.58
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
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.47 -r1.48
--- openacs-4/packages/xowiki/www/view-links.adp	25 May 2011 06:40:26 -0000	1.47
+++ openacs-4/packages/xowiki/www/view-links.adp	26 May 2011 07:51:05 -0000	1.48
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <!-- 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/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -N -r1.43 -r1.44
--- openacs-4/packages/xowiki/www/view-plain.adp	25 May 2011 06:40:26 -0000	1.43
+++ openacs-4/packages/xowiki/www/view-plain.adp	26 May 2011 07:51:05 -0000	1.44
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed May 25 08:39:04 CEST 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
 <!-- 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'>