--- ECHO_content/ECHO_Nav.py	2004/05/06 10:27:07	1.18
+++ ECHO_content/ECHO_Nav.py	2004/05/10 20:46:46	1.26
@@ -13,6 +13,7 @@ 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"""
@@ -181,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)
@@ -303,19 +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 x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
             x=x_objs[1]
-            x = checkOnlyOneInGroup(x)
+            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)
@@ -333,7 +339,7 @@ class ECHO_navigation(Folder):
                 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)
                     
@@ -429,14 +435,14 @@ class ECHO_navigation(Folder):
             
     def isSelectedPath(self,item):
         """test is path is already selected"""
-        found=re.search("\?(.*)",item[1])
+        found=re.search("\?(.*)/",item[1])
         if found:
             temp=re.sub(" ","%20",found.group(0))
             #print temp+"::"+self.REQUEST['QUERY_STRING']
             if ("?"+self.REQUEST['QUERY_STRING'])==temp:
                 return 1
 
-        if re.search(item[1],self.REQUEST['URL']):
+        if re.search(item[1]+"/",self.REQUEST['URL']):
             return 1
         else:
             return 0
@@ -513,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)