--- ECHO_content/ECHO_Nav.py	2004/04/15 11:24:56	1.14
+++ ECHO_content/ECHO_Nav.py	2004/05/06 10:27:07	1.18
@@ -12,6 +12,7 @@ from Products.PageTemplates.ZopePageTemp
 import os.path
 from Globals import package_home
 import urllib
+from ECHO_helpers import displayTypes,checkOnlyOneInGroup
 
 class ECHO_contentType(Image):
     """ContentType Object"""
@@ -185,13 +186,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.encode('utf-8')
+        else:
+            return 0
         
     def getWeight(self):
         """get weight"""
@@ -225,7 +233,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 +243,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 +277,7 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
-    displayedMetaTypes=['ECHO_group','ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
+    displayedMetaTypes=displayTypes
     
     def __init__(self,id,title,pathToHierarchy):
         """init"""
@@ -297,14 +306,13 @@ class ECHO_navigation(Folder):
     def getColls(self,obj,depth):
         nav={}
         #print "HERE",obj.
-        for keys in obj.__dict__.keys():
-            x=getattr(obj,keys)
-            if hasattr(x,"meta_type"):
-                if x.meta_type in self.displayedMetaTypes:
-                    if depth>1:
-                        nav[x.getId()]=(self.getColls(x,depth-1),x)
-                    else:
-                        nav[x.getId()]=(None,x)
+        for x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
+            x=x_objs[1]
+            x = checkOnlyOneInGroup(x)
+            if depth>1:
+                nav[x.getId()]=(self.getColls(x,depth-1),x)
+            else:
+                nav[x.getId()]=(None,x)
         return nav
     
     def createNavHash(self,depth):
@@ -316,19 +324,12 @@ class ECHO_navigation(Folder):
         objtemp=eval(temp)
         nav={}
         obj=objtemp
-        
-        #exec(obj)
 
-        #objtemp = compile(temp,'<string>','single')
-        #obj=eval(objtemp)
-        #print obj 
-        
-        #print obj.__dict__.keys()
         
         for keys in obj.__dict__.keys():
             x=getattr(obj,keys)
             if hasattr(x,"meta_type"):
-                #print x.meta_type
+
                 if x.meta_type in self.displayedMetaTypes:
                    
                     if depth>1:
@@ -382,17 +383,17 @@ class ECHO_navigation(Folder):
             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]))
+                        listNav.append((z[0],z[1],None))
                 else:
                     # add label fals existiert und nicht leer
                     if hasattr(temp[x][1],'label'):
                         if not temp[x][1].label=='':
-                            label=temp[x][1].label
+                            label=temp[x][1].label.encode('utf-8')
                             
                         else:
-                            label=temp[x][1].title
+                            label=temp[x][1].title.encode('utf-8')
                     else:
-                        label=temp[x][1].title                            
+                        label=temp[x][1].title.encode('utf-8')                            
                     
                     listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
                     
@@ -521,11 +522,6 @@ class ECHO_navigation(Folder):
         splitted=ult_temp.split("/")
         
 
-        ## if splitted[len(splitted)-1]=="index_html":
-##             start=[splitted[len(splitted)-2]]
-##         else:
-##             start=[splitted[len(splitted)-1]]
-
         start=[splitted[2]]
         #print start