Index: openacs-4/packages/acs-admin/lib/site-wide-services.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/site-wide-services.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/lib/site-wide-services.adp	3 Sep 2003 10:35:24 -0000	1.1
@@ -0,0 +1,9 @@
+<ul>
+  <li><a href="@acs_admin_url@users">Users</a>
+  <li><a href="@acs_admin_url@apm">Package Manager</a>
+  <li><a href="@acs_admin_url@cache">Cache Info</a>
+  <li><a href="@acs_admin_url@tests">Tests</a>
+  <li><a href="@acs_automated_testing_url@admin">Automated Testing</a>
+  <li><a href="@acs_lang_admin_url@">Internationalization/Localization</a>
+</ul>
+<p>
Index: openacs-4/packages/acs-admin/lib/site-wide-services.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/site-wide-services.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/lib/site-wide-services.tcl	3 Sep 2003 10:35:24 -0000	1.1
@@ -0,0 +1,6 @@
+set acs_admin_url [apm_package_url_from_key "acs-admin"]
+
+set acs_automated_testing_url [apm_package_url_from_key "acs-automated-testing"]
+
+set acs_lang_admin_url "[apm_package_url_from_key "acs-lang"]admin/"
+
Index: openacs-4/packages/acs-admin/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/index.adp	28 Aug 2003 09:41:37 -0000	1.2
+++ openacs-4/packages/acs-admin/www/index.adp	3 Sep 2003 10:35:24 -0000	1.3
@@ -3,27 +3,23 @@
 
 <h3>Core Services</h3>
 
-<ul>
-  <li><a href=apm>ACS Package Manager</a>
-  <li><a href=users>Users</a>
-  <li><a href=cache>Cache info</a>
-</ul>
-<p>
+<include src="/packages/acs-admin/lib/site-wide-services">
 
-<if @subsites:rowcount@ gt 0>
-  <h3>Subsite Administration</h3>
+<if @packages:rowcount@ gt 0>
+  <h3>Package Administration</h3>
   <ul>
-    <multiple name="subsites">
-      <li><a href="@subsites.admin_url@">@subsites.instance_name@ Administration</a></li>
+    <multiple name="packages">
+      <li><a href="@packages.admin_url@/\">@packages.pretty_name@</a></li>
     </multiple>
   </ul>
 </if>
 
-<if @packages:rowcount@ gt 0>
-  <h3>Package Administration</h3>
+<if @subsites:rowcount@ gt 0>
+  <h3>Subsite Administration</h3>
   <ul>
-    <multiple name="packages">
-      <li><a href="@packages.admin_url@/\">@packages.pretty_name@</a></li>
+    <multiple name="subsites">
+      <li><a href="@subsites.admin_url@">@subsites.instance_name@ Administration</a></li>
     </multiple>
   </ul>
 </if>
+
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/admin/index.adp	18 Aug 2003 15:30:39 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	3 Sep 2003 10:35:24 -0000	1.13
@@ -15,13 +15,7 @@
 <p>To administer the site-wide services of OpenACS, use:</p>
 <ul>
 <li><a href="@acs_admin_url@">@acs_admin_name@</a>
-<ul>
-<li><a href="@acs_admin_url@users">Users</a>
-<li><a href="@acs_admin_url@apm">Package Manager</a>
-<li><a href="@acs_admin_url@cache">Cache Info</a>
-<li><a href="@acs_admin_url@tests">Tests</a>
-<li><a href="@acs_automated_testing_url@admin">Automated Testing</a>
-<li><a href="@acs_lang_admin_url@">Internationalization/Localization</a>
 
+<include src="/packages/acs-admin/lib/site-wide-services">
+
 </ul>
-</ul>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	18 Aug 2003 15:30:39 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	3 Sep 2003 10:35:24 -0000	1.9
@@ -19,15 +19,13 @@
 array set this_node [site_node::get -url [ad_conn url]]
 set subsite_name $this_node(instance_name)
 
-set acs_admin_url "/acs-admin/"
+set acs_admin_url [apm_package_url_from_key "acs-admin"]
 array set acs_admin_node [site_node::get -url $acs_admin_url]
 set acs_admin_name $acs_admin_node(instance_name)
 
-# JA: temporary: should replace this with a real function
-set acs_automated_testing_url "/automated-test/" 
+set acs_automated_testing_url [apm_package_url_from_key "acs-automated-testing"]
 
-# JA: temporary: should replace this with a real function
-set acs_lang_admin_url "/acs-lang/admin/"
+set acs_lang_admin_url "[apm_package_url_from_key "acs-lang"]admin/"
 
 # Dirk: temporary fix for noquote hacking
 set acs_admin_available_p 1