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.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/index.adp	16 Sep 2002 12:40:27 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	19 Feb 2003 15:03:27 -0000	1.7
@@ -12,13 +12,5 @@
   <li><a href=object-types/>Object Types</a>
 </ul>
 
-<if @acs_admin_available_p@ true>
-  To administer the site-wide services of OpenACS, use
-  <a href="@acs_admin_url@">@instance_name@</a>.
-</if>
-<else>
-  The Site-Wide Administration service is not available.  If you are a
-  site-wide administrator, use the <a href="site-map">Site Map</a> to
-  mount the Site-Wide Administration service.  This provides an
-  interface for administering the site-wide services of OpenACS.
-</else>
+To administer the site-wide services of OpenACS, use
+<a href="@acs_admin_url@">@acs_admin_name@</a>.
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.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	16 Sep 2002 12:40:27 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	19 Feb 2003 15:03:27 -0000	1.5
@@ -15,25 +15,12 @@
     instance_name:onevalue
 }
 
-set package_id [ad_conn object_id]
-set subsite_name [db_string subsite_name {
-    select p.instance_name 
-      from apm_packages p
-     where p.package_id = :package_id
-} -default "Subsite"]
+array set this_node [site_node::get -url [ad_conn url]]
+set subsite_name $this_node(instance_name)
 
-# Return the first available link to the Site-Wide Admin page.
-if {[db_0or1row acs_admin_url_get {
-    select site_node.url(node_id) acs_admin_url, instance_name
-    from site_nodes s, apm_packages p
-    where s.object_id = p.package_id
-    and p.package_key = 'acs-admin'
-    and rownum = 1
-}]} {
-    set acs_admin_available_p "t"
-} else {
-    set acs_admin_available_p "f"
-}
+set acs_admin_url "/acs-admin"
+array set acs_admin_node [site_node::get -url $acs_admin_url]
+set acs_admin_name $acs_admin_node(instance_name)
 
 set context {}