Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/xowiki/xowiki.info	10 Aug 2006 01:14:41 -0000	1.24
+++ openacs-4/packages/xowiki/xowiki.info	10 Aug 2006 08:32:06 -0000	1.25
@@ -38,6 +38,7 @@
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
         </callbacks>
         <parameters>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="show_per_object_categories"  default="1" description="If enabled it shows on a page view the categories assigned to this object"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="subst_blank_in_name"  default="1" description="normalize names of pages in a media wiki style. Most dominantly, spaces are turned into blanks."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="template_file"  default="view-default" description="name of the adp file to be used for viewing xowiki pages. Alternatively, one can use oacs-view for providing a view with the category-tree on the left or any other tailored view"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="use_gc"  default="1" description="use general comments package "/>
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 -N -r1.11 -r1.12
--- openacs-4/packages/xowiki/www/admin/index.tcl	9 Aug 2006 15:42:06 -0000	1.11
+++ openacs-4/packages/xowiki/www/admin/index.tcl	10 Aug 2006 08:32:06 -0000	1.12
@@ -10,21 +10,22 @@
 
 set package_id [ad_conn package_id]
 set Package    [::xowiki::Package create ::$package_id]
-$Package instvar folder_id
 
 set context [list]
 set supertype ::xowiki::Page
 set title "Administer all kind of [$supertype set pretty_plural]"
 
 set object_type_key [$supertype set object_type_key]
 set object_types    [$supertype object_types]
+set return_url      [ns_conn url]
 
 TableWidget t1 -volatile \
     -actions [subst {
-      Action new -label all -url list
+      Action new -label "all pages" -url list
+      Action new -label parameters -url [export_vars -base /shared/parameters {package_id return_url}]
       Action new -label export -url export
       Action new -label import -url import
-      Action new -label permissions -url /admin/applications/permissions?package_id=$package_id
+      Action new -label permissions -url [export_vars -base permissions {package_id}]
     }] \
     -columns {
       Field object_type -label [_ xowiki.page_type]
@@ -44,7 +45,8 @@
       t1 add \
 	  -object_type $object_type \
 	  -instances [db_list count [$object_type instance_select_query \
-				 -folder_id $folder_id -count 1 -with_subtypes false]] \
+					 -folder_id [$Package set folder_id] \
+					 -count 1 -with_subtypes false]] \
 	  -instances.href [export_vars -base ./list {object_type}] \
 	  -edit.href   [export_vars -base $base {{edit-new 1} object_type return_url}] \
 	  -delete.href [export_vars -base delete-type {object_type}] \
@@ -56,5 +58,5 @@
 
 # set up categories
 set category_map_url [export_vars -base \
-	  [site_node::get_package_url -package_key categories]cadmin/one-object \
+	  [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/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/permissions.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/admin/permissions.adp	10 Aug 2006 08:32:06 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@package_id@" user_add_url="permissions-user-add" return_url=@return_url@>
Index: openacs-4/packages/xowiki/www/admin/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/permissions.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/admin/permissions.tcl	10 Aug 2006 08:32:06 -0000	1.1
@@ -0,0 +1,15 @@
+ad_page_contract {
+    Permissions for the subsite itself.
+    
+    @author Gustaf Neumann
+    @creation-date 2006-08-10
+    @cvs-id $Id: permissions.tcl,v 1.1 2006/08/10 08:32:06 gustafn Exp $
+} {
+    package_id:integer
+}
+
+set page_title "[apm_instance_name_from_id $package_id] Permissions"
+
+set context [list $page_title]
+set return_url [apm_package_url_from_id $package_id]admin
+