--- ECHO_content/ECHO_Nav.py	2004/05/10 13:51:03	1.24
+++ ECHO_content/ECHO_Nav.py	2004/06/08 13:58:35	1.33
@@ -179,7 +179,7 @@ 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):
@@ -214,9 +214,9 @@ class ECHO_pageTemplate(ZopePageTemplate
             return 0
         
     def getcontentType(self):
-        """get weight"""
-        if hasattr(self,'weight'):
-            return self.weight
+        """get contentType"""
+        if hasattr(self,'contentType'):
+            return self.contentType
         else:
             return 0
 
@@ -284,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
@@ -347,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=[]
@@ -361,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
@@ -391,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')
@@ -400,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
 
@@ -435,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
@@ -498,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=""
@@ -516,6 +524,16 @@ 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"""
         
@@ -527,11 +545,15 @@ 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,showElements)
+        keys=self.barFromHash(hash,start=start)
         
         
         return keys
@@ -553,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)
@@ -611,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):