Index: openacs-4/packages/xowiki/resources/templates/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/oacs-view.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,16 +1,13 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <master>
-                  <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-                  <property name="&body">property_body</property>
-                  <property name="&doc">property_doc</property>
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
                   <property name="head">
-                  
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
-      @header_stuff;literal@
-                  </property>
+      @header_stuff;literal@</property>
 <!-- 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'>
@@ -26,7 +23,7 @@
       <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
-      <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>
+      <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@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
       </div>
       </div>
 <div style="float:left; width: 25%; font-size: 85%;
@@ -38,9 +35,10 @@
                       portlet="categories -open_page [list @name@] -decoration plain">
                       </div></div>
                       <div style="float:right; width: 70%;">
-                      @top_includelets;noquote@
- <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
- <else><h1>@title@</h1></else>
+                       @top_includelets;noquote@
+ <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+ <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+ <else><h1>@body.title@</h1></else>
  <if @folderhtml@ not nil> 
  <div class='folders' style=''>@folderhtml;noquote@</div> 
  <div class='content-with-folders'>@content;noquote@</div> 
Index: openacs-4/packages/xowiki/resources/templates/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view2.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,17 +1,14 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <master>
-                  <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-                  <property name="&body">property_body</property>
-                  <property name="&doc">property_doc</property>
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
                   <property name="head">
-                  
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
-      @header_stuff;literal@
-                  </property>
+      @header_stuff;literal@</property>
 <!-- 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'>
@@ -27,7 +24,7 @@
       <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
-      <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>
+      <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@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
       </div>
       </div>
 <div style="float:left; width: 25%; font-size: 85%;
@@ -44,9 +41,10 @@
                       #sidebar {min-width: 220px ! important; top: 0px; overflow: visible;}
                       </style>
                       <div style='float: left; width: 62%'>
-                      @top_includelets;noquote@
- <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
- <else><h1>@title@</h1></else>
+                       @top_includelets;noquote@
+ <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+ <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+ <else><h1>@body.title@</h1></else>
  <if @folderhtml@ not nil> 
  <div class='folders' style=''>@folderhtml;noquote@</div> 
  <div class='content-with-folders'>@content;noquote@</div> 
Index: openacs-4/packages/xowiki/resources/templates/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view3.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/oacs-view3.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,12 +1,10 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <master>
-                  <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-                  <property name="&body">property_body</property>
-                  <property name="&doc">property_doc</property>
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
                   <property name="head">
-                  
         <style type='text/css'>
         table.mini-calendar {width: 227px ! important;font-size: 80%;}
         div.tags h3 {font-size: 80%;}
@@ -15,8 +13,7 @@
         <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
         <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
         <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
-      @header_stuff;literal@
-                  </property>
+      @header_stuff;literal@</property>
 <!-- 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'>
@@ -32,7 +29,7 @@
       <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
-      <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>
+      <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@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
       </div>
       </div>
  
@@ -67,9 +64,10 @@
           </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>
+           @top_includelets;noquote@
+ <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+ <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+ <else><h1>@body.title@</h1></else>
  <if @folderhtml@ not nil> 
  <div class='folders' style=''>@folderhtml;noquote@</div> 
  <div class='content-with-folders'>@content;noquote@</div> 
Index: openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-book-no-ajax.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,14 +1,11 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <master>
-                  <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-                  <property name="&body">property_body</property>
-                  <property name="&doc">property_doc</property>
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
                   <property name="head">
-                  
-      @header_stuff;literal@
-                  </property>
+      @header_stuff;literal@</property>
 <!-- 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'>
@@ -73,7 +70,7 @@
                       &="per_object_categories_with_links"
                       &="digg_link" &="delicious_link" &="my_yahoo_link"
                       &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image"
-                      &="top_includelets" &="folderhtml" &="page">
+                      &="top_includelets" &="folderhtml" &="page" &="doc" &="body">
                       </div>
                       </div>
                     
Index: openacs-4/packages/xowiki/resources/templates/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-book.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-book.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-book.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,14 +1,11 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <master>
-                  <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-                  <property name="&body">property_body</property>
-                  <property name="&doc">property_doc</property>
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
                   <property name="head">
-                  
-      @header_stuff;literal@
-                  </property>
+      @header_stuff;literal@</property>
 <!-- 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'>
@@ -73,7 +70,7 @@
                       &="per_object_categories_with_links"
                       &="digg_link" &="delicious_link" &="my_yahoo_link"
                       &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image"
-                      &="top_includelets" &="folderhtml" &="page">
+                      &="top_includelets" &="folderhtml" &="page" &="doc" &="body">
                       </div>
                       </div>
                     
Index: openacs-4/packages/xowiki/resources/templates/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-default.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-default.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-default.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,13 +1,10 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <master>
-                  <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-                  <property name="&body">property_body</property>
-                  <property name="&doc">property_doc</property>
-                  <property name="head">
-                  @header_stuff;literal@
-                  </property>
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
+                  <property name="head">@header_stuff;literal@</property>
 <!-- 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'>
@@ -23,12 +20,13 @@
       <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
-      <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>
+      <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@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
       </div>
       </div>
-@top_includelets;noquote@
- <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
- <else><h1>@title@</h1></else>
+ @top_includelets;noquote@
+ <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+ <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+ <else><h1>@body.title@</h1></else>
  <if @folderhtml@ not nil> 
  <div class='folders' style=''>@folderhtml;noquote@</div> 
  <div class='content-with-folders'>@content;noquote@</div> 
Index: openacs-4/packages/xowiki/resources/templates/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-links.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-links.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-links.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <!-- 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'>
@@ -14,12 +14,13 @@
       <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
-      <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>
+      <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@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
       </div>
       </div>
-@top_includelets;noquote@
- <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>
- <else><h1>@title@</h1></else>
+ @top_includelets;noquote@
+ <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+ <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+ <else><h1>@body.title@</h1></else>
  <if @folderhtml@ not nil> 
  <div class='folders' style=''>@folderhtml;noquote@</div> 
  <div class='content-with-folders'>@content;noquote@</div> 
Index: openacs-4/packages/xowiki/resources/templates/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xowiki/resources/templates/view-plain.adp	26 May 2016 16:00:31 -0000	1.1.2.1
+++ openacs-4/packages/xowiki/resources/templates/view-plain.adp	16 Jun 2016 09:36:47 -0000	1.1.2.2
@@ -1,11 +1,12 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Jun 16 11:33:29 CEST 2016 -->
 <!-- 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>
+ @top_includelets;noquote@
+ <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>
+ <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>
+ <else><h1>@body.title@</h1></else>
  <if @folderhtml@ not nil> 
  <div class='folders' style=''>@folderhtml;noquote@</div> 
  <div class='content-with-folders'>@content;noquote@</div> 
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.45.2.1 -r1.45.2.2
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	26 May 2016 16:00:31 -0000	1.45.2.1
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	16 Jun 2016 09:36:47 -0000	1.45.2.2
@@ -24,14 +24,11 @@
   ADP_Generator instproc master_part {} {
     return [subst -novariables -nobackslashes \
                 {<master>
-                  <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
-                  <property name="&body">property_body</property>
-                  <property name="&doc">property_doc</property>
-                  <property name="head">
-                  [my extra_header_stuff]@header_stuff;literal@
-                  </property>}]\n
+                  <property name="&body">body</property>
+                  <property name="&doc">doc</property>
+                  <property name="head">[my extra_header_stuff]@header_stuff;literal@</property>}]\n
   }
 
   ADP_Generator instproc wikicmds_part {} {
@@ -48,7 +45,7 @@
       <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
       <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
       <div id='do_search' style='display: none'>
-      <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>
+      <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@"><if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if></div></form>
       </div>
       </div>}
   }
@@ -59,9 +56,11 @@
   }
 
   ADP_Generator instproc content_part {} {
-    return "@top_includelets;noquote@\n\
-     <if @page_context@ not nil><h1>@title@ (@page_context@)</h1></if>\n\
-     <else><h1>@title@</h1></else>\n\
+    return "\
+     @top_includelets;noquote@\n\
+     <if @body.menubarHTML@ not nil><div class='visual-clear'><!-- --></div>@body.menubarHTML;noquote@</if>\n\
+     <if @page_context@ not nil><h1>@body.title@ (@page_context@)</h1></if>\n\
+     <else><h1>@body.title@</h1></else>\n\
      <if @folderhtml@ not nil> \n\
        <div class='folders' style=''>@folderhtml;noquote@</div> \n\
        <div class='content-with-folders'>@content;noquote@</div> \n\
@@ -341,7 +340,7 @@
                       &="per_object_categories_with_links"
                       &="digg_link" &="delicious_link" &="my_yahoo_link"
                       &="gc_link" &="gc_comments" &="notification_subscribe_link" &="notification_image"
-                      &="top_includelets" &="folderhtml" &="page">
+                      &="top_includelets" &="folderhtml" &="page" &="doc" &="body">
                       </div>
                       </div>
                     }]}
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.327.2.20 -r1.327.2.21
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	26 May 2016 16:00:31 -0000	1.327.2.20
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	16 Jun 2016 09:36:47 -0000	1.327.2.21
@@ -1281,9 +1281,10 @@
     set title "[_ xotcl-core.revision_title] '$name'"
     ::xo::Page set_property doc title $title
     set content [next]
-    array set property_doc [::xo::Page get_property doc]
+    array set doc [::xo::Page get_property doc]
+    array set body [::xo::Page get_property body]
     $package_id return_page -adp [$package_id get_adp_template revisions] -variables {
-      content context {page_id $item_id} title property_doc
+      content context {page_id $item_id} title doc body
     }
   }
 
@@ -1475,7 +1476,9 @@
       #
       # At this place, the menu should be complete, we can render it
       #
-      append top_includelets \n "<div class='visual-clear'><!-- --></div>" [$mb render-preferred]
+      set mbHTML [$mb render-preferred]
+      #append top_includelets \n "<div class='visual-clear'><!-- --></div>" $mbHTML
+      ::xo::Page set_property body menubarHTML $mbHTML
     }
 
     if {[$context_package_id get_parameter "with_user_tracking" 1]} {
@@ -1509,6 +1512,8 @@
       #my msg "$context_package_id title=[$context_package_id instance_name] - $title"
       #my msg "::xo::cc package_id = [::xo::cc package_id]  ::xo::cc url= [::xo::cc url] "
       ::xo::Page set_property doc title "[$context_package_id instance_name] - $title"
+      ::xo::Page set_property body title $title
+
       # We could offer a user to translate the current page to his preferred language
       #
       # set create_in_req_locale_link ""
@@ -1578,7 +1583,7 @@
 
       if {[info commands ::template::head::add_meta] ne ""} {
         #set meta(language) [my lang]
-        ::xo::Page set_property doc title [my lang]
+        ::xo::Page set_property doc title_lang [my lang]
         set meta(description) [my description]
         set meta(keywords) ""
         if {[my istype ::xowiki::FormPage]} {
@@ -1601,8 +1606,8 @@
       # pass variables for properties doc and body
       # example: ::xo::Page set_property body class "yui-skin-sam"
       #
-      array set property_body [::xo::Page get_property body]
-      array set property_doc  [::xo::Page get_property doc]
+      array set body [::xo::Page get_property body]
+      array set doc  [::xo::Page get_property doc]
       
       if {$page_package_id != $context_package_id} {
         set page_context [$page_package_id instance_name]
@@ -1638,7 +1643,7 @@
           content footer package_id page_package_id page_context
           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
+          top_includelets page views_data body doc
           folderhtml
         }
       }