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.39 -r1.40
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	13 Sep 2012 16:05:26 -0000	1.39
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	7 Dec 2012 15:50:12 -0000	1.40
@@ -95,7 +95,11 @@
     return "@top_includelets;noquote@\n\
      <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>\n\
      <else><h1>@title@</h1></else>\n\
-     @content;noquote@"
+     <if @folderhtml@ not nil> \n\
+       <div class='folders' style=''>@folderhtml;noquote@</div> \n\
+       <div class='content-with-folders'>@content;noquote@</div> \n\
+     </if>
+    <else>@content;noquote@</else>"
   }
 
   ADP_Generator instproc generate {} {
@@ -376,7 +380,7 @@
       &="per_object_categories_with_links"
       &="digg_link" &="delicious_link" &="my_yahoo_link"
       &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image"
-      &="top_includelets" &="page">
+      &="top_includelets" &="folderhtml" &="page">
 </div>
 </div>
 }]}
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.264 -r1.265
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	16 Nov 2012 08:56:20 -0000	1.264
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	7 Dec 2012 15:50:12 -0000	1.265
@@ -803,11 +803,11 @@
     set index_link [my make_link -privilege public -link "" $id {} {}]
     set link [my query_parameter "return_url" ""]
     if {$link ne ""} {set back_link $link}
-    set top_includelets ""; set content $error_msg
+    set top_includelets ""; set content $error_msg; set folderhtml ""
     ::xo::cc set status_code $status_code
     $id return_page -adp $template_file -variables {
       context title index_link back_link header_stuff error_msg 
-      top_includelets content
+      top_includelets content folderhtml
     }
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.311 -r1.312
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	17 Nov 2012 18:31:09 -0000	1.311
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	7 Dec 2012 15:50:12 -0000	1.312
@@ -1259,19 +1259,15 @@
       #
       set showFolders [$context_package_id get_parameter "MenuBarWithFolder" 1]
       if {$showFolders} {
-	set left_side "<div class='folders' style=''>\n
-	[my include {folders -style folders}]\n
-        </div>"
-	set template {$left_side\n<div class='content-with-folders'>$content</div>}
-      } else {	
-	set template {$content}
+        set folderhtml [my include {folders -style folders}]
+      } else {
+	set folderhtml ""
       }
 
       #
       # At this place, the menu should be complete, we can render it
       #
       append top_includelets \n "<div class='visual-clear'><!-- --></div>" [$mb render-yui]
-      set content [subst $template]
     }
 
     if {[$context_package_id get_parameter "with_user_tracking" 1]} {
@@ -1406,6 +1402,7 @@
           rev_link edit_link delete_link new_link admin_link index_link view_link
           notification_subscribe_link notification_image 
           top_includelets page views_data property_body property_doc
+	  folderhtml
         }
       }
     } else {
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book-no-ajax.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	13 Sep 2012 16:05:30 -0000	1.21
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	7 Dec 2012 15:50:12 -0000	1.22
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Dec 07 16:42:33 CET 2012 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -115,7 +115,7 @@
       &="per_object_categories_with_links"
       &="digg_link" &="delicious_link" &="my_yahoo_link"
       &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image"
-      &="top_includelets" &="page">
+      &="top_includelets" &="folderhtml" &="page">
 </div>
 </div>
 
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book.adp,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/xowiki/www/view-book.adp	13 Sep 2012 16:05:30 -0000	1.32
+++ openacs-4/packages/xowiki/www/view-book.adp	7 Dec 2012 15:50:13 -0000	1.33
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Dec 07 16:42:33 CET 2012 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -115,7 +115,7 @@
       &="per_object_categories_with_links"
       &="digg_link" &="delicious_link" &="my_yahoo_link"
       &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image"
-      &="top_includelets" &="page">
+      &="top_includelets" &="folderhtml" &="page">
 </div>
 </div>
 
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.61 -r1.62
--- openacs-4/packages/xowiki/www/view-default.adp	13 Sep 2012 16:05:31 -0000	1.61
+++ openacs-4/packages/xowiki/www/view-default.adp	7 Dec 2012 15:50:13 -0000	1.62
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Dec 07 16:42:33 CET 2012 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -70,6 +70,10 @@
 @top_includelets;noquote@
  <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
  <else><h1>@title@</h1></else>
- @content;noquote@
+ <if @folderhtml@ not nil> 
+ <div class='folders' style=''>@folderhtml;noquote@</div> 
+ <div class='content-with-folders'>@content;noquote@</div> 
+ </if>
+    <else>@content;noquote@</else>
 @footer;noquote@
 </div> <!-- class='xowiki-content' -->
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.51 -r1.52
--- openacs-4/packages/xowiki/www/view-links.adp	13 Sep 2012 16:05:31 -0000	1.51
+++ openacs-4/packages/xowiki/www/view-links.adp	7 Dec 2012 15:50:13 -0000	1.52
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Dec 07 16:42:33 CET 2012 -->
 <!-- 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'>
@@ -20,6 +20,10 @@
 @top_includelets;noquote@
  <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
  <else><h1>@title@</h1></else>
- @content;noquote@
+ <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> <!-- class='xowiki-content' -->
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.47 -r1.48
--- openacs-4/packages/xowiki/www/view-plain.adp	13 Sep 2012 16:05:31 -0000	1.47
+++ openacs-4/packages/xowiki/www/view-plain.adp	7 Dec 2012 15:50:13 -0000	1.48
@@ -1,11 +1,15 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu May 26 09:32:05 +0200 2011 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Dec 07 16:42:33 CET 2012 -->
 <!-- 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'>
 
 @top_includelets;noquote@
  <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
  <else><h1>@title@</h1></else>
- @content;noquote@
+ <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> <!-- class='xowiki-content' -->