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.117.2.23 -r1.117.2.24
--- openacs-4/packages/acs-subsite/acs-subsite.info	23 Jan 2017 13:16:26 -0000	1.117.2.23
+++ openacs-4/packages/acs-subsite/acs-subsite.info	24 Jan 2017 09:35:26 -0000	1.117.2.24
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1d8" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.1d8.apm">
+    <version name="5.9.1d9" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.1d9.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2015-10-04</release-date>
@@ -18,7 +18,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.9.1d8"/>
+        <provides url="acs-subsite" version="5.9.1d9"/>
         <requires url="acs-authentication" version="5.9.0"/>
         <requires url="acs-content-repository" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.1d16"/>
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.92.6.4 -r1.92.6.5
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	23 Jan 2017 13:16:26 -0000	1.92.6.4
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	24 Jan 2017 09:35:26 -0000	1.92.6.5
@@ -582,6 +582,7 @@
   <msg key="Upload_Portrait">Upload Portrait</msg>
   <msg key="URL">URL</msg>
   <msg key="URL_folder_name">URL folder name</msg>
+  <msg key="Usage">Usage</msg>
   <msg key="User_name">User name</msg>
   <msg key="User_Portrait">User Portrait</msg>
   <msg key="User_Portraits">User Portraits</msg>
Index: openacs-4/packages/acs-subsite/www/admin/themes/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/themes/index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-subsite/www/admin/themes/index.tcl	23 Jan 2017 13:16:26 -0000	1.1.2.1
+++ openacs-4/packages/acs-subsite/www/admin/themes/index.tcl	24 Jan 2017 09:35:26 -0000	1.1.2.2
@@ -26,15 +26,22 @@
         name {
             label "[_ acs-subsite.Name]"
         }
+        usage_count {
+            label "[_ acs-subsite.Usage]"
+            html {style "text-align: center;"}
+
+        }
         active_p {
             label "[_ acs-subsite.Active_theme]"
             display_template {
                 <if @themes.active_p;literal@ true>
-                <img src="/shared/images/radiochecked.gif" height="16" width="16" alt="#acs-subsite.Modified_theme#" style="border:0">
+                <img src="/shared/images/radiochecked.gif" height="16" width="16" alt="#acs-subsite.Modified_theme#"
+                style="display: block; margin-left: auto; margin-right: auto;">
                 </if>
                 <else>
                 <a href="set?theme=@themes.key@" title="#acs-subsite.Select_theme#">
-                <img src="/shared/images/radio.gif" height="16" width="16" alt="#acs-subsite.Select_theme#" style="border:0">
+                <img src="/shared/images/radio.gif" height="16" width="16" alt="#acs-subsite.Select_theme#"
+                style="display: block; margin-left: auto; margin-right: auto;">
                 </a>
                 </else>
             }
@@ -54,7 +61,8 @@
                 </form>
                 </if>
                 <else>
-                <img src="/shared/images/radiochecked.gif" height="16" width="16" alt="#acs-subsite.Modified_theme#" style="border:0">
+                <img src="/shared/images/radiochecked.gif" height="16" width="16" alt="#acs-subsite.Modified_theme#"
+                style="display: block; margin-left: auto; margin-right: auto;">
                 <a href="./?rename_theme=@themes.key;literal@">Save new</a>
                 </else>
                 </if>
@@ -63,7 +71,7 @@
         delete {
             sub_class narrow
             display_template {
-                <if @themes.active_p;literal@ false>
+                <if @themes.usage_count;literal@ eq 0>
                 <img src="/shared/images/Delete16.gif" height="16" width="16" alt="#acs-subsite.Delete_this_theme#" style="border:0">
                 </if>
             }
@@ -86,7 +94,9 @@
     streaming_head       StreamingHead
 }
 
-db_multirow -extend {active_p modified_p} themes select_themes {} {
+set package_keys '[join [subsite::package_keys] ',']'
+
+db_multirow -extend {active_p modified_p delete_p usage_count} themes select_themes {} {
     set active_p [expr {$currentThemeKey eq $key}]
     set modified_p 0
     if {$active_p} {
@@ -97,6 +107,14 @@
             }
         }
     }
+    set usage_count [db_string count_theme_usages [subst {
+        select count(*)
+        from apm_parameters p, apm_parameter_values v
+        where p.parameter_name = 'ThemeKey'
+        and   p.package_key in ($package_keys)
+        and   p.parameter_id = v.parameter_id
+        and   v.attr_value = :key
+    }]]
 }