--- ECHO_content/ECHO_collection.py 2004/05/06 11:06:12 1.53 +++ ECHO_content/ECHO_collection.py 2004/05/06 13:29:45 1.56 @@ -856,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() @@ -943,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()