--- ECHO_content/ECHO_Nav.py	2004/04/28 15:50:12	1.17
+++ ECHO_content/ECHO_Nav.py	2004/05/10 13:51:03	1.24
@@ -12,6 +12,8 @@ from Products.PageTemplates.ZopePageTemp
 import os.path
 from Globals import package_home
 import urllib
+from ECHO_helpers import displayTypes,checkOnlyOneInGroup
+from ECHO_collection import content_html
 
 class ECHO_contentType(Image):
     """ContentType Object"""
@@ -180,6 +182,10 @@ class ECHO_pageTemplate(ZopePageTemplate
         {'label':'Weight and Type','action':'changeECHO_pageTemplateWeightForm'},
         )
 
+    def content_html(self):
+	"""content_html"""
+	return content_html(self,'pageTemplate')
+
     def changeECHO_pageTemplateWeightForm(self):
         """change"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
@@ -276,7 +282,7 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
-    displayedMetaTypes=['ECHO_group','ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ZSQLBibliography','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
+    displayedMetaTypes=displayTypes
     
     def __init__(self,id,title,pathToHierarchy):
         """init"""
@@ -302,20 +308,20 @@ class ECHO_navigation(Folder):
             RESPONSE.redirect('manage_main')
 
 
-    def getColls(self,obj,depth):
+    def getColls(self,obj,depth,checkOnly="no"):
         nav={}
         #print "HERE",obj.
-        for keys in obj.__dict__.keys():
-            x=getattr(obj,keys)
-            if hasattr(x,"meta_type"):
-                if x.meta_type in self.displayedMetaTypes:
-                    if depth>1:
-                        nav[x.getId()]=(self.getColls(x,depth-1),x)
-                    else:
-                        nav[x.getId()]=(None,x)
+        for x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
+            x=x_objs[1]
+            if checkOnly=="yes":
+                x = checkOnlyOneInGroup(x)
+            if depth>1:
+                nav[x.getId()]=(self.getColls(x,depth-1),x)
+            else:
+                nav[x.getId()]=(None,x)
         return nav
     
-    def createNavHash(self,depth):
+    def createNavHash(self,depth,checkOnly="no"):
         """Auslesen des Hierarchiebuames"""
         temp=self.pathToHierarchy[0:]
         temp=re.sub("/",".",temp)
@@ -324,23 +330,16 @@ class ECHO_navigation(Folder):
         objtemp=eval(temp)
         nav={}
         obj=objtemp
-        
-        #exec(obj)
 
-        #objtemp = compile(temp,'<string>','single')
-        #obj=eval(objtemp)
-        #print obj 
-        
-        #print obj.__dict__.keys()
         
         for keys in obj.__dict__.keys():
             x=getattr(obj,keys)
             if hasattr(x,"meta_type"):
-                #print x.meta_type
+
                 if x.meta_type in self.displayedMetaTypes:
                    
                     if depth>1:
-                        nav[x.getId()]=(self.getColls(x,int(depth)-1),x)
+                        nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
                     else:
                         nav[x.getId()]=(None,x)
                     
@@ -520,7 +519,7 @@ class ECHO_navigation(Folder):
     def secondNavElements(self):
         """Zweite Ordnung"""
         
-        hash=self.createNavHash(2)
+        hash=self.createNavHash(2,checkOnly="no")
         actual_url=self.REQUEST['URL']
         
         ult_temp=re.sub(self.absolute_url(),"",actual_url)
@@ -529,15 +528,10 @@ class ECHO_navigation(Folder):
         splitted=ult_temp.split("/")
         
 
-        ## if splitted[len(splitted)-1]=="index_html":
-##             start=[splitted[len(splitted)-2]]
-##         else:
-##             start=[splitted[len(splitted)-1]]
-
         start=[splitted[2]]
         #print start
        
-        keys=self.barFromHash(hash,start=start)
+        keys=self.barFromHash(hash,start=start,showElements)
         
         
         return keys