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 -r1.6
--- openacs-4/packages/acs-admin/www/subsites.tcl	26 Jun 2018 10:33:51 -0000	1.5
+++ openacs-4/packages/acs-admin/www/subsites.tcl	3 Sep 2024 15:37:29 -0000	1.6
@@ -7,10 +7,9 @@
 
 set page_title "Defined Subsites"
 set context [list $page_title]
-
-set package_keys '[join [subsite::package_keys] ',']'
+set package_keys [subsite::package_keys]
 set subsite_number [db_string count_subsites [subst {
-    select count(*) from apm_packages where package_key in ($package_keys)
+    select count(*) from apm_packages where package_key in ([ns_dbquotelist $package_keys])
 }]]
 
 if {$subsite_number > 500} {
@@ -25,23 +24,25 @@
         path_pretty
         node_url
         parameter_url
+        sitemap_url
     } subsites subsite_admin_urls [subst {
         select s.node_id,
                p.package_id
         from   site_nodes s, apm_packages p
         where  s.object_id = p.package_id
-        and    p.package_key in ($package_keys)        
+        and    p.package_key in ([ns_dbquotelist $package_keys])
     }] {
         set node [site_node::get -node_id $node_id]
         set path_pretty [dict get $node instance_name]
         set parent_id   [dict get $node parent_id]
         set node_url    [dict get $node url]
-        
+
         set admin_url "${node_url}admin/"
         set parameter_url [export_vars -base /shared/parameters {package_id {return_url "[ad_conn url]"}}]
         set theme [parameter::get -parameter ThemeKey -package_id $package_id]
         set theme_url ${admin_url}themes/
-        
+        set sitemap_url [export_vars -base /admin/site-map { {root_id $node_id} }]
+
         while { $parent_id ne "" } {
             set node [site_node::get -node_id $parent_id]
             set path_pretty "[dict get $node instance_name] > $path_pretty"
@@ -71,28 +72,16 @@
                 link_url_col theme_url
                 html {align left}
             }
-            admin_url {
-                label "Subsite Administration"
-                link_html { title "Subsite Administration" }
-                link_url_col admin_url
-                display_template {<if @subsites.admin_url@ not nil>#acs-admin.Administration#</if>}
-                html {align left}
-            }
-            parameter_url {
-                label "Parameters"
-                link_html {title "Manage Subsite Parameters" }
-                display_template {\#acs-admin.Parameters#}
-                link_url_col parameter_url
-                html {align left}
-            }
-            sitemap {
-                sub_class narrow
+            actions {
+                label "Actions"
+                html {style {white-space:nowrap;}}
                 display_template {
-                    <img src="/shared/images/Edit16.gif" height="16" width="16" alt="Manage sitemap" style="border:0">
-                    
+                    <if @subsites.admin_url@ not nil><a href="@subsites.admin_url@"><adp:icon name="admin"
+                          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>
                 }
-                link_url_eval {[export_vars -base /admin/site-map { {root_id $node_id} }]}
-                link_html { title "Manage sitemap" }
             }
         }
 }