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 -N -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>