Index: openacs-4/packages/acs-subsite/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/index-oracle.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-subsite/www/index-oracle.xql	30 Apr 2001 20:07:31 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/index-oracle.xql	16 Dec 2002 19:40:15 -0000	1.1.4.1
@@ -19,6 +19,7 @@
     from site_nodes n
    where n.parent_id = :node_id
     and n.object_id is not null
+   order by name
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/acs-subsite/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/index-postgresql.xql,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/acs-subsite/www/index-postgresql.xql	30 Apr 2001 20:07:31 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/index-postgresql.xql	16 Dec 2002 19:40:15 -0000	1.3.4.1
@@ -19,6 +19,7 @@
     from site_nodes n
    where n.parent_id = :node_id
     and n.object_id is not null
+   order by name
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-subsite/www/index.adp	16 Sep 2002 12:58:04 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/index.adp	16 Dec 2002 19:40:15 -0000	1.4.2.1
@@ -13,9 +13,11 @@
  </else>
 
  <if @admin_p@ eq 1> 
-  <li> <a href="admin/">Administration</a></li>
+  <p>
+   <li> <a href="admin/">@subsite_name@ Administration</a></li>
+  </p>
  </if>
 </ul>
 
-<if @user_id@ eq 0><a href="/register/?return_url=/">login</a></if>
-<else><a href="register/logout">logout</a></else>
+<if @user_id@ eq 0><a href="@login_url@">Login</a></if>
+<else><a href="register/logout">Logout</a></else>
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-subsite/www/index.tcl	16 Sep 2002 12:58:04 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/index.tcl	16 Dec 2002 19:40:15 -0000	1.5.2.1
@@ -28,11 +28,8 @@
 
 set node_id [ad_conn node_id]
 
-db_multirow nodes site_nodes {
-  select site_node.url(n.node_id) as url, acs_object.name(n.object_id) as name
-    from site_nodes n
-   where n.parent_id = :node_id
-    and n.object_id is not null
-}
+db_multirow nodes site_nodes {}
 
+set login_url "register/?[export_vars { { return_url {[ad_conn url]}} }]"
+
 ad_return_template