--- ECHO_content/ECHO_Nav.py	2004/09/02 12:16:52	1.46
+++ ECHO_content/ECHO_Nav.py	2004/09/27 14:39:59	1.47
@@ -324,13 +324,15 @@ class ECHO_pageTemplate(ZopePageTemplate
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None):
+    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None,suffix=None,prefix=None):
         """change"""
         self.weight=weight
         self.contentType=contentType
         self.label=label
         self.description=description
         self.isAlwaysClickable=isAlwaysClickable
+        self.suffix=suffix
+        self.prefix=prefix
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -338,6 +340,7 @@ class ECHO_pageTemplate(ZopePageTemplate
     def getLabel(self):
         if hasattr(self,'label'):
             return self.label.encode('utf-8')
+        
         else:
             return 0
         
@@ -601,14 +604,15 @@ class ECHO_navigation(Folder):
                 if (temp[x][1].meta_type=="ECHO_sqlElement") or (temp[x][1].meta_type=="ECHO_ZCatalogElement"):
             
                     for z in temp[x][1].getNavList():
-                        listNav.append((z[0],z[1],None))
+                        listNav.append((z[0],z[1],None,'',''))
             
                 else:
                     # add label falls existiert und nicht leer
                     if hasattr(temp[x][1],'label'):
+                        
                         if not temp[x][1].label=='':
                             try:
-                                label=temp[x][1].label.encode('utf-8','ignore')
+                                label=temp[x][1].getLabel()
                             except:
                                 label=temp[x][1].label
                         else:
@@ -619,9 +623,9 @@ class ECHO_navigation(Folder):
                     if location:
                         loc=getattr(temp[x][1],'location','top')
                         if (loc==location):
-                            listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
+                            listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
                     else:
-                        listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
+                        listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
 
         return listNav