--- ECHO_content/ECHO_Nav.py	2004/07/21 16:36:18	1.37
+++ ECHO_content/ECHO_Nav.py	2004/08/17 15:22:14	1.39
@@ -204,7 +204,7 @@ class ECHO_sqlElement(SimpleItem):
         else:
             self.searchField=searchField
         self.baseUrl=baseUrl
-        self.weight=weight
+
         self.content=contentType
 
     manage_options= SimpleItem.manage_options+(
@@ -254,9 +254,11 @@ class ECHO_sqlElement(SimpleItem):
 
     def searchQuery(self,query=None,obj=None):
         #presently a hack, tests if search is of the search method, if not look at the next level.
+        #
+        #return self.ZSQLsimpleSearch(var=self.query)
         if not query:
             query=self.query
-            
+           
         if self.search.meta_type=="Z SQL Method":
             return self.search(var=self.query)
         else:
@@ -264,7 +266,9 @@ class ECHO_sqlElement(SimpleItem):
                 return self.aq_parent.aq_parent.search(var=self.query)
             else:
                 return []
-
+        
+        
+        
     
     def getNavList(self):
         """ausgabe der treffer list für navigation"""
@@ -306,23 +310,24 @@ class ECHO_pageTemplate(ZopePageTemplate
                                        'html/ECHO_pageTemplateDefault.html')
 
     manage_options=ZopePageTemplate.manage_options+(
-        {'label':'Main Config','action':'changeECHO_pageTemplateWeightForm'},
+        {'label':'Main Config','action':'changeECHO_pageTemplateMainForm'},
         )
 
     def content_html(self):
 	"""content_html"""
 	return content_html(self,'pageTemplate')
 
-    def changeECHO_pageTemplateWeightForm(self):
+    def changeECHO_pageTemplateMainForm(self):
         """change"""
-        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
+        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateWeight(self,weight,contentType,label,RESPONSE=None):
+    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None):
         """change"""
         self.weight=weight
         self.contentType=contentType
         self.label=label
+        self.description=description
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -537,8 +542,10 @@ class ECHO_navigation(Folder):
                     # add label falls existiert und nicht leer
                     if hasattr(temp[x][1],'label'):
                         if not temp[x][1].label=='':
-                            label=temp[x][1].label.encode('utf-8','ignore')
-                            
+                            try:
+                                label=temp[x][1].label.encode('utf-8','ignore')
+                            except:
+                                label=temp[x][1].label
                         else:
                             label=temp[x][1].title.encode('utf-8')
                     else: