--- ECHO_content/ECHO_Nav.py	2004/06/07 13:37:26	1.31
+++ ECHO_content/ECHO_Nav.py	2004/06/15 11:58:02	1.34
@@ -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
 
@@ -264,6 +264,7 @@ def manage_addECHO_pageTemplate(self, id
         self._setObject(id, zpt)
         ob = getattr(self, id)
         setattr(ob,'weight',weight)
+        setattr(ob,'label',label)
         if title:
             ob.pt_setTitle(title)
         
@@ -351,7 +352,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 +405,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 +507,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=""