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.40 -r1.41
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	7 Dec 2012 15:50:12 -0000	1.40
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	5 Aug 2013 12:39:43 -0000	1.41
@@ -264,11 +264,7 @@
     -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="width: 100%"> <!-- contentwrap -->
 
 <div style="float:left; width: 245px; font-size: 85%;">
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
@@ -303,6 +299,11 @@
 </div></div>  <!-- background -->
 </div>
 
+<div style="margin-left: 260px;"> <!-- content -->
+[next]
+</div> <!-- content -->
+</div> <!-- contentwrap -->
+
 }]
      }
 
@@ -401,4 +402,4 @@
       return [view-book content_part]
     }
 
-}
\ No newline at end of file
+}
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.66 -r1.67
--- openacs-4/packages/xowiki/www/oacs-view.adp	28 Feb 2013 17:13:38 -0000	1.66
+++ openacs-4/packages/xowiki/www/oacs-view.adp	5 Aug 2013 12:39:43 -0000	1.67
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <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.45 -r1.46
--- openacs-4/packages/xowiki/www/oacs-view2.adp	28 Feb 2013 17:13:38 -0000	1.45
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	5 Aug 2013 12:39:43 -0000	1.46
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <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.40 -r1.41
--- openacs-4/packages/xowiki/www/oacs-view3.adp	28 Feb 2013 17:13:38 -0000	1.40
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	5 Aug 2013 12:39:43 -0000	1.41
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -86,18 +86,7 @@
 </div>
 </div>
  
-<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>
- <if @folderhtml@ not nil> 
- <div class='folders' style=''>@folderhtml;noquote@</div> 
- <div class='content-with-folders'>@content;noquote@</div> 
- </if>
-    <else>@content;noquote@</else>
-</div> <!-- content -->
-</div> <!-- contentwrap -->
+<div style="width: 100%"> <!-- contentwrap -->
 
 <div style="float:left; width: 245px; font-size: 85%;">
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
@@ -132,6 +121,18 @@
 </div></div>  <!-- background -->
 </div>
 
+<div style="margin-left: 260px;"> <!-- content -->
+@top_includelets;noquote@
+ <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
+ <else><h1>@title@</h1></else>
+ <if @folderhtml@ not nil> 
+ <div class='folders' style=''>@folderhtml;noquote@</div> 
+ <div class='content-with-folders'>@content;noquote@</div> 
+ </if>
+    <else>@content;noquote@</else>
+</div> <!-- content -->
+</div> <!-- contentwrap -->
 
+
 @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.23 -r1.24
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	28 Feb 2013 17:13:38 -0000	1.23
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	5 Aug 2013 12:39:43 -0000	1.24
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <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.34 -r1.35
--- openacs-4/packages/xowiki/www/view-book.adp	28 Feb 2013 17:13:38 -0000	1.34
+++ openacs-4/packages/xowiki/www/view-book.adp	5 Aug 2013 12:39:43 -0000	1.35
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <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.63 -r1.64
--- openacs-4/packages/xowiki/www/view-default.adp	28 Feb 2013 17:13:38 -0000	1.63
+++ openacs-4/packages/xowiki/www/view-default.adp	5 Aug 2013 12:39:43 -0000	1.64
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <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.53 -r1.54
--- openacs-4/packages/xowiki/www/view-links.adp	28 Feb 2013 17:13:38 -0000	1.53
+++ openacs-4/packages/xowiki/www/view-links.adp	5 Aug 2013 12:39:43 -0000	1.54
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <!-- 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.49 -r1.50
--- openacs-4/packages/xowiki/www/view-plain.adp	28 Feb 2013 17:13:38 -0000	1.49
+++ openacs-4/packages/xowiki/www/view-plain.adp	5 Aug 2013 12:39:43 -0000	1.50
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 18:00:29 CET 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Aug 05 14:38:25 CEST 2013 -->
 <!-- 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'>