--- ECHO_content/ECHO_Nav.py	2004/02/03 16:58:31	1.3
+++ ECHO_content/ECHO_Nav.py	2004/02/05 17:13:18	1.5
@@ -31,9 +31,9 @@ class ECHO_sqlElement(SimpleItem):
         )
 
     def getWeight(self):
-        if has_attr('weight'):
-            return weight
-
+        """get weight"""
+        if hasattr(self,'weight'):
+            return self.weight
         else:
             return 0
         
@@ -95,10 +95,23 @@ class ECHO_pageTemplate(ZopePageTemplate
         )
 
     def changeECHO_pageTemplateWeightForm(self):
-    """change"""
-    pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
-    return pt()
+        """change"""
+        pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
+        return pt()
 
+    def changeECHO_pageTemplateWeight(self,weight,RESPONSE=None):
+        """change"""
+        self.weight=weight
+
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+        
+    def getWeight(self):
+        """get weight"""
+        if hasattr(self,'weight'):
+            return self.weight
+        else:
+            return 0
 
 
 
@@ -210,7 +223,7 @@ class ECHO_navigation(Folder):
 
         #objtemp = compile(temp,'<string>','single')
         #obj=eval(objtemp)
-        print obj 
+        #print obj 
         
         #print obj.__dict__.keys()
         
@@ -219,6 +232,7 @@ class ECHO_navigation(Folder):
             if hasattr(x,"meta_type"):
                 #print x.meta_type
                 if x.meta_type in self.displayedMetaTypes:
+                   
                     if depth>1:
                         nav[x.getId()]=(self.getColls(x,int(depth)-1),x)
                     else:
@@ -228,26 +242,47 @@ class ECHO_navigation(Folder):
         #print nav
         return nav
 
-    def barFromHash(self,hash,start=None):
+    def barFromHash(self,hash,start=None,sortField=None):
         """Erzeuge Navigations Element"""
         #print "hash",hash
         listNav=[]
         if not start:
             temp=hash
+            sortField="weight"
         else: # list mit pfad zum hash
             temp=hash
-            for x in start:
-                temp=temp[x][0]
+            print "HI",sortField
+            if not sortField:
+                tempObj=self.pathToHierarchy[0:]
+                tempObj=re.sub("/",".",tempObj)
+                tempObj="self.aq_parent"+tempObj
 
-        for x in temp.keys():
-            if temp[x][1].meta_type=="ECHO_sqlElement":
-                for z in temp[x][1].getNavList():
-                    listNav.append((z[0],z[1]))
-            else:
-                listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url())))
-                print self.absolute_url(),"::",temp[x][1].absolute_url()
+                objtemp=eval(tempObj)
+
+                obj=objtemp
+
+                for x in start:
 
-        #print listNav
+
+                    obj=getattr(obj,x)
+
+                if hasattr(obj,'sortfield'):
+                    sortField=obj.sortfield
+                else:
+                    sortField='weight'
+            for x in start:
+                    temp=temp[x][0]
+        print "HELL",sortField
+        for x in self.tempSorted(temp, field=sortField):
+            if not temp[x][1].title == "":
+                if temp[x][1].meta_type=="ECHO_sqlElement":
+                    for z in temp[x][1].getNavList():
+                        listNav.append((z[0],z[1]))
+                else:
+                    listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url())))
+                    
+        print self.getId(),start
+        print listNav
 
         #html=""
         #for k in listNav:
@@ -256,6 +291,26 @@ class ECHO_navigation(Folder):
 
         return listNav
 
+    def tempSorted(self,hash,field="weight"):
+        ls=[]
+        print "SORT",field
+        for x in hash.keys():
+            #print hash[x][1]
+            if hasattr(hash[x][1],field):
+                weight=getattr(hash[x][1],field)
+                #print weight
+            else:
+                weight=0
+
+            ls.append((x,weight))
+
+        ls.sort(sortWeight)
+        
+        return [x[0] for x in ls]
+
+    
+        
+            
     def isSelectedPath(self,item):
         """test is path is already selected"""
         found=re.search("\?(.*)",item[1])
@@ -294,7 +349,7 @@ class ECHO_navigation(Folder):
                 temp=temp[x][0]
                 #print temp
         
-        for key in temp.keys():
+        for key in self.tempSorted(temp):
             
             description=temp[x][1].title
          
@@ -313,6 +368,7 @@ class ECHO_navigation(Folder):
     def mainNavBar(self):
         """print main navigation bar"""
         keys=""
+        print "NAVBAR",self.getId()
         try:
             keys=self.buttonsFromHash(self.createNavHash(0))
         except:
@@ -323,11 +379,13 @@ class ECHO_navigation(Folder):
     def mainNavElements(self):
         """print main navigation bar"""
         keys=""
+        print "NAVELEMENT",self.getId()
+        #try:
+      
+        keys=self.barFromHash(self.createNavHash(0))
 
-        try:
-            keys=self.barFromHash(self.createNavHash(0))
-        except:
-            keys=""
+        #except:
+        #    keys=""
             
         return keys
     
@@ -350,7 +408,7 @@ class ECHO_navigation(Folder):
 
         start=[splitted[2]]
         #print start
-        
+       
         keys=self.barFromHash(hash,start=start)
         
         
@@ -407,5 +465,8 @@ def createPath(url1,url2):
             del temp2[0]
 
     return url1+"/"+string.join(temp2,"/")
-    
+
+def sortWeight(x,y):
+    #print x[1],y[1]
+    return cmp(x[1],y[1])