--- ECHO_content/ECHO_collection.py	2004/04/05 14:26:14	1.31
+++ ECHO_content/ECHO_collection.py	2004/04/05 15:38:19	1.32
@@ -195,9 +195,9 @@ class ECHO_layoutTemplate(ZopePageTempla
 
     meta_type="ECHO_layoutTemplate"
 
-    manage_options=ZopePageTemplate.manage_options+(
-        {'label':'Set back to Standard','action':'changeECHO_layoutTemplateToStandardForm'},
-        )
+    #manage_options=ZopePageTemplate.manage_options+(
+    #    {'label':'Set back to Standard','action':'changeECHO_layoutTemplateToStandardForm'},
+    #    )
 
 
     def __init__(self, id, text=None, content_type=None,EchoType=None):
@@ -212,12 +212,12 @@ 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()
+   ##  def changeECHO_layoutTemplateToStandardForm(self):
+##         """change form"""
+##         pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_pageTemplateWeightForm.zpt').__of__(self)
+##         return pt()
 
-    def changeECHO_pageTemplateWeight(self,templateKind):
+    
         """change form"""
 
 
@@ -237,6 +237,7 @@ def manage_addECHO_layoutTemplate(self,
         EchoTypes=EchoType
         
     for singleType in EchoTypes:
+
         id = str(singleType)+"_template"
         if REQUEST is None:
             self._setObject(id, ECHO_layoutTemplate(id, text,EchoType=singleType))
@@ -541,7 +542,21 @@ class ECHO_collection(Folder, Persistent
             return "done"
         except:
             return None
-    
+
+    def getSecondaryLink(self):
+        """secondary link"""
+        try:
+            return self.secondaryLink
+        except:
+            return ""
+
+    def getSecondaryLinkTitle(self):
+        """secondary link"""
+        try:
+            return self.secondaryLinkTitle
+        except:
+            return ""
+        
     def getCollectionTreeXML(self):
         """Tree as XML"""
 
@@ -630,7 +645,7 @@ class ECHO_collection(Folder, Persistent
 
             return []
         
-    def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,imageTag=""):
+    def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag=""):
         #print "CO",coords
 
         self.id = id
@@ -646,7 +661,9 @@ class ECHO_collection(Folder, Persistent
         self.sortfield=sortfield
         coordsnew=[ string.split(x,",") for x in coords]
         self.coords=coordsnew
-
+        self.secondaryLinkTitle=secondaryLinkTitle
+        self.secondaryLink=secondaryLink
+        
 
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_collection_config'},
@@ -704,15 +721,23 @@ class ECHO_collection(Folder, Persistent
     security.declarePublic('changeECHO_collection')
 
 
-    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag=""):
+    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag=""):
         """Änderung der Properties"""
 
+        self.secondaryLink=secondaryLink
+        self.secondaryLinkTitle=secondaryLinkTitle
         self.imageTag=imageTag
-        coordsnew=[ string.split(x,",") for x in coords]
-
+        if coords:
+            coordsnew=[ string.split(x,",") for x in coords]
+            self.coords=coordsnew[0:]
+        else:
+            coordsnew=None
+            self.coords=None
+            
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
+
+    
         
-        self.coords=coordsnew[0:]
         self.sortfield=sortfield
 
         if RESPONSE is not None:
@@ -734,9 +759,11 @@ class ECHO_collection(Folder, Persistent
         
         if 'index.html' in self.__dict__.keys():
             return getattr(self,'index.html')()
+        
         elif 'overview' in self.__dict__.keys():
             return self.showOverview()
-            
+        elif hasattr(self,'collection_index_template'):
+            return self.collection_index_template()    
         
         pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_standard.zpt').__of__(self)
         pt.content_type="text/html"
@@ -823,11 +850,11 @@ def manage_addECHO_collectionForm(self):
         return pt()
 
 
-def manage_addECHO_collection(self,id,title,label,description,contentType,responsible,weight,sortfield,coords="",credits=None,RESPONSE=None,imageTag=""):
+def manage_addECHO_collection(self,id,title,label,description,contentType,responsible,weight,sortfield,coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag=""):
     """add a echo collection"""
     
 
-    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,imageTag)
+    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag)
 
     self._setObject(id,newObj)