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.3 -r1.4
--- openacs-4/packages/acs-admin/www/index-oracle.xql	28 Aug 2003 11:59:01 -0000	1.3
+++ openacs-4/packages/acs-admin/www/index-oracle.xql	31 Dec 2003 01:03:44 -0000	1.4
@@ -5,11 +5,12 @@
 <fullquery name="subsite_admin_urls">      
       <querytext>
       
-    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'
-    order by upper(instance_name), instance_name
+    select s.node_id,
+           site_node.url(node_id) as node_url,
+           instance_name
+    from   site_nodes s, apm_packages p
+    where  s.object_id = p.package_id
+    and    p.package_key = 'acs-subsite'
 
       </querytext>
 </fullquery>
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.3 -r1.4
--- openacs-4/packages/acs-admin/www/index-postgresql.xql	28 Aug 2003 11:59:01 -0000	1.3
+++ openacs-4/packages/acs-admin/www/index-postgresql.xql	31 Dec 2003 01:03:44 -0000	1.4
@@ -5,11 +5,12 @@
 <fullquery name="subsite_admin_urls">      
       <querytext>
       
-    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'
-    order by upper(instance_name), instance_name
+    select s.node_id,
+           site_node__url(node_id) as node_url,
+           instance_name
+    from   site_nodes s, apm_packages p
+    where  s.object_id = p.package_id
+    and    p.package_key = 'acs-subsite'
 
       </querytext>
 </fullquery>
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.8 -r1.9
--- openacs-4/packages/acs-admin/www/index.adp	21 Oct 2003 21:09:32 -0000	1.8
+++ openacs-4/packages/acs-admin/www/index.adp	31 Dec 2003 01:03:44 -0000	1.9
@@ -22,7 +22,7 @@
   <h3>Subsite Administration</h3>
   <ul>
     <multiple name="subsites">
-      <li><a href="@subsites.admin_url@">@subsites.instance_name@ Administration</a></li>
+      <li><a href="@subsites.admin_url@">@subsites.path_pretty@</a></li>
     </multiple>
   </ul>
 </if>
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.9 -r1.10
--- openacs-4/packages/acs-admin/www/index.tcl	11 Sep 2003 08:35:44 -0000	1.9
+++ openacs-4/packages/acs-admin/www/index.tcl	31 Dec 2003 01:03:44 -0000	1.10
@@ -7,8 +7,22 @@
 
 set page_title [ad_conn instance_name]
 
-db_multirow subsites subsite_admin_urls {}
+db_multirow -extend { admin_url path_pretty } subsites subsite_admin_urls {} {
+    set admin_url "${node_url}admin/"
+    set path_pretty $instance_name
+    array set node [site_node::get -node_id $node_id]
+    set parent_id $node(parent_id)
 
+    while { ![empty_string_p $parent_id] } {
+        array unset node
+        array set node [site_node::get -node_id $parent_id]
+        set path_pretty "$node(instance_name) > $path_pretty"
+        set parent_id $node(parent_id)
+    }
+}
+
+multirow sort subsites path_pretty
+
 db_multirow -extend { admin_url } packages installed_packages {} {
     if { [apm_package_installed_p $package_key] && [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"] } {
         set admin_url "package/$package_key/"