--- ECHO_content/ECHO_collection.py	2004/05/06 10:27:07	1.52
+++ ECHO_content/ECHO_collection.py	2004/05/06 13:29:45	1.56
@@ -551,6 +551,10 @@ class ECHO_link(ECHO_externalLink):
 	meta_type="ECHO_link"
 	
 
+	def content_html(self):
+		"""template fuer content"""
+		return content_html(self,'link')
+	
 def manage_addECHO_linkForm(self):
         """Form for external Links"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_linkForm.zpt').__of__(self)
@@ -852,8 +856,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()
 
@@ -939,15 +945,17 @@ class ECHO_group(ECHO_collection):
 		
 		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()