--- ECHO_content/ECHO_Nav.py	2004/11/24 15:20:14	1.50
+++ ECHO_content/ECHO_Nav.py	2004/11/27 22:38:43	1.51
@@ -297,14 +297,14 @@ def manage_addECHO_sqlElement(self,id,ti
         RESPONSE.redirect('manage_main')
 
 
-class ECHO_pageTemplate(ZopePageTemplate):
+class ECHO_pageTemplate(ZopePageTemplate,ECHO_basis):
     """pageTemplate Objekt"""
     meta_type="ECHO_pageTemplate"
 
     _default_content_fn = os.path.join(package_home(globals()),
                                        'html/ECHO_pageTemplateDefault.html')
 
-    manage_options=ZopePageTemplate.manage_options+(
+    manage_options=ZopePageTemplate.manage_options+ECHO_basis.manage_options+(
         {'label':'Main Config','action':'changeECHO_pageTemplateMainForm'},
         )
 
@@ -329,14 +329,7 @@ class ECHO_pageTemplate(ZopePageTemplate
         
         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"""
         if hasattr(self,'weight'):
@@ -618,13 +611,14 @@ class ECHO_navigation(Folder):
                             label=temp[x][1].title.encode('utf-8')
                     else:
                         label=temp[x][1].title.encode('utf-8')                            
-
+                    
                     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],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
+                            listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),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],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
+                        listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
 
         return listNav
 
@@ -769,7 +763,9 @@ class ECHO_navigation(Folder):
         return nr+1
     
     def secondNavElements(self):
-        """Zweite Ordnung"""
+        """Zweite Ordnung Navigationselemente
+    
+        """
         
         hash=self.createNavHash(2,checkOnly="no")
         actual_url=self.REQUEST['URL']