--- ECHO_content/ECHO_Nav.py	2004/05/28 09:50:39	1.29
+++ ECHO_content/ECHO_Nav.py	2004/06/07 17:14:23	1.32
@@ -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):
@@ -351,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=[]
@@ -404,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
 
@@ -502,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=""
@@ -573,7 +577,8 @@ class ECHO_navigation(Folder):
 
         #start=splitted[2:order+1] #orig
         startNr= self.startOfHierarchy(splitted)
-	start=splitted[startNr:order] 
+        #print startNr
+	start=splitted[startNr:order+startNr-1] 
         #print start
        
         keys=self.barFromHash(hash,start=start)