Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/xowiki/www/oacs-view2.adp	3 Sep 2013 12:30:03 -0000	1.47
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	27 Oct 2014 16:42:06 -0000	1.48
@@ -1,129 +1,86 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Sep 03 14:28:51 CEST 2013 -->
+<!-- Generated by ::xowiki::ADP_Generator on Mon Sep 08 12:54:17 CEST 2014 -->
 <master>
-  <property name="title">@title;noquote@</property>
-  <property name="context">@context;noquote@</property>
-  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
-  <property name="&body">property_body</property>
-  <property name="&doc">property_doc</property>
-  <property name="header_stuff">
-  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
-  
-      <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;noquote@
-  <script type="text/javascript">
-function get_popular_tags(popular_tags_link, prefix) {
-  var http = getHttpObject();
-  http.open('GET', popular_tags_link, true);
-  http.onreadystatechange = function() {
-    if (http.readyState == 4) {
-      if (http.status != 200) {
-	alert('Something wrong in HTTP request, status code = ' + http.status);
-      } else {
-       var e = document.getElementById(prefix + '-popular_tags');
-       e.innerHTML = http.responseText;
-       e.style.display = 'block';
-      }
-    }
-  };
-  http.send(null);
-}
-</script>
-  </property>
-  <property name="head">
-  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
-  
-      <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;noquote@
-  <script type="text/javascript">
-function get_popular_tags(popular_tags_link, prefix) {
-  var http = getHttpObject();
-  http.open('GET', popular_tags_link, true);
-  http.onreadystatechange = function() {
-    if (http.readyState == 4) {
-      if (http.status != 200) {
-	alert('Something wrong in HTTP request, status code = ' + http.status);
-      } else {
-       var e = document.getElementById(prefix + '-popular_tags');
-       e.innerHTML = http.responseText;
-       e.style.display = 'block';
-      }
-    }
-  };
-  http.send(null);
-}
-</script>
-  </property>
+                  <property name="doc(title)">@title;noquote@</property>
+                  <property name="context">@context;noquote@</property>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
+                  <property name="&body">property_body</property>
+                  <property name="&doc">property_doc</property>
+                  <property name="header_stuff">
+                  
+        <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;noquote@
+                  </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;noquote@
+                  </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="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>
+      <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>
+      <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 @name@ -decoration plain">
-</div></div>
-<div style="float:right; width: 70%;">
-<style type='text/css'>
-table.mini-calendar {width: 200px ! important;}
-#sidebar {min-width: 220px ! important; top: 0px; overflow: visible;}
-</style>
-<div style='float: left; width: 62%'>
-@top_includelets;noquote@
+                      <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%;">
+                      <style type='text/css'>
+                      table.mini-calendar {width: 200px ! important;}
+                      #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>
  <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>  <!-- float left -->
-<div id='sidebar' class='column'>
-<div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
+                      </div>  <!-- float left -->
+                      <div id='sidebar' class='column'>
+                      <div style="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/weblog-mini-calendar"
-	 &__including_page=page
-         summary="0" noparens="0">
-<include src="/packages/xowiki/www/portlets/include"
-	 &__including_page=page
-	 portlet="tags -decoration plain">
-<include src="/packages/xowiki/www/portlets/include"
-	 &__including_page=page
-	 portlet="tags -popular 1 -limit 30 -decoration plain">
-<hr>
-<include src="/packages/xowiki/www/portlets/include"
-	 &__including_page=page
-	 portlet="presence -interval {30 minutes} -decoration plain">
-<hr>
-<a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
-</div>
-</div>
-</div> <!-- sidebar -->
+                      <div style="position:relative; right:6px; bottom:6px;  border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+                      <include src="/packages/xowiki/www/portlets/weblog-mini-calendar" &__including_page=page
+                      summary="0" noparens="0">
+                      <include src="/packages/xowiki/www/portlets/include" &__including_page=page
+                      portlet="tags -decoration plain">
+                      <include src="/packages/xowiki/www/portlets/include" &__including_page=page
+                      portlet="tags -popular 1 -limit 30 -decoration plain">
+                      <hr>
+                      <include src="/packages/xowiki/www/portlets/include" &__including_page=page
+                      portlet="presence -interval {30 minutes} -decoration plain">
+                      <hr>
+                      <a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
+                      </div>
+                      </div>
+                      </div> <!-- sidebar -->
 
-</div> <!-- right 70% -->
-
+                      </div> <!-- right 70% -->
+                    
 @footer;noquote@
 </div> <!-- class='xowiki-content' -->