--- ECHO_content/ECHO_Nav.py	2004/02/03 15:39:12	1.2
+++ ECHO_content/ECHO_Nav.py	2004/02/03 16:58:31	1.3
@@ -17,29 +17,40 @@ class ECHO_sqlElement(SimpleItem):
     meta_type="ECHO_sqlElement"
     baseUrl=""
     
-    def __init__(self,id,title,query,field,baseUrl):
+    def __init__(self,id,title,query,field,baseUrl,weight):
         """init"""
         self.id=id
         self.title=title
         self.query=query
         self.field=field
         self.baseUrl=baseUrl
+        self.weight=weight
 
     manage_options= SimpleItem.manage_options+(
         {'label':'Main Config','action':'changeECHO_sqlElementForm'},
         )
 
+    def getWeight(self):
+        if has_attr('weight'):
+            return weight
+
+        else:
+            return 0
+        
+        
+
     def changeECHO_sqlElementForm(self):
         """change"""
         pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_sqlElement.zpt').__of__(self)
         return pt()
 
-    def changeECHO_sqlElement(self,title,query,field,baseUrl,RESPONSE=None):
+    def changeECHO_sqlElement(self,title,query,field,baseUrl,weight,RESPONSE=None):
         """change"""
         self.title=title
         self.query=query
         self.field=field
         self.baseUrl=baseUrl
+        self.weight=weight
 
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -79,6 +90,17 @@ class ECHO_pageTemplate(ZopePageTemplate
     _default_content_fn = os.path.join(package_home(globals()),
                                        'ECHO_pageTemplateDefault.html')
 
+    manage_options=ZopePageTemplate.manage_options+(
+        {'label':'Weight','action':'changeECHO_pageTemplateWeightForm'},
+        )
+
+    def changeECHO_pageTemplateWeightForm(self):
+    """change"""
+    pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
+    return pt()
+
+
+
 
     ## def __init__(self, id, text=None, content_type=None):
 ##         self.id = str(id)
@@ -95,7 +117,7 @@ def manage_AddECHO_pageTemplateForm(self
 from urllib import quote
 
 
-def manage_AddECHO_pageTemplate(self, id, title=None, text=None,
+def manage_AddECHO_pageTemplate(self, id, weight= 0,title=None, text=None,
                            REQUEST=None, submit=None):
     "Add a Page Template with optional file content."
 
@@ -104,6 +126,7 @@ def manage_AddECHO_pageTemplate(self, id
     if REQUEST is None:
         self._setObject(id, ECHO_pageTemplate(id, text))
         ob = getattr(self, id)
+        setattr(ob,'weight',weight)
         if title:
             ob.pt_setTitle(title)
         return ob
@@ -116,6 +139,8 @@ def manage_AddECHO_pageTemplate(self, id
             zpt = ECHO_pageTemplate(id, file, headers.get('content_type'))
 
         self._setObject(id, zpt)
+        ob = getattr(self, id)
+        setattr(ob,'weight',weight)
 
         try:
             u = self.DestinationURL()
@@ -219,7 +244,8 @@ class ECHO_navigation(Folder):
                 for z in temp[x][1].getNavList():
                     listNav.append((z[0],z[1]))
             else:
-                listNav.append((temp[x][1].title,self.absolute_url()+createPath(temp[x][1].absolute_url())))
+                listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url())))
+                print self.absolute_url(),"::",temp[x][1].absolute_url()
 
         #print listNav
 
@@ -272,7 +298,7 @@ class ECHO_navigation(Folder):
             
             description=temp[x][1].title
          
-            url=self.absolute_url()+createPath(temp[key][1].absolute_url())
+            url=createPath(self.absolute_url(),temp[key][1].absolute_url())
 
             if (self.REQUEST['URL']==url) | (self.REQUEST['URL']==url+"/index_html"):
                 html=html+startTag+"[%s]" % description+endTag
@@ -371,9 +397,15 @@ def manage_AddECHO_navigation(self,id,ti
 
 #helpers
 
-def createPath(url):
-    temp=url.split("/")
-    del temp[0]
-    del temp[1]
-    return string.join(temp,"/")
+
+
+def createPath(url1,url2):
+    temp1=url1.split("/")
+    temp2=url2.split("/")
+    for test in temp1:
+        if temp2[0]==test:
+            del temp2[0]
+
+    return url1+"/"+string.join(temp2,"/")
+