--- ECHO_content/ECHO_collection.py	2004/03/04 12:59:53	1.16
+++ ECHO_content/ECHO_collection.py	2004/03/30 10:47:54	1.19
@@ -259,7 +259,9 @@ class ECHO_resource(Folder):
 
     def ECHO_graphicEntry(self):
         """DO nothing"""
-        if 'overview' in self.aq_parent.__dict__.keys():
+        overview = self.ZopeFind(self,obj_ids=['overview'])
+        
+        if overview: 
             pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_draw.zpt').__of__(self)
             return pt()
         else:
@@ -383,7 +385,14 @@ class ECHO_externalLink(Folder):
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_externalLink_config'},
         )
-    
+
+    def getCredits(self):
+        """Ausgabe der credits"""
+        if self.credits:
+            return self.credits
+        else:
+            return []
+        
     def index_html(self):
         """standard page"""
         
@@ -420,7 +429,7 @@ class ECHO_collection(Folder, Persistent
             return getattr(self.partners,name)
         except:
             return ""
-        
+
     security.declarePublic('ECHO_generateNavBar')
     def ECHO_generateNavBar(self):
         """Erzeuge Navigationsbar"""
@@ -458,6 +467,8 @@ class ECHO_collection(Folder, Persistent
                 """nothing"""
                 
         return "Rerenderd all links to resources in: "+self.title
+
+    security.declarePublic('ECHO_newViewerLink')
     
 
     def getCoords(self):
@@ -495,9 +506,15 @@ class ECHO_collection(Folder, Persistent
 
         )
 
+    def getOverview(self):
+        """overview graphics"""
+        return self.ZopeFind(self,obj_ids=['overview'])[0][1]
+    
     def ECHO_graphicEntry(self):
         """DO nothing"""
-        if 'overview' in self.aq_parent.__dict__.keys():
+        overview = self.ZopeFind(self,obj_ids=['overview'])
+        
+        if overview:
             pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_draw.zpt').__of__(self)
             return pt()
         else:
@@ -538,11 +555,8 @@ class ECHO_collection(Folder, Persistent
     def changeECHO_collection(self,title,label,description,content_type,responsible,weight,credits=None,sortfield="weight",coords=None,RESPONSE=None):
         """Änderung der Properties"""
 
-        try:
-            coordsnew=[ string.split(x,",") for x in coords]
-        except:
-            coordsnew=[]
-            
+        coordsnew=[ string.split(x,",") for x in coords]
+
         setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coordsnew)
 
         self.sortfield=sortfield
@@ -552,7 +566,7 @@ class ECHO_collection(Folder, Persistent
             
     security.declarePublic('index_html')
 
-    showOverview=DTMLFile('ECHO_content_overview',globals())
+    showOverview=DTMLFile('dtml/ECHO_content_overview',globals())
     
     
     def index_html(self):
@@ -656,6 +670,26 @@ class ECHO_root(Folder,Persistent,Implic
     """ECHO Root Folder"""
     meta_type="ECHO_root"
 
+    def ECHO_newViewerLink(self,obj=None):
+        """change links (:86 faellt weg)"""
+
+        if not obj:
+            obj = self
+            
+        entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection'])
+
+        for entry in entries:
+                
+                if entry[1].meta_type == 'ECHO_resource':
+                    
+                    entry[1].link=re.sub('\:86','',entry[1].link)
+
+                else:
+                    
+                    entry[1].ECHO_newViewerLink(entry[1])
+                
+        return "Rerenderd all links to resources in: "+self.title
+
     def __init__(self,id,title):
         """init"""
         self.id = id