Index: openacs-4/packages/theme-selva/www/selva-site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/theme-selva/www/selva-site-master.tcl	2 Dec 2005 04:55:03 -0000	1.6
+++ openacs-4/packages/theme-selva/www/selva-site-master.tcl	8 Aug 2006 21:27:21 -0000	1.7
@@ -18,20 +18,19 @@
 if { [template::util::is_nil subnavbar_link] } {
     set subnavbar_link ""
 }
- 
-set community_id [dotlrn_community::get_community_id]
 
-if {[exists_and_not_null community_id]} {
-	set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
-	if {$comm_type == "dotlrn_club"} { 
-		set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "communityCssUrl" -default "/resources/theme-selva/Selva/turquoise/Selva.css"]
-	} else {
-		set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "courseCssUrl" -default "/resources/theme-selva/Selva/green/Selva.css"]
-	}
-    } else {
-	set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "cssUrl" -default "/resources/theme-selva/Selva/default/Selva.css"]
-    }
+# DRB: Hack to ensure that subgroups keep the same color as their ultimate club or
+# class parent.  A top-level community that's not a class or club will keep the
+# top-level Selva colors.
 
+if { [string match /dotlrn/clubs/* [ad_conn url]] } {
+    set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "communityCssUrl" -default "/resources/theme-selva/Selva/turquoise/Selva.css"]
+} elseif { [string match /dotlrn/classes/* [ad_conn url]] } {
+    set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "courseCssUrl" -default "/resources/theme-selva/Selva/green/Selva.css"]
+} else {
+    set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "cssUrl" -default "/resources/theme-selva/Selva/default/Selva.css"]
+}
+
 # Get system name
 set system_name [ad_system_name]
 set system_url [ad_url]