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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/resources/templates/oacs-view.adp	26 May 2016 16:00:31 -0000	1.1.2.1
@@ -0,0 +1,52 @@
+<!-- Generated by ::xowiki::ADP_Generator on Tue Jul 07 07:05:31 EST 2015 -->
+<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">
+                  
+        <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>
+<!-- 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'>
+<div id='wikicmds'>
+      <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>
+      <if @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='#xowiki.edit_title#'>#xowiki.edit#</a> &middot; </if>
+      <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' title='#xowiki.revisions_title#'>#xotcl-core.revisions#</a> &middot; </if>
+      <if @new_link@ not nil><a href="@new_link@" accesskey='n' title='#xowiki.new_title#'>#xowiki.new_page#</a> &middot; </if>
+      <if @delete_link@ not nil><a href="@delete_link@" accesskey='d' title='#xowiki.delete_title#'>#xowiki.delete#</a> &middot; </if>
+      <if @admin_link@ not nil><a href="@admin_link@" accesskey='a' title='#xowiki.admin_title#'>#xowiki.admin#</a> &middot; </if>
+      <if @notification_subscribe_link@ not nil><a href='/notifications/manage' title='#xowiki.notifications_title#'>#xowiki.notifications#</a>
+      <a href="@notification_subscribe_link@" class="notification-image-button">&nbsp;</a> &middot; </if>
+      <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>
+      </div>
+      </div>
+<div style="float:left; width: 25%; font-size: 85%;
+     background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
+     margin-left: 6px; margin-top: 6px; padding: 0px;            
+">
+                      <div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8;">
+                      <include src="/packages/xowiki/www/portlets/include" &__including_page=page
+                      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>
+ <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>
+                    
+@footer;noquote@
+</div> <!-- class='xowiki-content' -->