--- ECHO_content/ECHO_collection.py	2007/01/15 11:13:04	1.280
+++ ECHO_content/ECHO_collection.py	2007/01/31 13:43:36	1.283
@@ -1752,7 +1752,7 @@ class ECHO_externalLink(Folder,ECHO_basi
         
         
     
-    def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
+    def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType):
 
         self.id = id
         """Festlegen der ID"""
@@ -1767,6 +1767,8 @@ class ECHO_externalLink(Folder,ECHO_basi
         self.responsible=responsible
         coordsnew=[ string.split(x,",") for x in coords]
         self.coords=coordsnew
+	self.linkType = linkType 	# Linktypen 'otherPresentation','external'
+	
 
     def ECHO_externalLink_config(self):
         """Main configuration"""
@@ -1782,13 +1784,25 @@ class ECHO_externalLink(Folder,ECHO_basi
         return pt()
     
 
-    def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
+    def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
         """Aenderung der Properties"""
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
 
         self.link=link
+	self.linkType = linkType
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
+	    
+    def getLinkType(self):
+        """ return linkType """
+        if hasattr(self,"linkType"):
+		return self.linkType
+	else :
+		return 'otherPresentation'
+
+    def setLinkType(self,type):
+        """ set linkType """
+        self.linkType = type
             
             
     manage_options = Folder.manage_options+(
@@ -1801,6 +1815,7 @@ class ECHO_externalLink(Folder,ECHO_basi
         """standard page"""
         
         return self.REQUEST.RESPONSE.redirect(self.link)
+	    
 
 def manage_addECHO_externalLinkForm(self):
         """Form for external Links"""
@@ -1808,10 +1823,10 @@ def manage_addECHO_externalLinkForm(self
         return pt()
 
 
-def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
     """Add an external Link"""
 
-    newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+    newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
 
     self._setObject(id,newObj)
 
@@ -2632,7 +2647,7 @@ class ECHO_collection(CatalogAware, Fold
         return ECHO_rerenderLinksMD(self,obj,types)
 
         
-    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
+    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour="",isVisible=True):
 
         self.id = id
         """Festlegen der ID"""
@@ -2650,6 +2665,7 @@ class ECHO_collection(CatalogAware, Fold
         self.secondaryLinkTitle=secondaryLinkTitle
         self.secondaryLink=secondaryLink
         self.bgcolour=bgcolour
+	self.isVisible=isVisible
         
 
     manage_options = Folder.manage_options+ Cacheable.manage_options+(
@@ -2694,7 +2710,7 @@ class ECHO_collection(CatalogAware, Fold
 
                 
     security.declarePublic('changeECHO_collection')         
-    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix=""):
+    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True):
         """Aenderung der Properties"""
 
         self.secondaryLink=secondaryLink
@@ -2705,6 +2721,7 @@ class ECHO_collection(CatalogAware, Fold
         self.isAlwaysClickable=isAlwaysClickable
         self.prefix=prefix[0:]
         self.suffix=suffix[0:]
+	self.setIsVisible(isVisible)
         
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
                 
@@ -2842,11 +2859,11 @@ def manage_addECHO_collectionForm(self):
         return pt()
 
 
-def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour="",isVisible=True):
     """add a echo collection"""
     
 
-    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="")
+    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="",isVisible=isVisible)
 
     self._setObject(id,newObj)