Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v
diff -u -r1.50 -r1.51
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	31 Oct 2008 14:39:55 -0000	1.50
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	6 Nov 2008 15:58:44 -0000	1.51
@@ -697,4 +697,19 @@
     close $F
   }
 
+  ad_proc -public -callback subsite::url -impl apm_package {
+    {-package_id:required}
+    {-object_id:required}
+    {-type ""}
+  } {
+    return the page_url for an object of type tasks_task
+  } {
+    ns_log notice "got package_id=$package_id, object_id=$object_id, type=$type"
+    ::xowiki::Package initialize -package_id $package_id
+    if {[::xotcl::Object isobject ::$package_id]} {
+      return [$package_id package_url]
+    } else {
+      return ""
+    }
+  }
 }
\ No newline at end of file
Index: openacs-4/packages/xowiki/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/admin/index.adp	5 Oct 2008 01:50:44 -0000	1.6
+++ openacs-4/packages/xowiki/www/admin/index.adp	6 Nov 2008 15:58:44 -0000	1.7
@@ -18,7 +18,6 @@
 a:link.rss {color: #FFF}
 </style>
 </property>
-<a href="@category_map_url@"  class="action_link">Site-Wide Categories</a>
 <a href="../?rss" class="rss">RSS</a>          
 @t1;noquote@
 
Index: openacs-4/packages/xowiki/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xowiki/www/admin/index.tcl	29 Jan 2008 23:04:07 -0000	1.21
+++ openacs-4/packages/xowiki/www/admin/index.tcl	6 Nov 2008 15:58:44 -0000	1.22
@@ -15,10 +15,16 @@
 
 set object_types    [$object_type object_types]
 set return_url      [ns_conn url]
+set category_url [export_vars \
+                      -base [site_node::get_package_url -package_key categories]cadmin/object-map \
+                      { { object_id $package_id } {ctx_id $package_id} }]
 
+lang::message::lookup "" xowiki.admin " "
 TableWidget t1 -volatile \
     -actions [subst {
       Action new -label "all pages" -url list
+      Action new -label "[lang::message::lookup {} categories.Categories Categories]" \
+          -url $category_url
       Action new -label parameters -url \
           [export_vars -base /shared/parameters {package_id return_url}]
       Action new -label export -url export
@@ -60,7 +66,3 @@
 
 set t1 [t1 asHTML]
 
-# set up categories
-set category_map_url [export_vars -base \
-          [site_node::get_package_url -package_key categories]cadmin/object-map \
-                          { { object_id $package_id } }]
\ No newline at end of file
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/xowiki/www/admin/list.tcl	10 Oct 2008 18:21:41 -0000	1.25
+++ openacs-4/packages/xowiki/www/admin/list.tcl	6 Nov 2008 15:58:44 -0000	1.26
@@ -34,10 +34,9 @@
 
 set return_url [expr {$per_type ? [export_vars -base [::$package_id url] object_type] :
                       [::$package_id url]}]
-# set up categories
-set category_map_url [export_vars -base \
-              [site_node::get_package_url -package_key categories]cadmin/one-object \
-                          { { object_id $package_id } }]
+set category_url [export_vars \
+                      -base [site_node::get_package_url -package_key categories]cadmin/object-map \
+                      { { object_id $package_id } {ctx_id $package_id} }]
 
 set actions ""
 foreach type $object_types {
@@ -49,6 +48,8 @@
         -label "[_ xotcl-core.add [list type [$type pretty_name]]]" \
         -url "$link" \
         -tooltip  "[_ xotcl-core.add_long [list type [$type pretty_name]]]"
+    Action new -label "[lang::message::lookup {} categories.Categories Categories]" \
+        -url $category_url
   }]
 }