--- ECHO_content/ECHO_collection.py	2004/05/06 11:06:12	1.53
+++ ECHO_content/ECHO_collection.py	2004/05/07 13:01:56	1.61
@@ -577,6 +577,8 @@ class ECHO_collection(Folder, Persistent
     security=ClassSecurityInfo()
     meta_type='ECHO_collection'
 
+    displayTypes=displayTypes
+			
     def getTitle(self):
 	"""title"""
 	return self.title.encode('utf-8') 
@@ -642,14 +644,14 @@ class ECHO_collection(Folder, Persistent
                 element=getattr(object,entry)
                 try:
                     if element.meta_type in ["ECHO_collection","ECHO_group"]:
-                        collections+="<element name=\""+element.title+"\" url=\""+element.absolute_url()+"\">"
+                        collections+="<element name=\""+quote(element.title)+"\" url=\""+element.absolute_url()+"\">"
                         collections+=getCollection(element,depth)+"</element>\n"
                 except:
                     """nothing"""
             return collections
         
-
-        return "<collection>"+getCollection(self)+"</collection>"
+	ret="""<?xml version="1.0" encoding="utf-8" ?>"""
+        return ret+"<collection>"+getCollection(self)+"</collection>"
     
     def createJavaScript(self):
         """CreateJava"""
@@ -856,8 +858,10 @@ class ECHO_collection(Folder, Persistent
             return self.showOverview()
         elif hasattr(self,'collection_index_template'):
             return self.collection_index_template()    
+        elif hasattr(self,'main_index_template'):
+            return self.main_index_template()    
         
-        pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_collection_index_standard.zpt').__of__(self)
+        pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
         pt.content_type="text/html"
         return pt()
 
@@ -938,20 +942,22 @@ class ECHO_group(ECHO_collection):
 	def index_html(self):
 		"""standard page"""
 		displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
-		if len(displayedObjects)==1: # nur ein Object dann redirect auf dieses Object
-			return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())
+		#if (len(displayedObjects)==1) and (displayedObjects[0][1].meta_type=="ECHO_collection"): # nur ein Object dann redirect auf dieses Object
+		#	return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())
 		
 		if 'index.html' in self.__dict__.keys():
 			return getattr(self,'index.html')()
-
+		
 		elif 'overview' in self.__dict__.keys():
-		    return self.showOverview()
+			return self.showOverview()
 		elif hasattr(self,'group_index_template'):
-		    return self.group_index_template()   
+			return self.group_index_template()
 		elif hasattr(self,'collection_index_template'):
-		    return self.collection_index_template()    
+			return self.collection_index_template()    
+		elif hasattr(self,'main_index_template'):
+		    return self.main_index_template()    
 
-		pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_group_index_standard.zpt').__of__(self)
+		pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
 		pt.content_type="text/html"
 		return pt()
 
@@ -1180,9 +1186,11 @@ class ECHO_root(Folder,Persistent,Implic
     def getPartnersXML(self):
         """partner liste als xml""" 
         partners=self.getPartners()
-        ret="<partners>"
-        for partner in partners:
-            ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),partner.title)
+        ret="""<?xml version="1.0" encoding="utf-8" ?>
+	<partners>"""
+        
+	for partner in partners:
+            ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),unicode(partner.title,'utf-8','replace'))
 
         return ret+"\n</partners>"