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 -r1.2 -r1.3
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	14 Mar 2007 13:41:04 -0000	1.2
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	15 Mar 2007 12:10:49 -0000	1.3
@@ -17,20 +17,24 @@
     {extra_header_stuff ""}
   }
 
+  ADP_Generator instproc before_render {} {
+    # just a hook, might be removed later
+  }
+
   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() {
+function get_popular_tags(popular_tags_link, prefix) {
   var http = getHttpObject();
-  http.open('GET', "@popular_tags_link@", true);
+  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');
+       var e = document.getElementById(prefix + '-popular_tags');
        e.innerHTML = http.responseText;
        e.style.display = 'block';
       }
@@ -92,12 +96,12 @@
 </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'>
+(<a href='#' onclick='document.getElementById("-edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
+<a href='#' onclick='get_popular_tags("@popular_tags_link@","");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/>
+<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@
@@ -146,7 +150,6 @@
       puts -nonewline $f [my generate]
       close $f
     }
-    my destroy_on_cleanup
   }
 
   ADP_Generator create view-plain -master 0 -wikicmds 0 -footer 0
@@ -184,6 +187,9 @@
       <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 {} {
+      ::xo::cc set_parameter weblog_page weblog-portlet
+    } \
     -proc content_part {} {
        return [subst -novariables -nobackslashes \
 {<div style="float:left; width: 25%; font-size: 85%;
@@ -200,38 +206,34 @@
 table.mini-calendar {width: 200px ! important;}
 #sidebar {min-width: 220px ! important; top: 0px; overflow: visible;}
 </style>
-<div style='float: left; width: 62%; overflow: visible ! important;'>
+<div style='float: left; width: 62%'>
 [next]
-</div>
+</div>  <!-- float left -->
 <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">
 <include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
 	 &__including_page=page 
-	 page="weblog-portlet" summary="1">
+         summary="1" noparens="1">
 <include src="/packages/xowiki/www/portlets/include" 
 	 &__including_page=page 
-	 portlet="tags -decoration plain -page weblog-portlet -summary 1">
+	 portlet="tags -decoration plain -summary 1">
 <include src="/packages/xowiki/www/portlets/include" 
 	 &__including_page=page 
-	 portlet="tags -popular 1 -limit 30 -decoration plain -page weblog-portlet -summary 1">
+	 portlet="tags -popular 1 -limit 30 -decoration plain -summary 1">
 <hr>
 <include src="/packages/xowiki/www/portlets/include" 
 	 &__including_page=page 
-	 portlet="presence -interval {10 minutes} -decoration plain">
+	 portlet="presence -interval {30 minutes} -decoration plain">
 </div>
 </div>
-</div>
+</div> <!-- sidebar -->
 
 </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 -r1.49 -r1.50
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	13 Mar 2007 10:27:31 -0000	1.49
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	15 Mar 2007 12:10:49 -0000	1.50
@@ -173,7 +173,7 @@
   #
   # conditional links
   #
-  Package instproc make_link {-privilege -url object method args} {
+  Package instproc make_link {-privilege -link object method args} {
     my instvar id
  
     if {[info exists privilege]} {
@@ -189,15 +189,15 @@
     if {$granted} {
       if {[$object istype ::xowiki::Package]} {
         set base  [my package_url]
-        if {[info exists url]} {
-          return [uplevel export_vars -base [list $base$url] [list $args]]
+        if {[info exists link]} {
+          return [uplevel export_vars -base [list $base$link] [list $args]]
         } else {
           lappend args [list $method 1]
           return [uplevel export_vars -base [list $base] [list $args]]
         }
       } elseif {[$object istype ::xowiki::Page]} {
-        if {[info exists url]} {
-          set base $url
+        if {[info exists link]} {
+          set base $link
         } else {
           set base [my url]
         }
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	19 Feb 2007 10:01:28 -0000	1.7
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	15 Mar 2007 12:10:49 -0000	1.8
@@ -108,8 +108,9 @@
                            -mode_3_fmt "%d %b %Y, at %X"]
       
       if {$summary} {
-        # we need always: package_id name title creator creation_user pretty_date
-        set p [Page new -package_id $package_id -name $name -title $title -creator $creator]
+        # we need always: package_id item_id name title creator creation_user pretty_date
+        set p [Page new -package_id $package_id -item_id $item_id \
+                   -name $name -title $title -creator $creator]
         $p set creation_user $creation_user
         $p set description [expr {$description eq "" && $body ne ""? \
                                       "[string range $body 0 150]..." : $description}]
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 -r1.26 -r1.27
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Mar 2007 10:27:31 -0000	1.26
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	15 Mar 2007 12:10:49 -0000	1.27
@@ -487,18 +487,50 @@
       set sql "select count(*) as nr,tag from xowiki_tags where \
         user_id=[::xo::cc user_id] and package_id=$package_id group by tag order by tag"
     }
-    set content "<h3>$label</h3> <BLOCKQUOTE>"
     set entries [list]
     set url [expr {[info exists page] ? "[$package_id package_url]$page" : [::xo::cc url]}]
     db_foreach get_counts $sql {
       set s [expr {$summary ? "&summary=$summary" : ""}]
       set href $url?$tag_type=[ad_urlencode $tag]$s
       lappend entries "$tag <a href='$href'>($nr)</a>"
     }
-    append content "[join $entries {, }]</BLOCKQUOTE>\n"
-    return $content
+    return [expr {[llength $entries]  > 0 ? 
+                  "<h3>$label</h3> <BLOCKQUOTE>[join $entries {, }]</BLOCKQUOTE>\n" :
+                  ""}]
   }
 
+  Class create my-tags \
+      -superclass ::xowiki::Portlet \
+      -parameter {{__decoration none}}
+  
+  my-tags instproc render {} {
+
+    my initialize -parameter {
+    }
+    my get_parameters
+    my instvar __including_page
+    set p_link [$package_id pretty_link [$__including_page name]]
+    set return_url "[::xo::cc url]?[::xo::cc actual_query]"
+    set weblog_page [$package_id get_parameter weblog_page weblog]
+    set save_tag_link [$package_id make_link -link $p_link $__including_page \
+                           save-tags return_url]
+    set popular_tags_link [$package_id make_link -link $p_link $__including_page \
+                               popular-tags return_url weblog_page]
+    set tags_with_links [$__including_page render_my_tags tags]
+
+    set content [subst -nobackslashes {
+      #xowiki.your_tags_label#: $tags_with_links
+      (<a href='#' onclick='document.getElementById("[self]-edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>,
+       <a href='#' onclick='get_popular_tags("$popular_tags_link","[self]");return false;'>#xowiki.popular_tags_link#</a>)
+      <span id='[self]-edit_tags' style='display: none'>
+      <FORM action="$save_tag_link" method='POST'>
+        <INPUT name='new_tags' type='text' value="$tags">
+      </FORM>
+      </span>
+      <span id='[self]-popular_tags' style='display: none'></span><br/>
+    }]
+    return $content
+  }
 }
 
 namespace eval ::xowiki::portlet {
@@ -909,7 +941,7 @@
       set p [::Generic::CrItem instantiate -item_id 0 -revision_id $page_id]
       $p destroy_on_cleanup
       set p_link [$package_id pretty_link $name]
-      set edit_link [$package_id make_link -url $p_link $p edit return_url]
+      set edit_link [$package_id make_link -link $p_link $p edit return_url]
       if {$edit_link ne ""} {
         set edit_markup "<div style='float: right'><a href=\"$edit_link\"><image src='/resources/acs-subsite/Edit16.gif' border='0' ></a></div>"
       } else {
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 -r1.42 -r1.43
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Mar 2007 10:27:31 -0000	1.42
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	15 Mar 2007 12:10:49 -0000	1.43
@@ -9,6 +9,21 @@
 
 
 namespace eval ::xowiki {
+
+  Page instproc render_my_tags {-weblog_page tags_var} {
+    my upvar $tags_var tags
+    my instvar item_id package_id
+    ::xowiki::Page requireJS  "/resources/xowiki/get-http-object.js"
+    set entries [list]
+    if {![info exists weblog_page]} {
+      set weblog_page [$package_id get_parameter weblog_page weblog]
+    }
+    set tags [lsort [::xowiki::Page get_tags -user_id [::xo::cc user_id] \
+                         -item_id $item_id -package_id $package_id]]
+    set href [$package_id package_url]$weblog_page?summary=1
+    foreach tag $tags {lappend entries "<a href='$href&tag=[ad_urlencode $tag]'>$tag</a>"}
+    return [join [lsort $entries] {, }]
+  }
   
   Page instproc view {} {
     # view is used only for the toplevel call, when the xowiki page is viewed
@@ -17,6 +32,13 @@
     $package_id instvar folder_id  ;# this is the root folder
     ::xowiki::Page set recursion_count 0
 
+    set template_file [my query_parameter "template_file" \
+                           [::$package_id get_parameter template_file view-default]]
+
+    if {[my isobject ::xowiki::$template_file]} {
+      $template_file before_render
+    }
+    
     set content [my render]
     my log "--after render"
 
@@ -50,16 +72,7 @@
         ![my exists_query_parameter no_tags]} {
       # only activate tags when the user is logged in
       set no_tags [expr {[::xo::cc user_id] == 0}]
-      set tags ""
-      if {!$no_tags} {
-        ::xowiki::Page requireJS  "/resources/xowiki/get-http-object.js"
-        set entries [list]
-        set tags [lsort [::xowiki::Page get_tags -user_id [::xo::cc user_id] \
-                             -item_id $item_id -package_id $package_id]]
-        set href [$package_id package_url]weblog?summary=1
-        foreach tag $tags {lappend entries "<a href='$href&tag=[ad_urlencode $tag]'>$tag</a>"}
-        set tags_with_links [join $entries {, }]
-      }
+      if {!$no_tags} {set tags_with_links [my render_my_tags tags]}
     }
     #my log "--after tags"
 
@@ -180,8 +193,8 @@
       set edit_link   [$package_id make_link [self] edit return_url]
       set delete_link [$package_id make_link [self] delete return_url] 
       set new_link    [$package_id make_link $package_id edit-new object_type return_url autoname] 
-      set admin_link  [$package_id make_link -privilege admin -url admin/ $package_id {} {}] 
-      set index_link  [$package_id make_link -privilege public -url "" $package_id {} {}]
+      set admin_link  [$package_id make_link -privilege admin -link admin/ $package_id {} {}] 
+      set index_link  [$package_id make_link -privilege public -link "" $package_id {} {}]
       set save_tag_link [$package_id make_link [self] save-tags]
       set popular_tags_link [$package_id make_link [self] popular-tags]
       set create_in_req_locale_link ""
@@ -221,8 +234,6 @@
       } else {
         # use adp file
         foreach css [$package_id get_parameter extra_css ""] {::xowiki::Page requireCSS $css}
-        set template_file [my query_parameter "template_file" \
-                               [::$package_id get_parameter template_file view-default]]
 
         if {![regexp {^[./]} $template_file]} {
           set template_file /packages/xowiki/www/$template_file
@@ -320,7 +331,7 @@
       set back_link [$package_id url]
     }
 
-    set index_link  [$package_id make_link -privilege public -url "" $package_id {} {}]
+    set index_link  [$package_id make_link -privilege public -link "" $package_id {} {}]
     set html [$package_id return_page -adp /packages/xowiki/www/edit \
                   -form f1 \
                   -variables {item_id edit_form_page_title context formTemplate
@@ -397,14 +408,17 @@
     my instvar package_id item_id
     ::xowiki::Page save_tags -user_id [::xo::cc user_id] -item_id $item_id \
         -package_id $package_id [my form_parameter new_tags]
+
     ::$package_id returnredirect \
         [my query_parameter "return_url" [$package_id url]]
   }
 
   Page instproc popular-tags {} {
     my instvar package_id item_id parent_id
-    set limit [my query_parameter "limit" 20]
-    set href [$package_id package_url]weblog?summary=1
+    set limit       [my query_parameter "limit" 20]
+    set weblog_page [$package_id get_parameter weblog_page weblog]
+    set href        [$package_id pretty_link $weblog_page]?summary=1
+
     set entries [list]
     db_foreach get_popular_tags \
         "select count(*) as nr,tag from xowiki_tags \
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/xowiki/www/oacs-view.adp	14 Mar 2007 13:41:04 -0000	1.23
+++ openacs-4/packages/xowiki/www/oacs-view.adp	15 Mar 2007 12:10:50 -0000	1.24
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Mar 14 14:38:53 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Mar 15 12:59:48 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -8,15 +8,15 @@
     
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
   <script type="text/javascript">
-function get_popular_tags() {
+function get_popular_tags(popular_tags_link, prefix) {
   var http = getHttpObject();
-  http.open('GET', "@popular_tags_link@", true);
+  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');
+       var e = document.getElementById(prefix + '-popular_tags');
        e.innerHTML = http.responseText;
        e.style.display = 'block';
       }
@@ -77,12 +77,12 @@
 </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'>
+(<a href='#' onclick='document.getElementById("-edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
+<a href='#' onclick='get_popular_tags("@popular_tags_link@","");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/>
+<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@
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.2 -r1.3
--- openacs-4/packages/xowiki/www/oacs-view2.adp	14 Mar 2007 13:41:04 -0000	1.2
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	15 Mar 2007 12:10:50 -0000	1.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Mar 14 14:38:53 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Mar 15 12:59:48 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -9,15 +9,15 @@
     
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
   <script type="text/javascript">
-function get_popular_tags() {
+function get_popular_tags(popular_tags_link, prefix) {
   var http = getHttpObject();
-  http.open('GET', "@popular_tags_link@", true);
+  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');
+       var e = document.getElementById(prefix + '-popular_tags');
        e.innerHTML = http.responseText;
        e.style.display = 'block';
       }
@@ -58,31 +58,31 @@
 table.mini-calendar {width: 200px ! important;}
 #sidebar {min-width: 220px ! important; top: 0px; overflow: visible;}
 </style>
-<div style='float: left; width: 62%; overflow: visible ! important;'>
+<div style='float: left; width: 62%'>
 @top_portlets;noquote@
 @content;noquote@
-</div>
+</div>  <!-- float left -->
 <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">
 <include src="/packages/xowiki/www/portlets/weblog-mini-calendar" 
 	 &__including_page=page 
-	 page="weblog-portlet" summary="1">
+         summary="1" noparens="1">
 <include src="/packages/xowiki/www/portlets/include" 
 	 &__including_page=page 
-	 portlet="tags -decoration plain -page weblog-portlet -summary 1">
+	 portlet="tags -decoration plain -summary 1">
 <include src="/packages/xowiki/www/portlets/include" 
 	 &__including_page=page 
-	 portlet="tags -popular 1 -limit 30 -decoration plain -page weblog-portlet -summary 1">
+	 portlet="tags -popular 1 -limit 30 -decoration plain -summary 1">
 <hr>
 <include src="/packages/xowiki/www/portlets/include" 
 	 &__including_page=page 
-	 portlet="presence -interval {10 minutes} -decoration plain">
+	 portlet="presence -interval {30 minutes} -decoration plain">
 </div>
 </div>
-</div>
+</div> <!-- sidebar -->
 
 </div> <!-- right 70% -->
 
@@ -106,12 +106,12 @@
 </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'>
+(<a href='#' onclick='document.getElementById("-edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
+<a href='#' onclick='get_popular_tags("@popular_tags_link@","");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/>
+<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@
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/xowiki/www/view-default.adp	14 Mar 2007 13:41:04 -0000	1.19
+++ openacs-4/packages/xowiki/www/view-default.adp	15 Mar 2007 12:10:50 -0000	1.20
@@ -1,19 +1,19 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Mar 14 14:38:53 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Mar 15 12:59:48 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">
-function get_popular_tags() {
+function get_popular_tags(popular_tags_link, prefix) {
   var http = getHttpObject();
-  http.open('GET', "@popular_tags_link@", true);
+  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');
+       var e = document.getElementById(prefix + '-popular_tags');
        e.innerHTML = http.responseText;
        e.style.display = 'block';
       }
@@ -62,12 +62,12 @@
 </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'>
+(<a href='#' onclick='document.getElementById("-edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
+<a href='#' onclick='get_popular_tags("@popular_tags_link@","");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/>
+<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@
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-links.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/www/view-links.adp	14 Mar 2007 13:41:04 -0000	1.9
+++ openacs-4/packages/xowiki/www/view-links.adp	15 Mar 2007 12:10:50 -0000	1.10
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Mar 14 14:38:53 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Mar 15 12:59:48 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/Attic/view-plain.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/xowiki/www/view-plain.adp	14 Mar 2007 13:41:04 -0000	1.5
+++ openacs-4/packages/xowiki/www/view-plain.adp	15 Mar 2007 12:10:50 -0000	1.6
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Wed Mar 14 14:38:53 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Mar 15 12:59:48 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/portlets/weblog-mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/weblog-mini-calendar.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl	14 Mar 2007 13:41:04 -0000	1.5
+++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl	15 Mar 2007 12:10:50 -0000	1.6
@@ -1,9 +1,11 @@
 ::xowiki::Page requireCSS "/resources/calendar/calendar.css"
+set package_id        [::xo::cc package_id]
 set folder_id         [$__including_page set parent_id]
 set including_item_id [$__including_page set item_id]
 
 if {![exists_and_not_null base_url]} {
-  set base_url [expr {[info exists page] ? "[[::xo::cc package_id] package_url]$page" : [::xo::cc url]}]
+  if {![info exists page]} {set page  [$package_id get_parameter weblog_page]}
+  set base_url [$package_id pretty_link $page]
 }
 
 set date [ns_queryget date]
@@ -117,7 +119,9 @@
   }
 
   # ns_log notice "--D julian_date = $julian_date [dt_julian_to_ansi $julian_date] //$ansi_date"
-  set count [expr {[info exists entries($ansi_date)] ? "($entries($ansi_date))" : ""}]
+  set count [expr {[info exists entries($ansi_date)] ? 
+                   ([info exists noparens] ? $entries($ansi_date) : "($entries($ansi_date))") 
+                   : ""}]
   if {$today_p} {
     set class today
   } elseif {$active_p} {