--- ECHO_content/ECHO_Nav.py	2005/08/04 17:42:07	1.57
+++ ECHO_content/ECHO_Nav.py	2005/10/13 16:58:26	1.58
@@ -316,8 +316,8 @@ class ECHO_pageTemplate(ZopePageTemplate
 
     
     def content_html(self):
-	"""content_html"""
-	return content_html(self,'pageTemplate')
+        """content_html"""
+        return content_html(self,'pageTemplate')
 
     def changeECHO_pageTemplateMainForm(self):
         """change"""
@@ -440,37 +440,37 @@ class ECHO_navigation(Folder):
                 return str.encode('latin-1')
     def ECHOFormatListStr(self,list,search="\n",replace="<br>"):
         """formatiert liste im str"""
-	if list:
-        	return re.sub(search,replace,list)
-    	else:
-		return 
+        if list:
+                return re.sub(search,replace,list)
+        else:
+                return 
 
     def ECHO_cacheManageForm(self):
-	    """change form"""
-	    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_cacheManageForm')).__of__(self)
-	    pt.content_type="text/html"
-	    return pt()
+            """change form"""
+            pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_cacheManageForm')).__of__(self)
+            pt.content_type="text/html"
+            return pt()
 
     def ECHO_cacheManage(self,cacheManagerName=None,deleteCache=None, activateCache=None,RESPONSE=None):
-	    """cachemanager"""
-	    if cacheManagerName=="": chacheManagerName=None
-	    
-	    self.cacheManagerName=cacheManagerName
-	    self.setCache(managerName=cacheManagerName)
-	    
-	    if deleteCache:
+            """cachemanager"""
+            if cacheManagerName=="": chacheManagerName=None
+            
+            self.cacheManagerName=cacheManagerName
+            self.setCache(managerName=cacheManagerName)
+            
+            if deleteCache:
                 try:
-		    self.deleteCache()
+                    self.deleteCache()
                 except:
                     for roots in self.ZopeFind(self,obj_metatypes=['ECHO_root'],search_sub=1):
                         roots[1].deleteCache()
                     
 
-	    self.activateCache=activateCache
+            self.activateCache=activateCache
 
-	    if RESPONSE is not None:
-		    RESPONSE.redirect('manage_main')
-	
+            if RESPONSE is not None:
+                    RESPONSE.redirect('manage_main')
+        
     def setCache(self,obj=None,RESPONSE=None,managerName='CacheManager'):
         """setze alle collections auf cache = CacheManager"""
 
@@ -478,10 +478,9 @@ class ECHO_navigation(Folder):
         if not obj:
             obj = self
             
-        entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_collection'],search_sub=1)
+        entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_collection','VLP_resource'],search_sub=1)
 
         for entry in entries:
-            #print entry[0]
             entry[1].ZCacheable_setManagerId(managerName)
 
         
@@ -497,8 +496,8 @@ class ECHO_navigation(Folder):
         return viewers
     
     def getR(self):
-	"""re"""
-	return self.REQUEST
+        """re"""
+        return self.REQUEST
 
     def __init__(self,id,title,pathToHierarchy):
         """init"""
@@ -596,7 +595,7 @@ class ECHO_navigation(Folder):
                 tempObj=self.pathToHierarchy[0:]
                 tempObj=re.sub("/",".",tempObj)
                 tempObj="self.aq_parent"+tempObj
-		#print tempObj
+                #print tempObj
                 objtemp=eval(tempObj)
 
                 obj=objtemp
@@ -717,12 +716,12 @@ class ECHO_navigation(Folder):
     
 
     def getPathStyle(self, item, style=""):
-	"""returns a string with the given style + 'sel' if the path is already selected."""
+        """returns a string with the given style + 'sel' if the path is already selected."""
 
-	if self.isSelectedPath(item):
-	    return style + 'sel'
-	else:
-	    return style
+        if self.isSelectedPath(item):
+            return style + 'sel'
+        else:
+            return style
         
     
     def buttonsFromHash(self,hash,start=None,orientation="horizontal"):
@@ -789,9 +788,9 @@ class ECHO_navigation(Folder):
         return keys
 
     def numberOfMainNavElements(self):
-	"""number of main elements"""
+        """number of main elements"""
 
-	return len(self.barFromHash(self.createNavHash(0))) 
+        return len(self.barFromHash(self.createNavHash(0))) 
 
     def startOfHierarchy(self,list):
         splitted=self.pathToHierarchy.split("/")
@@ -814,12 +813,12 @@ class ECHO_navigation(Folder):
 
         splitted=ult_temp.split("/")
         
-	#print "AU",self.absolute_url(),splitted
-	#start=[splitted[2]] #orig
+        #print "AU",self.absolute_url(),splitted
+        #start=[splitted[2]] #orig
         startNr= self.startOfHierarchy(splitted)
         
-	start=[splitted[startNr]]
-	
+        start=[splitted[startNr]]
+        
         #print start
        
         keys=self.barFromHash(hash,start=start)
@@ -847,7 +846,7 @@ class ECHO_navigation(Folder):
         #start=splitted[2:order+1] #orig
         startNr= self.startOfHierarchy(splitted)
         #print startNr
-	start=splitted[startNr:order+startNr-1] 
+        start=splitted[startNr:order+startNr-1] 
         #print start
        
         keys=self.barFromHash(hash,start=start)