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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	13 Mar 2007 10:27:31 -0000	1.1
@@ -0,0 +1,232 @@
+ad_library {
+    XoWiki - adp generator procs: remove redundancy in adp files by generating it
+
+    @creation-date 2007-03-13
+    @author Gustaf Neumann
+    @cvs-id $Id: adp-generator-procs.tcl,v 1.1 2007/03/13 10:27:31 gustafn Exp $
+}
+
+
+namespace eval ::xowiki {
+  
+  Class ADP_Generator -parameter {
+    {master 1} 
+    {wikicmds 1} 
+    {footer 1} 
+    {recreate 0}
+    {extra_header_stuff ""}
+  }
+
+  ADP_Generator instproc ajax_tag_definition {} {
+    # if we have no footer, we have no tag form
+    if {![my footer]} {return ""}
+
+    return {<script type="text/javascript">
+function get_popular_tags() {
+  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('popular_tags');
+       e.innerHTML = http.responseText;
+       e.style.display = 'block';
+      }
+    }
+  };
+  http.send(null);
+}
+</script>}
+  }
+
+  ADP_Generator instproc master_part {} {
+    return [subst -novariables -nobackslashes \
+{<master>
+  <property name="title">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="header_stuff">@header_stuff;noquote@[my extra_header_stuff]
+  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
+  [my ajax_tag_definition]
+  </property>}]\n
+  }
+
+  ADP_Generator instproc wikicmds_part {} {
+    if {![my wikicmds]} {return ""}
+    return {<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>}
+  }
+
+  ADP_Generator instproc footer_part {} {
+    if {![my footer]} {return ""}
+    return {<div style="clear: both; text-align: left; font-size: 85%;">
+<hr/>
+<if @digg_link@ not nil>
+<div style='float: right'><a href='@digg_link@'><img  src='http://digg.com/img/badges/100x20-digg-button.png' width='100' height='20' alt='Digg!' border='1'/></a></div>
+</if>
+<if @delicious_link@ not nil>
+<div style='float: right; padding-right: 10px;'><a href='@delicious_link@'><img src="http://i.i.com.com/cnwk.1d/i/ne05/fmwk/delicious_14x14.gif" width="14" height="14" border="0" alt="Add to your del.icio.us" />del.icio.us</a></div>
+</if>
+<if @my_yahoo_link@ not nil>
+<div style='float: right; padding-right: 10px;'>
+<a href="@my_yahoo_link@"><img src="http://us.i1.yimg.com/us.yimg.com/i/us/my/addtomyyahoo4.gif" width="91" height="17" border="0" align="middle" alt="Add to My Yahoo!"></a></div>
+</if>
+<if @references@ ne "" or @lang_links.found@ ne "">
+#xowiki.references_label# @references;noquote@ @lang_links.found;noquote@<br/>
+</if>
+<if @lang_links.undefined@ ne "">
+#xowiki.create_this_page_in_language# @lang_links.undefined;noquote@<br/>
+</if>
+<if @no_tags@ eq 0>
+#xowiki.your_tags_label#: @tags_with_links;noquote@
+(<a href='#' onclick='document.getElementById("edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
+<a href='#' onclick='get_popular_tags();return false;'>#xowiki.popular_tags_link#</a>)
+<span id='edit_tags' style='display: none'>
+<FORM action="@save_tag_link@" method='POST'><INPUT name='new_tags' type='text' value="@tags@"></FORM>
+</span>
+<span id='popular_tags' style='display: none'></span><br/>
+</if>
+<if @per_object_categories_with_links@ not nil and @per_object_categories_with_links@ ne "">
+Categories: @per_object_categories_with_links;noquote@
+</if>
+</div>
+<if @gc_comments@ not nil>
+   <p>#general-comments.Comments#
+   <ul>@gc_comments;noquote@</ul></p>
+</if>
+<if @gc_link@ not nil>
+   <p>@gc_link;noquote@</p>
+</if>}
+  }
+
+  ADP_Generator instproc content_part {} {
+    return "@top_portlets;noquote@\n@content;noquote@"
+  }
+
+
+  ADP_Generator instproc generate {} {
+    my instvar master wikicmds footer
+    set _ "<!-- Generated by [self class] on [clock format [clock seconds]] -->\n"
+
+    # if we include the master, we include the primitive js function
+    if {$master} {
+      append _ [my master_part]
+    }
+
+    append _ \
+{<!-- 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'>} \n
+
+    append _ [my wikicmds_part] \n
+    append _ [my content_part] \n
+    append _ [my footer_part] \n
+    append _ "</div> <!-- class='xowiki-content' -->\n"
+  }
+
+  ADP_Generator instproc init {} {
+    set name [namespace tail [self]]
+    set filename [file dirname [info script]]/../www/$name.adp
+    # generate the adp file, if it does not exist
+    if {![file exists $filename]} {
+      set f [open $filename w]
+      puts -nonewline $f [my generate]
+      close $f
+    }
+    my destroy_on_cleanup
+  }
+
+  ADP_Generator create view-plain -master 0 -wikicmds 0 -footer 0
+  ADP_Generator create view-links -master 0 -footer 0
+  ADP_Generator create view-default -master 1 -footer 1
+
+  ADP_Generator create oacs-view -master 1 -footer 1 \
+    -extra_header_stuff {
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
+      <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
+    } \
+    -proc content_part {} {
+       return [subst -novariables -nobackslashes \
+{<div style="float:left; width: 25%; font-size: 85%;
+     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>
+<div style="float:right; width: 70%;">
+[next]
+</div>
+}]
+     }
+
+  #
+  # similar to oacs view (categories left), but having as well a right bar
+  #
+  ADP_Generator create oacs-view2 -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 content_part {} {
+       return [subst -novariables -nobackslashes \
+{<div style="float:left; width: 25%; font-size: 85%;
+     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>
+<div style="float:right; width: 70%;">
+<div id='content' class='column'>
+[next]
+</div>
+<div id='sidebar' class='column'>
+<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">
+<style type='text/css'>table.mini-calendar {width: 200px ! important;}</style>
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
+	 &__including_page=page 
+	 page="weblog">
+<include src="/packages/xowiki/www/portlets/include" 
+	 &__including_page=page 
+	 portlet="tags -decoration plain -page weblog-portlet">
+<include src="/packages/xowiki/www/portlets/include" 
+	 &__including_page=page 
+	 portlet="tags -popular 1 -limit 30 -decoration plain -page weblog-portlet">
+<include src="/packages/xowiki/www/portlets/include" 
+	 &__including_page=page 
+	 portlet="presence -interval {10 minutes} -decoration plain">
+</div>
+</div>
+</div>
+</div> <!-- right 70% -->
+}]
+     }
+
+#{{adp portlets/weblog-mini-calendar {page weblog}}}
+#{{tags -decoration plain -page weblog-portlet}}
+#{{tags -popular 1 -limit 30 -decoration plain -page weblog-portlet}} 
+
+
+}
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.48 -r1.49
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Mar 2007 18:29:50 -0000	1.48
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	13 Mar 2007 10:27:31 -0000	1.49
@@ -102,7 +102,7 @@
     prototypes 1 
     ressources 1
     revisions 1 
-    view-default view-links view-plain oacs-view
+    view-default 1 view-links 1 view-plain 1 oacs-view 1
   }
 
   Package ad_instproc pretty_link {
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	12 Mar 2007 08:03:38 -0000	1.25
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Mar 2007 10:27:31 -0000	1.26
@@ -88,6 +88,12 @@
     set id [expr {[my exists id] ? "id='[my id]'" : ""}]
     return "<div $id class='$class'>[next]</div>"
   }
+
+  Class ::xowiki::portlet::decoration=rightbox -instproc render {} {
+    set class [namespace tail [my info class]]
+    set id [expr {[my exists id] ? "id='[my id]'" : ""}]
+    return "<div class='rightbox'><div $id class='$class'>[next]</div></div>"
+  }
 }
 
 namespace eval ::xowiki::portlet {
@@ -193,8 +199,6 @@
         $cattree($plevel) add $c
         set category($cid) $c
         lappend categories $cid
-        #set itemobj [Object new -set name en:index -set title MyTitle -set prefix "" -set suffix ""]
-        #$cattree(0) add_to_category -category $c -itemobj $itemobj -orderby title
       }
       
       set sql "category_object_map c, cr_items ci, cr_revisions r, xowiki_page p \
@@ -503,7 +507,7 @@
   #
   Class create presence \
       -superclass ::xowiki::Portlet \
-      -parameter {{__decoration plain}}
+      -parameter {{__decoration rightbox}}
 
   # TODO make display style -decoration
 
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 -N -r1.41 -r1.42
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	8 Mar 2007 12:05:32 -0000	1.41
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Mar 2007 10:27:31 -0000	1.42
@@ -7,6 +7,7 @@
     @cvs-id $Id$
 }
 
+
 namespace eval ::xowiki {
   
   Page instproc view {} {
@@ -498,4 +499,4 @@
     return $out
   }
 
-}
+}
\ No newline at end of file
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.21 -r1.22
--- openacs-4/packages/xowiki/www/oacs-view.adp	30 Jan 2007 11:46:55 -0000	1.21
+++ openacs-4/packages/xowiki/www/oacs-view.adp	13 Mar 2007 10:27:32 -0000	1.22
@@ -1,11 +1,13 @@
+<!-- Generated by ::xowiki::ADP_Generator on Tue Mar 13 11:24:17 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' />
-<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">
+      <link rel='stylesheet' href='/resources/xowiki/cattree.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() {
   var http = getHttpObject();
   http.open('GET', "@popular_tags_link@", true);
@@ -23,27 +25,24 @@
   http.send(null);
 }
 </script>
-</property>
-  
-  <!-- The following DIV is needed for overlib to function! -->
+  </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 @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="@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%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
@@ -53,10 +52,13 @@
 	 &__including_page=page 
 	 portlet="categories -open_page @name@  -decoration plain">
 </div></div>
-<div style="float:right; width: 70%;">@top_portlets;noquote@
-@content;noquote@</div>
+<div style="float:right; width: 70%;">
+@top_portlets;noquote@
+@content;noquote@
+</div>
+
 <div style="clear: both; text-align: left; font-size: 85%;">
-<hr>
+<hr/>
 <if @digg_link@ not nil>
 <div style='float: right'><a href='@digg_link@'><img  src='http://digg.com/img/badges/100x20-digg-button.png' width='100' height='20' alt='Digg!' border='1'/></a></div>
 </if>
@@ -67,7 +69,6 @@
 <div style='float: right; padding-right: 10px;'>
 <a href="@my_yahoo_link@"><img src="http://us.i1.yimg.com/us.yimg.com/i/us/my/addtomyyahoo4.gif" width="91" height="17" border="0" align="middle" alt="Add to My Yahoo!"></a></div>
 </if>
-<div style="clear: both; text-align: left; font-size: 85%;">
 <if @references@ ne "" or @lang_links.found@ ne "">
 #xowiki.references_label# @references;noquote@ @lang_links.found;noquote@<br/>
 </if>
@@ -86,7 +87,7 @@
 <if @per_object_categories_with_links@ not nil and @per_object_categories_with_links@ ne "">
 Categories: @per_object_categories_with_links;noquote@
 </if>
-</div><br/>
+</div>
 <if @gc_comments@ not nil>
    <p>#general-comments.Comments#
    <ul>@gc_comments;noquote@</ul></p>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	13 Mar 2007 10:27:32 -0000	1.1
@@ -0,0 +1,122 @@
+<!-- Generated by ::xowiki::ADP_Generator on Tue Mar 13 11:24:17 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() {
+  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('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%;
+     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>
+<div style="float:right; width: 70%;">
+<div id='content' class='column'>
+@top_portlets;noquote@
+@content;noquote@
+</div>
+<div id='sidebar' class='column'>
+<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">
+<style type='text/css'>table.mini-calendar {width: 200px ! important;}</style>
+<include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
+	 &__including_page=page 
+	 page="weblog">
+<include src="/packages/xowiki/www/portlets/include" 
+	 &__including_page=page 
+	 portlet="tags -decoration plain -page weblog-portlet">
+<include src="/packages/xowiki/www/portlets/include" 
+	 &__including_page=page 
+	 portlet="tags -popular 1 -limit 30 -decoration plain -page weblog-portlet">
+<include src="/packages/xowiki/www/portlets/include" 
+	 &__including_page=page 
+	 portlet="presence -interval {10 minutes} -decoration plain">
+</div>
+</div>
+</div>
+</div> <!-- right 70% -->
+
+<div style="clear: both; text-align: left; font-size: 85%;">
+<hr/>
+<if @digg_link@ not nil>
+<div style='float: right'><a href='@digg_link@'><img  src='http://digg.com/img/badges/100x20-digg-button.png' width='100' height='20' alt='Digg!' border='1'/></a></div>
+</if>
+<if @delicious_link@ not nil>
+<div style='float: right; padding-right: 10px;'><a href='@delicious_link@'><img src="http://i.i.com.com/cnwk.1d/i/ne05/fmwk/delicious_14x14.gif" width="14" height="14" border="0" alt="Add to your del.icio.us" />del.icio.us</a></div>
+</if>
+<if @my_yahoo_link@ not nil>
+<div style='float: right; padding-right: 10px;'>
+<a href="@my_yahoo_link@"><img src="http://us.i1.yimg.com/us.yimg.com/i/us/my/addtomyyahoo4.gif" width="91" height="17" border="0" align="middle" alt="Add to My Yahoo!"></a></div>
+</if>
+<if @references@ ne "" or @lang_links.found@ ne "">
+#xowiki.references_label# @references;noquote@ @lang_links.found;noquote@<br/>
+</if>
+<if @lang_links.undefined@ ne "">
+#xowiki.create_this_page_in_language# @lang_links.undefined;noquote@<br/>
+</if>
+<if @no_tags@ eq 0>
+#xowiki.your_tags_label#: @tags_with_links;noquote@
+(<a href='#' onclick='document.getElementById("edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
+<a href='#' onclick='get_popular_tags();return false;'>#xowiki.popular_tags_link#</a>)
+<span id='edit_tags' style='display: none'>
+<FORM action="@save_tag_link@" method='POST'><INPUT name='new_tags' type='text' value="@tags@"></FORM>
+</span>
+<span id='popular_tags' style='display: none'></span><br/>
+</if>
+<if @per_object_categories_with_links@ not nil and @per_object_categories_with_links@ ne "">
+Categories: @per_object_categories_with_links;noquote@
+</if>
+</div>
+<if @gc_comments@ not nil>
+   <p>#general-comments.Comments#
+   <ul>@gc_comments;noquote@</ul></p>
+</if>
+<if @gc_link@ not nil>
+   <p>@gc_link;noquote@</p>
+</if>
+</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.17 -r1.18
--- openacs-4/packages/xowiki/www/view-default.adp	30 Jan 2007 11:46:59 -0000	1.17
+++ openacs-4/packages/xowiki/www/view-default.adp	13 Mar 2007 10:27:32 -0000	1.18
@@ -1,9 +1,10 @@
+<!-- Generated by ::xowiki::ADP_Generator on Tue Mar 13 11:24:17 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" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
-<script type="text/javascript">
+  <script type="text/javascript">
 function get_popular_tags() {
   var http = getHttpObject();
   http.open('GET', "@popular_tags_link@", true);
@@ -21,19 +22,18 @@
   http.send(null);
 }
 </script>
-</property>
-  
-  <!-- The following DIV is needed for overlib to function! -->
+  </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 @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="@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'> 
@@ -42,8 +42,8 @@
 </div>
 @top_portlets;noquote@
 @content;noquote@
-<hr>
 <div style="clear: both; text-align: left; font-size: 85%;">
+<hr/>
 <if @digg_link@ not nil>
 <div style='float: right'><a href='@digg_link@'><img  src='http://digg.com/img/badges/100x20-digg-button.png' width='100' height='20' alt='Digg!' border='1'/></a></div>
 </if>
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.7 -r1.8
--- openacs-4/packages/xowiki/www/view-links.adp	9 Jan 2007 18:53:39 -0000	1.7
+++ openacs-4/packages/xowiki/www/view-links.adp	13 Mar 2007 10:27:32 -0000	1.8
@@ -1,17 +1,22 @@
+<!-- Generated by ::xowiki::ADP_Generator on Tue Mar 13 11:24:17 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'>
 <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 @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="@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>
+@top_portlets;noquote@
 @content;noquote@
+
 </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.3 -r1.4
--- openacs-4/packages/xowiki/www/view-plain.adp	9 Jan 2007 18:53:39 -0000	1.3
+++ openacs-4/packages/xowiki/www/view-plain.adp	13 Mar 2007 10:27:32 -0000	1.4
@@ -1,3 +1,9 @@
+<!-- Generated by ::xowiki::ADP_Generator on Tue Mar 13 11:24:17 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'>
+
+@top_portlets;noquote@
 @content;noquote@
-</div> <!-- class='xowiki-content'-->
+
+</div> <!-- class='xowiki-content' -->
Index: openacs-4/packages/xowiki/www/resources/xowiki.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/xowiki/www/resources/xowiki.css	30 Jan 2007 11:36:07 -0000	1.15
+++ openacs-4/packages/xowiki/www/resources/xowiki.css	13 Mar 2007 10:27:32 -0000	1.16
@@ -103,7 +103,7 @@
 a:visited.rss {color: #FFF}
 a:link.rss {color: #FFF}
 
-div.presence {float:right; right: 1em; clear: right; font-size: 75%; padding: 5px;
+div.rightbox {float:right; right: 1em; clear: right; font-size: 75%; padding: 5px;
     border:dotted; border-width:1px;background: #f8f8f8
 }
 div.presence h1 {font-size: 90%; margin-bottom: 0px}