Index: openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/Attic/service-parameters-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql	17 Sep 2003 21:56:22 -0000	1.2
+++ openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql	17 Sep 2003 22:49:09 -0000	1.3
@@ -17,6 +17,7 @@
                             acs_permission.permission_p(package_id, :user_id, 'read') = 't'
                          or acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't'
                         )
+                    and   ap.package_key != 'acs-subsite'
                     order by instance_name
         </querytext>
     </fullquery>
Index: openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/Attic/service-parameters-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql	17 Sep 2003 21:56:22 -0000	1.2
+++ openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql	17 Sep 2003 22:49:09 -0000	1.3
@@ -17,6 +17,7 @@
                             acs_permission__permission_p(package_id, :user_id, 'read') = 't'
                          or acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read') = 't'
                         )
+                    and   ap.package_key != 'acs-subsite'
                     order by instance_name
         </querytext>
     </fullquery>
Index: openacs-4/packages/acs-admin/lib/service-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/service-parameters.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/lib/service-parameters.tcl	17 Sep 2003 21:56:22 -0000	1.2
+++ openacs-4/packages/acs-admin/lib/service-parameters.tcl	17 Sep 2003 22:49:09 -0000	1.3
@@ -2,21 +2,57 @@
 # Service parameters list
 #
 
+
+set user_id [ad_conn user_id]
+set swadmin_p 0
+db_multirow -extend { url admin_url param_url } packages services_select {} {
+    if { [file exists "[acs_package_root_dir $package_key]/www/"] } {
+        catch {
+            set url [apm_package_url_from_key $package_key]
+            if { ![empty_string_p $url] && [file exists "[acs_package_root_dir $package_key]/www/admin/"] } {
+                set admin_url "${url}admin/"
+            }
+            if { [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] } {
+                set sitewide_admin_url "/acs-admin/package/$package_key/"
+                set swadmin_p 1
+            }
+        }
+    }
+    if { $parameter_count > 0 } {
+        set param_url [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
+    }
+
+    if { [empty_string_p $url] && [empty_string_p $admin_url] && [empty_string_p $param_url] } {
+        continue
+    }
+}
+
 template::list::create \
     -name packages \
     -multirow packages \
     -elements {
         instance_name {
             label {Service}
+        }
+        www {
+            label "Pages"
             link_url_col url
-            link_html { title "Visit service interface" }
+            link_html { title "Visit service pages" }
+            display_template {<if @packages.url@ not nil>Pages</if>}
         }
         admin {
             label "Administration"
             link_url_col admin_url
             link_html { title "Service administration" }
             display_template {<if @packages.admin_url@ not nil>Administration</if>}
         }
+        sitewide_admin {
+            label "Site-Wide Admin"
+            link_url_col sitewide_admin_url
+            link_html { title "Service administration" }
+            display_template {<if @packages.sitewide_admin_url@ not nil>Administration</if>}
+            hide_p {[ad_decode $swadmin_p 1 0 1]}
+        }
         parameters {
             label "Parameters"
             link_url_col param_url
@@ -25,22 +61,3 @@
         }
     }
 
-set user_id [ad_conn user_id]
-db_multirow -extend { url admin_url param_url } packages services_select {} {
-    if { [file exists "[acs_package_root_dir $package_key]/www/"] } {
-        catch {
-            set url [apm_package_url_from_key $package_key]
-            if { ![empty_string_p $url] && [file exists "[acs_package_root_dir $package_key]/www/admin/"] } {
-                set admin_url "${url}admin/"
-            }
-        }
-    }
-    if { $parameter_count > 0 } {
-        set param_url [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
-    }
-
-    if { [empty_string_p $url] && [empty_string_p $admin_url] && [empty_string_p $param_url] } {
-        continue
-    }
-}
-