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.1 -r1.2
--- openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql	12 Sep 2003 12:39:44 -0000	1.1
+++ openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql	17 Sep 2003 21:56:22 -0000	1.2
@@ -5,8 +5,7 @@
 
     <fullquery name="services_select">
         <querytext>
-            select q.*
-            from   (select package_id,
+                    select package_id,
                            ap.package_key,
                            acs_object.name(package_id) as instance_name,
                            apm_package_type.num_parameters(ap.package_key) as parameter_count
@@ -18,9 +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'
                         )
-                   ) q
-            where  parameter_count > 0
-            order by instance_name
+                    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.1 -r1.2
--- openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql	12 Sep 2003 12:39:44 -0000	1.1
+++ openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql	17 Sep 2003 21:56:22 -0000	1.2
@@ -5,8 +5,7 @@
 
     <fullquery name="services_select">
         <querytext>
-            select q.*
-            from   (select package_id,
+                    select package_id,
                            ap.package_key,
                            acs_object__name(package_id) as instance_name,
                            apm_package_type__num_parameters(ap.package_key) as parameter_count
@@ -18,9 +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'
                         )
-                   ) q
-            where  parameter_count > 0 
-            order by instance_name
+                    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.1 -r1.2
--- openacs-4/packages/acs-admin/lib/service-parameters.tcl	12 Sep 2003 12:39:44 -0000	1.1
+++ openacs-4/packages/acs-admin/lib/service-parameters.tcl	17 Sep 2003 21:56:22 -0000	1.2
@@ -7,12 +7,40 @@
     -multirow packages \
     -elements {
         instance_name {
-            label {Package}
-            link_url_eval {[export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]}
-            link_html { title "Edit parameters" }
+            label {Service}
+            link_url_col url
+            link_html { title "Visit service interface" }
         }
+        admin {
+            label "Administration"
+            link_url_col admin_url
+            link_html { title "Service administration" }
+            display_template {<if @packages.admin_url@ not nil>Administration</if>}
+        }
+        parameters {
+            label "Parameters"
+            link_url_col param_url
+            link_html { title "Service parameters" }
+            display_template {<if @packages.param_url@ not nil>Parameters</if>}
+        }
     }
 
 set user_id [ad_conn user_id]
-db_multirow packages services_select {}
+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
+    }
+}
+
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.5 -r1.6
--- openacs-4/packages/acs-admin/www/index.adp	12 Sep 2003 13:45:15 -0000	1.5
+++ openacs-4/packages/acs-admin/www/index.adp	17 Sep 2003 21:56:22 -0000	1.6
@@ -23,7 +23,7 @@
   </ul>
 </if>
 
-<h3>Package Parameters</h3>
+<h3>Service Administration</h3>
 
 <include src="/packages/acs-admin/lib/service-parameters">