Index: openacs-4/packages/acs-admin/www/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.tcl,v
diff -u -r1.5.2.6 -r1.5.2.7
--- openacs-4/packages/acs-admin/www/subsites.tcl	8 Feb 2023 18:35:05 -0000	1.5.2.6
+++ openacs-4/packages/acs-admin/www/subsites.tcl	7 Aug 2024 09:56:08 -0000	1.5.2.7
@@ -77,7 +77,7 @@
                 html {style {white-space:nowrap;}}
                 display_template {
                     <if @subsites.admin_url@ not nil><a href="@subsites.admin_url@"><adp:icon name="admin"
-                          title="#acs-admin.Administration#"></a></if>
+                          title="#acs-subsite.Administration#"></a></if>
                     <else><adp:icon name="admin" invisible="true"></else>&nbsp;
                     <a href="@subsites.parameter_url@"><adp:icon name="cog" title="#acs-admin.Parameters#"></a>&nbsp;
                     <a href="@subsites.sitemap_url@"><adp:icon name="sitemap" title="Manage sitemap"></a>
Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.131.2.44 -r1.131.2.45
--- openacs-4/packages/acs-subsite/acs-subsite.info	30 Jul 2024 09:21:32 -0000	1.131.2.44
+++ openacs-4/packages/acs-subsite/acs-subsite.info	7 Aug 2024 09:56:08 -0000	1.131.2.45
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.1b8" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.1b8.apm">
+    <version name="5.10.1b9" url="http://openacs.org/repository/download/apm/acs-subsite-5.10.1b9.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2023-05-15</release-date>
@@ -18,7 +18,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.10.1b8"/>
+        <provides url="acs-subsite" version="5.10.1b9"/>
         <requires url="acs-authentication" version="5.10.1b1"/>
         <requires url="acs-content-repository" version="5.10.1b1"/>
         <requires url="acs-kernel" version="5.10.1b1"/>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml,v
diff -u -r1.31.2.15 -r1.31.2.16
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	6 Aug 2024 09:43:17 -0000	1.31.2.15
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	7 Aug 2024 09:56:08 -0000	1.31.2.16
@@ -38,7 +38,7 @@
   <msg key="Admin">Verwalten</msg>
   <msg key="admin">Admin</msg>
   <msg key="Administer_subsite">%subsite_name% verwalten</msg>
-  <msg key="Administration">Administration</msg>
+  <msg key="Administration">Subsite Administration</msg>
   <msg key="Administrative_options">Verwaltungsoptionen f�r diesen Benutzer</msg>
   <msg key="Advanced">Fortgeschritten</msg>
   <msg key="Advanced_Features">Fortgeschrittene Funktionen</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.97.2.10 -r1.97.2.11
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	6 Aug 2024 09:43:17 -0000	1.97.2.10
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	7 Aug 2024 09:56:08 -0000	1.97.2.11
@@ -55,7 +55,7 @@
   <msg key="Admin">Control Panel</msg>
   <msg key="admin">Admin</msg>
   <msg key="Administer_subsite">Administer %subsite_name%</msg>
-  <msg key="Administration">Administration</msg>
+  <msg key="Administration">Subsite Administration</msg>
   <msg key="Administrative_options">Administrative options for this user</msg>
   <msg key="Advanced">Advanced</msg>
   <msg key="Advanced_Features">Advanced Features</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml,v
diff -u -r1.44.2.2 -r1.44.2.3
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml	29 Jul 2024 12:52:56 -0000	1.44.2.2
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml	7 Aug 2024 09:56:08 -0000	1.44.2.3
@@ -45,7 +45,7 @@
   <msg key="Admin">Panel de control</msg>
   <msg key="admin">Admin</msg>
   <msg key="Administer_subsite">Administrar %subsite_name%</msg>
-  <msg key="Administration">Administraci�n</msg>
+  <msg key="Administration">Subsite Administraci�n</msg>
   <msg key="Administrative_options">Opciones de administraci�n para este usuario</msg>
   <msg key="Advanced">Avanzado</msg>
   <msg key="Advanced_Features">Caracter�sticas Avanzadas</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml,v
diff -u -r1.26.2.8 -r1.26.2.9
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml	30 Jul 2024 09:21:33 -0000	1.26.2.8
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml	7 Aug 2024 09:56:08 -0000	1.26.2.9
@@ -45,7 +45,7 @@
   <msg key="Admin">Pannello di Controllo</msg>
   <msg key="admin">Admin</msg>
   <msg key="Administer_subsite">Amministra %subsite_name%</msg>
-  <msg key="Administration">Amministrazione</msg>
+  <msg key="Administration">Subsite Amministrazione</msg>
   <msg key="Administrative_options">Opzioni amministrative per questo utente</msg>
   <msg key="Advanced">Avanzate</msg>
   <msg key="Advanced_Features">Funzionalit� Avanzate</msg>
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -r1.30 -r1.30.2.1
--- openacs-4/packages/acs-subsite/www/admin/index.adp	7 Aug 2017 23:47:58 -0000	1.30
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	7 Aug 2024 09:56:08 -0000	1.30.2.1
@@ -3,13 +3,13 @@
 
 <h1>@title;noquote@</h1>
 <ul>
-  <li><a href="applications/">#acs-subsite.Applications#</a></li>
-  <li><a href="configure">#acs-subsite.Configure#</a></li>
-  <li><a href="themes">#acs-subsite.Themes#</a></li>
-  <li><a href="permissions">#acs-subsite.Permissions#</a></li>
-  <li><a href="../members/">#acs-subsite.Members#</a></li>
-  <li><a href="../shared/parameters?return_url=../admin">#acs-subsite.Parameters#</a></li>
-  <li><a href="subsite-add">#acs-subsite.Create_new_subsite#</a></li>
+  <li><a href="applications/"><adp:icon name="boxes" title="Manage mounted packages"> #acs-subsite.Applications#</a></li>
+  <li><a href="configure"><adp:icon name="admin" title="Modify subsite settings#"> #acs-subsite.Configure#</a></li>
+  <li><a href="themes"><adp:icon name="palette"> #acs-subsite.Themes#</a></li>
+  <li><a href="permissions"><adp:icon name="permissions" title="#acs-subsite.permissions#"> #acs-subsite.Permissions#</a></li>
+  <li><a href="../members/"><adp:icon name="user" title="Manage subsite members#"> #acs-subsite.Members#</a></li>
+  <li><a href="../shared/parameters?return_url=../admin"><adp:icon name="cog" title="#acs-admin.Parameters#"> #acs-subsite.Parameters#</a></li>
+  <li><a href="subsite-add"><adp:icon name="add-new-item" title="Create a new subsite"> #acs-subsite.Create_new_subsite#</a></li>
   <if @convert_subsite_p;literal@ true>
     <li><a href="subsite-convert-type">#acs-subsite.Convert_to_descendent_subsite_type#</a></li>
   </if>
@@ -18,7 +18,7 @@
 <h3>#acs-subsite.Advanced_Features#</h3>
 
 <ul>
-  <li><a href="site-map/">#acs-subsite.Site_Map#</a></li>
+  <li><a href="site-map/"><adp:icon name="sitemap" title="Manage sitemap"> #acs-subsite.Site_Map#</a></li>
   <li><a href="groups/">#acs-subsite.Groups#</a></li>
   <li><a href="group-types/">#acs-subsite.Group_Types#</a></li>
   <li><a href="rel-segments/">#acs-subsite.Relational_Segments#</a></li>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -r1.22.2.1 -r1.22.2.2
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	22 Jan 2024 17:34:50 -0000	1.22.2.1
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	7 Aug 2024 09:56:08 -0000	1.22.2.2
@@ -13,15 +13,16 @@
     acs_lang_admin_url:onevalue
 }
 
-array set this_node [site_node::get -url [ad_conn url]]
-set title "Subsite [_ acs-subsite.Administration]: $this_node(instance_name)"
+set title "[_ acs-subsite.Administration]: [ad_conn instance_name]"
+#set context [_ acs-subsite.Administration]
+#set context [list [list "." "[_ acs-subsite.Administration]"] "Admin"]
 
 set acs_admin_url [apm_package_url_from_key "acs-admin"]
-array set acs_admin_node [site_node::get -url $acs_admin_url]
-set acs_admin_name $acs_admin_node(instance_name)
+set acs_admin_node_info [site_node::get -url $acs_admin_url]
+set acs_admin_name [dict get $acs_admin_node_info instance_name]
 set sw_admin_p [permission::permission_p \
                     -party_id [ad_conn user_id] \
-                    -object_id $acs_admin_node(object_id) \
+                    -object_id [dict get $acs_admin_node_info object_id] \
                     -privilege admin]
 
 #
Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.48.2.6 -r1.48.2.7
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	23 May 2021 17:57:07 -0000	1.48.2.6
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	7 Aug 2024 09:56:07 -0000	1.48.2.7
@@ -129,14 +129,20 @@
 
     foreach elm [ad_context_node_list -from_node $from_node $node_id] {
         lassign $elm elm_0 elm_1
-        if { $node_id_url_end > 0 && [string match -nocase $node_id_url [string range $elm_0 0 ${node_id_url_end}-1] ] } {
+        if { $node_id_url_end > 0
+             && [string match -nocase $node_id_url [string range $elm_0 0 $node_id_url_end-1] ]
+         } {
             set elm_0 [string range $elm_0 $node_id_url_end end]
         }
         template::multirow append $multirow $elm_0 $elm_1
     }
 
     if { [string match "admin/*" [ad_conn extra_url]] } {
-        template::multirow append $multirow "[ad_conn package_url]admin/" "[_ acs-tcl.Administration]"
+        template::multirow append $multirow \
+            "[ad_conn package_url]admin/" \
+            [expr {[ad_conn package_key] ne "acs-subsite"
+                   ? [_ acs-tcl.Administration]
+                   : [_ acs-subsite.Administration]}]
     }
 
     if { [llength $context] == 0 } {
@@ -156,9 +162,10 @@
     -separator
     args
 } {
-    Returns a Yahoo-style hierarchical navbar. Includes "Administration"
-    if applicable, and the subsite if not global. 'args' can be either
-    one or more lists, or a simple string.
+    Returns a Yahoo-style hierarchical navbar. Includes
+    "Administration" or "Subsite Administration" if applicable, and
+    the subsite if not global. 'args' can be either one or more lists,
+    or a simple string.
 
     @param node_id If provided work up from this node, otherwise the current node
     @param from_node If provided do not generate links to the given node and above.
@@ -183,7 +190,9 @@
 
     if { [string match "admin/*" [ad_conn extra_url]] } {
         lappend context [list "[ad_conn package_url]admin/" \
-                             [_ acs-tcl.Administration]]
+                             [expr {[ad_conn package_key] ne "acs-subsite"
+                                    ? [_ acs-tcl.Administration]
+                                    : [_ acs-subsite.Administration]}]]
     }
 
     if {[llength $args] == 0} {