Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	24 Apr 2006 08:24:04 -0000	1.6
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	23 May 2006 17:58:47 -0000	1.7
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.25" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.27" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="back">Zur�ck</msg>
   <msg key="content">Inhalt</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	24 Apr 2006 08:24:04 -0000	1.6
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	23 May 2006 17:58:47 -0000	1.7
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.25" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.27" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="admin">Admin</msg>
   <msg key="back">Back</msg>
   <msg key="content">Content</msg>
   <msg key="creator">Creator</msg>
Index: openacs-4/packages/xowiki/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.adp,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/xowiki/www/view.adp	23 May 2006 08:30:45 -0000	1.18
+++ openacs-4/packages/xowiki/www/view.adp	23 May 2006 17:58:47 -0000	1.19
@@ -10,7 +10,7 @@
 
 #wikicmds {position: relative; top: -24px;  right: 0px; height: 0px;
 	  text-align: right;  font-family: sans-serif; font-size: 85%;color: #7A7A78;}
-#portal #wikicmds {top: -80px}
+#portal #wikicmds {top: -90px}
 #wikicmds a, #wikicmds a:visited { color: #7A7A78; text-decoration: none;}
 #wikicmds a:hover {text-decoration: underline;}
 #wikicmds a:active {color: rgb(255,153,51);}
@@ -113,6 +113,9 @@
    <a href="@new_link@" accesskey='n'>#xowiki.new#</a> &middot;
    <a href="@delete_link@" accesskey='d'>#xowiki.delete#</a> &middot;
   </if>
+  <if @admin_p@ eq 1>
+   <a href="@admin_link@" accesskey='a'>#xowiki.admin#</a> &middot;
+  </if>
    <a href="@index_link@" accesskey='i'>#xowiki.index#</a> 
 </div>
 
Index: openacs-4/packages/xowiki/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/xowiki/www/view.tcl	22 May 2006 08:38:49 -0000	1.18
+++ openacs-4/packages/xowiki/www/view.tcl	23 May 2006 17:58:47 -0000	1.19
@@ -17,20 +17,22 @@
   {master 1}
 }
 
-permission::require_permission -object_id [ad_conn package_id] -privilege "read"
-set write_p [permission::permission_p -object_id [ad_conn package_id] -privilege "write"]
+set package_id [ad_conn package_id]
+permission::require_permission -object_id $package_id -privilege "read"
+set write_p [permission::permission_p -object_id $package_id -privilege "write"]
+set admin_p [permission::permission_p -object_id $package_id -privilege "admin"]
 
 ::xowiki::Page set recursion_count 0
 set page [::Generic::CrItem instantiate \
 	      -item_id $item_id \
 	      -revision_id $revision_id]
 
 if {![info exists folder_id]} {set folder_id [$page set parent_id]}
-::xowiki::Page require_folder_object -folder_id $folder_id -package_id [ad_conn package_id]
+::xowiki::Page require_folder_object -folder_id $folder_id -package_id $package_id
 
 set content [$page render]
 
-if {[ad_parameter "user_tracking" -package_id [ad_conn package_id]] } {
+if {[ad_parameter "user_tracking" -package_id $package_id] } {
   $page record_last_visited
 }
 set references [$page references]
@@ -44,11 +46,12 @@
 if {$master} {
   set context [list $title]
 
-  set base [apm_package_url_from_id [ad_conn package_id]]
+  set base [apm_package_url_from_id $package_id]
   set rev_link    [export_vars -base ${base}revisions {{page_id $item_id} name}]
   set edit_link   [export_vars -base ${base}edit {item_id}]
   set delete_link [export_vars -base ${base}delete {item_id}]
   set new_link    [export_vars -base ${base}edit {object_type}]
+  set admin_link  [export_vars -base ${base}admin/ {}]
   set index_link  [export_vars -base ${base} {}]
 
   set return_url  [::xowiki::Page pretty_link $name]