Index: openacs-4/packages/acs-admin/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/Attic/index-oracle.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-admin/www/index-oracle.xql	27 Apr 2001 04:09:35 -0000	1.1
+++ openacs-4/packages/acs-admin/www/index-oracle.xql	25 Aug 2003 13:45:24 -0000	1.1.4.1
@@ -5,7 +5,7 @@
 <fullquery name="subsite_admin_urls">      
       <querytext>
       
-    select site_node.url(node_id) || 'admin/' as subsite_admin_url, instance_name
+    select site_node.url(node_id) || 'admin/' as admin_url, instance_name
     from site_nodes s, apm_packages p
     where s.object_id = p.package_id
     and p.package_key = 'acs-subsite'
Index: openacs-4/packages/acs-admin/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/Attic/index-postgresql.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-admin/www/index-postgresql.xql	27 Apr 2001 04:09:35 -0000	1.1
+++ openacs-4/packages/acs-admin/www/index-postgresql.xql	25 Aug 2003 13:45:24 -0000	1.1.4.1
@@ -5,7 +5,7 @@
 <fullquery name="subsite_admin_urls">      
       <querytext>
       
-    select site_node__url(node_id) || 'admin/' as subsite_admin_url, instance_name
+    select site_node__url(node_id) || 'admin/' as admin_url, instance_name
     from site_nodes s, apm_packages p
     where s.object_id = p.package_id
     and p.package_key = 'acs-subsite'
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/index.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.tcl,v
diff -u -r1.3.2.3 -r1.3.2.4
--- openacs-4/packages/acs-admin/www/index.tcl	7 Jul 2003 13:24:02 -0000	1.3.2.3
+++ openacs-4/packages/acs-admin/www/index.tcl	25 Aug 2003 13:45:24 -0000	1.3.2.4
@@ -5,72 +5,24 @@
     @cvs-id $Id$
 }
 
-set title "[ad_conn instance_name] for [ad_system_name]"
+set page_title "[ad_conn instance_name] for [ad_system_name]"
 
-set page "
-[ad_admin_header $title]
-<h2>$title</h2>
-[ad_context_bar]
-<hr>
-
-<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>
-"
-
-db_foreach subsite_admin_urls {
-    select site_node.url(node_id) || 'admin/' as subsite_admin_url, 
+db_multirow subsites subsite_admin_urls {
+    select site_node.url(node_id) || 'admin/' as admin_url, 
            instance_name
     from site_nodes s, apm_packages p
     where s.object_id = p.package_id
     and p.package_key = 'acs-subsite'
-} { 
-    lappend subsite_admin_list "<a href=\"$subsite_admin_url\">$instance_name Administration</a>"
-} if_no_rows {
-    set subsite_admin_widget "No subsites are available on this system."
 }
 
-if {! [exists_and_not_null subsite_admin_widget] } {
-    set subsite_admin_widget "
-<h3>Subsite Administration</h3>
-<ul>"
-    foreach url $subsite_admin_list {
-	append subsite_admin_widget "\n    <li>$url</li><p>"
-    }
-    append subsite_admin_widget "
-</ul>\n"
-}
-
-set package_admin_widget "<h3>Package Administration</h3> <ul>"
-set packages_to_admin_p 0
-db_foreach installed_packages {
+db_multirow -extend { admin_url } packages installed_packages {
     select package_key,
-           pretty_name as package_pretty_name
+           pretty_name as pretty_name
     from apm_package_types
 } {
     if { [apm_package_installed_p $package_key] && [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] } {
-        append package_admin_widget "<li><a href=\"package/$package_key/\">$package_pretty_name</a></li>"
-        set packages_to_admin_p 1
+        set admin_url "package/$package_key/"
+    } else {
+        continue
     }
 } 
-if { ! $packages_to_admin_p } {
-    append package_admin_widget "<i>No packages installed with site-wide administration UI</i>"
-}
-append package_admin_widget "</ul>"
-
-append page "
-$subsite_admin_widget
-
-<p>
-$package_admin_widget
-
-<p>
-[ad_admin_footer]
-"
-
-ns_return 200 text/html $page