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 -N -r1.4 -r1.5
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	17 Mar 2007 23:13:21 -0000	1.4
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	18 Mar 2007 00:12:34 -0000	1.5
@@ -201,5 +201,65 @@
 }]
      }
 
+  #
+  # similar to oacs view2 (categories left), but everything left
+  #
+  ADP_Generator create oacs-view3 -master 1 -footer 1 \
+    -extra_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>
+    } \
+    -proc before_render {page} {
+      ::xo::cc set_parameter weblog_page weblog-portlet
+    } \
+    -proc content_part {} {
+       return [subst -novariables -nobackslashes \
+{<div style="float:left; width: 25%; font-size: 85%;">
+<style type='text/css'>
+table.mini-calendar {width: 200px ! important;}
+#sidebar {min-width: 220px ! important; top: 0px; overflow: visible;}
+div.tags h3 {font-size: 80%;}
+div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
+</style>
 
+<div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
+     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+">
+<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
+	 &__including_page=page 
+         summary="0" noprens="1">
+<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" text="Show People contributing to this XoWiki Instance">Contributors</a>
+</div>
+</div> <!-- background -->
+
+<div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
+     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+">
+<div style="margin-top: -2px; margin-left: -2px; 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>  <!-- background -->
+</div>
+<div style="float:right; width: 70%;">
+[next]
+</div> <!-- right 70% -->
+}]
+     }
+
+
 }
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/xowiki/www/oacs-view.adp	17 Mar 2007 23:34:44 -0000	1.26
+++ openacs-4/packages/xowiki/www/oacs-view.adp	18 Mar 2007 00:12:34 -0000	1.27
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 00:18:56 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 01:09:31 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/xowiki/www/oacs-view2.adp	17 Mar 2007 23:34:44 -0000	1.5
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	18 Mar 2007 00:12:34 -0000	1.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 00:18:56 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 01:09:31 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	18 Mar 2007 00:12:34 -0000	1.1
@@ -0,0 +1,93 @@
+<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 01:09:31 CET 2007 -->
+<master>
+  <property name="title">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="header_stuff">@header_stuff;noquote@
+      <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>
+    
+  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
+  <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>
+<!-- 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 @edit_link@ not nil><a href="@edit_link@" accesskey='e' title='Diese Seite bearbeiten ...'>#xowiki.edit#</a> &middot; </if>
+  <if @rev_link@ not nil><a href="@rev_link@" accesskey='r' >#xotcl-core.revisions#</a> &middot; </if>
+  <if @new_link@ not nil><a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot; </if>
+  <if @delete_link@ not nil><a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot; </if>
+  <if @admin_link@ not nil><a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot; </if>
+  <if @notification_subscribe_link@ not nil><a href='/notifications/manage'>#xowiki.notifications#</a> 
+    <a href="@notification_subscribe_link@">@notification_image;noquote@</a> &middot; </if>
+  <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'>#xowiki.search#</a> &middot;
+  <if @index_link@ not nil><a href="@index_link@" accesskey='i'>#xowiki.index#</a></if>
+<span id='do_search' style='display: none'> 
+  <FORM action='/search/search'><INPUT  id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" /></FORM> 
+</span>
+</div>
+<div style="float:left; width: 25%; font-size: 85%;">
+<style type='text/css'>
+table.mini-calendar {width: 200px ! important;}
+#sidebar {min-width: 220px ! important; top: 0px; overflow: visible;}
+div.tags h3 {font-size: 80%;}
+div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
+</style>
+
+<div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
+     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+">
+<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
+	 &__including_page=page 
+         summary="0" noprens="1">
+<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" text="Show People contributing to this XoWiki Instance">Contributors</a>
+</div>
+</div> <!-- background -->
+
+<div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
+     margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
+">
+<div style="margin-top: -2px; margin-left: -2px; 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>  <!-- background -->
+</div>
+<div style="float:right; width: 70%;">
+@top_portlets;noquote@
+@content;noquote@
+</div> <!-- right 70% -->
+
+@footer;noquote@
+</div> <!-- class='xowiki-content' -->
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/xowiki/www/view-default.adp	17 Mar 2007 23:34:44 -0000	1.22
+++ openacs-4/packages/xowiki/www/view-default.adp	18 Mar 2007 00:12:34 -0000	1.23
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 00:18:56 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 01:09:31 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/xowiki/www/view-links.adp	17 Mar 2007 23:34:44 -0000	1.12
+++ openacs-4/packages/xowiki/www/view-links.adp	18 Mar 2007 00:12:34 -0000	1.13
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 00:18:56 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 01:09:31 CET 2007 -->
 <!-- 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'>
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/xowiki/www/view-plain.adp	17 Mar 2007 23:34:44 -0000	1.8
+++ openacs-4/packages/xowiki/www/view-plain.adp	18 Mar 2007 00:12:34 -0000	1.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 00:18:56 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Sun Mar 18 01:09:31 CET 2007 -->
 <!-- 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'>
Index: openacs-4/packages/xowiki/www/prototypes/contributors.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/contributors.page,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/prototypes/contributors.page	17 Mar 2007 23:34:44 -0000	1.1
+++ openacs-4/packages/xowiki/www/prototypes/contributors.page	18 Mar 2007 00:12:35 -0000	1.2
@@ -9,7 +9,7 @@
     TableWidget t1 -volatile \
         -columns {
           Field contributor -label "Contributor"
-          Field count -label "Page Revisions"
+          Field count -label "Page Revisions" -html { align right }
         }
 
     db_foreach get_contributors {select count(object_id), creation_user 
@@ -19,6 +19,7 @@
         and cr.item_id = ci.item_id 
       group by creation_user order by count desc;
     } {
+      if {$creation_user eq ""} continue
       t1 add \
           -contributor [::xo::get_user_name $creation_user] \
           -count $count