--- ECHO_content/ECHO_collection.py	2004/04/14 23:44:52	1.38
+++ ECHO_content/ECHO_collection.py	2004/04/16 10:12:15	1.42
@@ -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']
@@ -195,11 +196,6 @@ class ECHO_layoutTemplate(ZopePageTempla
 
     meta_type="ECHO_layoutTemplate"
 
-    #manage_options=ZopePageTemplate.manage_options+(
-    #    {'label':'Set back to Standard','action':'changeECHO_layoutTemplateToStandardForm'},
-    #    )
-
-
     def __init__(self, id, text=None, content_type=None,EchoType=None):
         self.id = str(id)
 
@@ -212,11 +208,6 @@ class ECHO_layoutTemplate(ZopePageTempla
             text = open(self._default_content_fn).read()
         self.pt_edit(text, content_type)
 
-   ##  def changeECHO_layoutTemplateToStandardForm(self):
-##         """change form"""
-##         pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_pageTemplateWeightForm.zpt').__of__(self)
-##         return pt()
-
     
         """change form"""
 
@@ -274,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')
@@ -570,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:
@@ -750,7 +743,7 @@ class ECHO_collection(Folder, Persistent
             
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
 
-    
+        self.coords=coordsnew[0:] # HACK fehler in setECHO_collection
         
         self.sortfield=sortfield
 
@@ -822,39 +815,11 @@ class ECHO_collection(Folder, Persistent
 
         return ids
     
-    def getSubCols(self,sortfield="weight"):
 
-        subColTypes=['ECHO_collection','ECHO_externalLink','ECHO_resource']
-        ids=[]
-        for entry in self.__dict__.keys():
-            object=getattr(self,entry)
-            try:
-                if object.meta_type in subColTypes:
-                    ids.append(object)
-                    
-            except:
-                """nothing"""
-        try:
-            sortfield=self.sortfield
-        except:
-            """nothing"""
-            
-        tmplist=[]
-        for x in ids:
-            if hasattr(x,sortfield):
-                try:
-                    x=int(x)
-                except:
-                    """nothing"""
-                tmp=getattr(x,sortfield)
-            else:
-                tmp=10000000
-            tmplist.append((tmp,x))
-        tmplist.sort()
-        return [x for (key,x) in tmplist]
+
+
+    getSubCols = ECHO_helpers.getSubCols
      
-        
-        
                 
     
     
@@ -922,7 +887,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')