--- ECHO_content/ECHO_collection.py	2004/04/14 23:45:58	1.39
+++ ECHO_content/ECHO_collection.py	2004/04/16 09:45:32	1.41
@@ -34,6 +34,7 @@ import xml.dom.minidom
 import urllib
 import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
+import ECHO_helpers
 
 #List of different types for the graphical linking viewer
 viewClassificationListMaster=['view point','area']
@@ -264,6 +265,8 @@ class ECHO_resource(Folder):
 
     viewClassificationList=viewClassificationListMaster
 
+    getSubCols = ECHO_helpers.getSubCols
+
     def content_html(self):
         """template fuer content"""
         return content_html(self,'resource')
@@ -560,7 +563,7 @@ class ECHO_collection(Folder, Persistent
             for entry in object.__dict__.keys():
                 element=getattr(object,entry)
                 try:
-                    if element.meta_type=="ECHO_collection":
+                    if element.meta_type in ["ECHO_collection","ECHO_group"]:
                         collections+="<element name=\""+element.title+"\" url=\""+element.absolute_url()+"\">"
                         collections+=getCollection(element,depth)+"</element>\n"
                 except:
@@ -812,9 +815,12 @@ class ECHO_collection(Folder, Persistent
 
         return ids
     
+<<<<<<< ECHO_collection.py
+    getSubCols = ECHO_helpers.getSubCols
+=======
     def getSubCols(self,sortfield="weight"):
 
-        subColTypes=['ECHO_collection','ECHO_externalLink','ECHO_resource']
+        subColTypes=['ECHO_group','ECHO_collection','ECHO_externalLink','ECHO_resource']
         ids=[]
         for entry in self.__dict__.keys():
             object=getattr(self,entry)
@@ -843,8 +849,6 @@ class ECHO_collection(Folder, Persistent
         tmplist.sort()
         return [x for (key,x) in tmplist]
      
-        
-        
                 
     
     
@@ -912,7 +916,11 @@ class ECHO_group(ECHO_collection):
 
 		if RESPONSE is not None:
 		    RESPONSE.redirect('manage_main')
-		    
+
+	def getLogo(self):    
+		"""logo ausgeben"""
+		return "ECHO_groups"
+
 	def content_html(self):
 		"""template fuer content"""
 		return content_html(self,'group')