--- ECHO_content/ECHO_Nav.py	2004/04/07 17:07:10	1.12
+++ ECHO_content/ECHO_Nav.py	2004/04/18 09:54:14	1.15
@@ -185,13 +185,20 @@ class ECHO_pageTemplate(ZopePageTemplate
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateWeight(self,weight,contentType,RESPONSE=None):
+    def changeECHO_pageTemplateWeight(self,weight,contentType,label,RESPONSE=None):
         """change"""
         self.weight=weight
         self.contentType=contentType
-
+        self.label=label
+        
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
+
+    def getLabel(self):
+        if hasattr(self,'label'):
+            return self.label
+        else:
+            return 0
         
     def getWeight(self):
         """get weight"""
@@ -225,7 +232,7 @@ def manage_addECHO_pageTemplateForm(self
 from urllib import quote
 
 
-def manage_addECHO_pageTemplate(self, id, weight= 0,contentType=0,title=None, text=None,
+def manage_addECHO_pageTemplate(self, id, label, weight= 0,contentType=0,title=None, text=None,
                            REQUEST=None, submit=None):
     "Add a Page Template with optional file content."
 
@@ -235,6 +242,7 @@ def manage_addECHO_pageTemplate(self, id
         self._setObject(id, ECHO_pageTemplate(id, text))
         ob = getattr(self, id)
         setattr(ob,'weight',weight)
+        setattr(ob,'label',label)
         setattr(ob,'contentType',contentType)
         if title:
             ob.pt_setTitle(title)
@@ -268,7 +276,7 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
-    displayedMetaTypes=['ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
+    displayedMetaTypes=['ECHO_group','ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ZSQLBibliography','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
     
     def __init__(self,id,title,pathToHierarchy):
         """init"""
@@ -377,7 +385,7 @@ class ECHO_navigation(Folder):
                     """nothing"""
                     return []
             #print "TEMP",temp,self.tempSorted(temp, field=sortField)
-        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":
@@ -388,7 +396,7 @@ class ECHO_navigation(Folder):
                     if hasattr(temp[x][1],'label'):
                         if not temp[x][1].label=='':
                             label=temp[x][1].label
-                            print "HAS LABEL",label
+                            
                         else:
                             label=temp[x][1].title
                     else:
@@ -408,7 +416,7 @@ class ECHO_navigation(Folder):
 
     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):
@@ -483,7 +491,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: