--- ECHO_content/ECHO_Nav.py	2004/05/06 13:05:49	1.21
+++ ECHO_content/ECHO_Nav.py	2004/06/07 17:14:23	1.32
@@ -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"""
@@ -178,9 +179,13 @@ class ECHO_pageTemplate(ZopePageTemplate
                                        'html/ECHO_pageTemplateDefault.html')
 
     manage_options=ZopePageTemplate.manage_options+(
-        {'label':'Weight and Type','action':'changeECHO_pageTemplateWeightForm'},
+        {'label':'Main Config','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)
@@ -279,6 +284,10 @@ class ECHO_navigation(Folder):
 
     displayedMetaTypes=displayTypes
     
+    def getR(self):
+	"""re"""
+	return self.REQUEST
+
     def __init__(self,id,title,pathToHierarchy):
         """init"""
         self.id=id
@@ -308,7 +317,7 @@ class ECHO_navigation(Folder):
         #print "HERE",obj.
         for x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
             x=x_objs[1]
-            if checkOnly=="no":
+            if checkOnly=="yes":
                 x = checkOnlyOneInGroup(x)
             if depth>1:
                 nav[x.getId()]=(self.getColls(x,depth-1),x)
@@ -342,7 +351,7 @@ class ECHO_navigation(Folder):
         #print nav
         return nav
 
-    def barFromHash(self,hash,start=None,sortField=None):
+    def barFromHash(self,hash,start=None,sortField=None,location=None):
         """Erzeuge Navigations Element"""
         #print "hash",hash
         listNav=[]
@@ -356,7 +365,7 @@ class ECHO_navigation(Folder):
                 tempObj=self.pathToHierarchy[0:]
                 tempObj=re.sub("/",".",tempObj)
                 tempObj="self.aq_parent"+tempObj
-
+		#print tempObj
                 objtemp=eval(tempObj)
 
                 obj=objtemp
@@ -386,7 +395,7 @@ class ECHO_navigation(Folder):
                     for z in temp[x][1].getNavList():
                         listNav.append((z[0],z[1],None))
                 else:
-                    # add label fals existiert und nicht leer
+                    # add label falls existiert und nicht leer
                     if hasattr(temp[x][1],'label'):
                         if not temp[x][1].label=='':
                             label=temp[x][1].label.encode('utf-8')
@@ -395,9 +404,13 @@ class ECHO_navigation(Folder):
                             label=temp[x][1].title.encode('utf-8')
                     else:
                         label=temp[x][1].title.encode('utf-8')                            
-                    
-                    listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
-                    
+
+                    if location:
+                        loc=getattr(temp[x][1],'location','top')
+                        if (loc==location):
+                            listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
+                    else:
+                        listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
         #print self.getId(),start
         #print listNav
 
@@ -430,14 +443,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
@@ -493,13 +506,13 @@ class ECHO_navigation(Folder):
             
         return keys
 
-    def mainNavElements(self):
+    def mainNavElements(self,location=None):
         """print main navigation bar"""
         keys=""
         #print "NAVELEMENT",self.getId()
         #try:
-      
-        keys=self.barFromHash(self.createNavHash(0))
+        
+        keys=self.barFromHash(self.createNavHash(0),location=location)
         
         #except:
         #    keys=""
@@ -511,10 +524,20 @@ class ECHO_navigation(Folder):
 
 	return len(self.barFromHash(self.createNavHash(0))) 
 
+    def startOfHierarchy(self,list):
+        splitted=self.pathToHierarchy.split("/")
+        last=splitted[len(splitted)-1]
+        #print last,list
+        try:
+            nr=list.index(last)
+        except:
+            nr=0
+        return nr+1
+    
     def secondNavElements(self):
         """Zweite Ordnung"""
         
-        hash=self.createNavHash(2,checkOnly="yes")
+        hash=self.createNavHash(2,checkOnly="no")
         actual_url=self.REQUEST['URL']
         
         ult_temp=re.sub(self.absolute_url(),"",actual_url)
@@ -522,8 +545,12 @@ class ECHO_navigation(Folder):
 
         splitted=ult_temp.split("/")
         
-
-        start=[splitted[2]]
+	#print "AU",self.absolute_url(),splitted
+	#start=[splitted[2]] #orig
+        startNr= self.startOfHierarchy(splitted)
+        
+	start=[splitted[startNr]]
+	
         #print start
        
         keys=self.barFromHash(hash,start=start)
@@ -548,7 +575,10 @@ class ECHO_navigation(Folder):
 ##         else:
 ##             start=[splitted[len(splitted)-1]]
 
-        start=splitted[2:order+1]
+        #start=splitted[2:order+1] #orig
+        startNr= self.startOfHierarchy(splitted)
+        #print startNr
+	start=splitted[startNr:order+startNr-1] 
         #print start
        
         keys=self.barFromHash(hash,start=start)
@@ -606,6 +636,7 @@ def createPath(url1,url2):
         if temp2[0]==test:
             del temp2[0]
 
+    #print "CP:"+url1+"::"+url2+"::"+url1+"/"+string.join(temp2,"/")
     return url1+"/"+string.join(temp2,"/")
 
 def sortWeight(x,y):