Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	8 Jan 2008 16:22:05 -0000	1.9
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	18 Jan 2008 21:53:50 -0000	1.10
@@ -1031,10 +1031,12 @@
     if {![info exists page]} {set page  [$package_id get_parameter weblog_page]}
     set base_url [$package_id pretty_link $page]
 
+    set href [$package_id package_url]/tag/
     db_foreach [my qn get_counts] $sql {
       set s [expr {$summary ? "&summary=$summary" : ""}]
-      set href $base_url?$tag_type=[ad_urlencode $tag]$s
-      lappend entries "$tag <a href='$href'>($nr)</a>"
+      #set href $base_url?$tag_type=[ad_urlencode $tag]$s
+      #lappend entries "$tag <a href='$href'>($nr)</a>"
+      lappend entries "$tag <a rel='tag' href='$href[ad_urlencode $tag]'>($nr)</a>"
     }
     return [expr {[llength $entries]  > 0 ? 
                   "<h3>$label</h3> <BLOCKQUOTE>[join $entries {, }]</BLOCKQUOTE>\n" :
@@ -1066,10 +1068,13 @@
 
     set tags [lsort [::xowiki::Page get_tags -user_id [::xo::cc user_id] \
                          -item_id [$__including_page item_id] -package_id $package_id]]
-    set href [$package_id package_url]$weblog_page?summary=$summary
+    set href [$package_id package_url]$weblog_page?summary=$summary&tag
 
     set entries [list]
-    foreach tag $tags {lappend entries "<a href='$href&tag=[ad_urlencode $tag]'>$tag</a>"}
+
+    #foreach tag $tags {lappend entries "<a href='$href&tag=[ad_urlencode $tag]'>$tag</a>"}
+    set href [$package_id package_url]/tag/
+    foreach tag $tags {lappend entries "<a rel='tag' href='$href[ad_urlencode $tag]?summary=$summary'>$tag</a>"}
     set tags_with_links [join [lsort $entries] {, }]
 
     if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]}
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.109 -r1.110
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	17 Jan 2008 13:00:14 -0000	1.109
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	18 Jan 2008 21:53:50 -0000	1.110
@@ -439,7 +439,7 @@
     if {[regexp {^pages/(..)/(.*)$} $path _ lang local_name]} {
     } elseif {[regexp {^(..)/(.*)$} $path _ lang local_name]} {
     } elseif {[regexp {^(..):(.*)$} $path _ lang local_name]} {
-    } elseif {[regexp {^(file|image|swf|download)/(.*)$} $path _ lang local_name]} {
+    } elseif {[regexp {^(file|image|swf|download|tag)/(.*)$} $path _ lang local_name]} {
     } else {
       set key queryparm(lang)
       if {[info exists $key]} {
@@ -486,6 +486,15 @@
           }
           my log "--try image:$local_name -> $item_id"
         }
+        if {$item_id == 0 && $lang eq "tag"} {
+	  set tag $local_name
+	  set summary [::xo::cc query_parameter summary 0]
+	  set weblog_page [my get_parameter weblog_page]
+	  my get_name_and_lang_from_path $weblog_page lang local_name
+	  set name $lang:$local_name
+	  my set object $weblog_page
+	  ::xo::cc set actual_query tag=$tag&summary=$summary
+	}
         if {$item_id == 0} {
           set nname   [my normalize_name $name]
           set item_id [::xo::db::CrClass lookup -name $nname -parent_id $folder_id]
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.32 -r1.33
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	7 Dec 2007 14:25:04 -0000	1.32
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	18 Jan 2008 21:53:50 -0000	1.33
@@ -205,7 +205,8 @@
     }
     
     array set smsg {1 full 0 summary}
-    set flink "<a href='[::xo::cc url]?summary=[expr {!$summary}]$query_parm'>$smsg($summary)</a>"
+    set weblog_href [$package_id package_url][$package_id get_parameter weblog_page]
+    set flink "<a href='$weblog_href?summary=[expr {!$summary}]$query_parm'>$smsg($summary)</a>"
     
     if {$page_number ne ""} {
       set nr [llength [$items children]] 
@@ -214,7 +215,7 @@
       set range [expr {$nr > 1 ? "$from - $to" : $from}]
       
       if {$filter_msg ne ""} {
-        append filter_msg ", $range of $nr_items $entry_label (<a href='[::xo::cc url]'>all</a>, $flink)"
+        append filter_msg ", $range of $nr_items $entry_label (<a href='$weblog_href'>all</a>, $flink)"
       } else {
         append filter_msg "Showing $range of $nr_items $entry_label ($flink)"
       }