--- ECHO_content/ECHO_Nav.py	2004/02/05 17:13:18	1.5
+++ ECHO_content/ECHO_Nav.py	2004/02/09 11:45:46	1.6
@@ -17,7 +17,7 @@ class ECHO_sqlElement(SimpleItem):
     meta_type="ECHO_sqlElement"
     baseUrl=""
     
-    def __init__(self,id,title,query,field,baseUrl,weight):
+    def __init__(self,id,title,query,field,baseUrl,weight,content_type):
         """init"""
         self.id=id
         self.title=title
@@ -25,6 +25,7 @@ class ECHO_sqlElement(SimpleItem):
         self.field=field
         self.baseUrl=baseUrl
         self.weight=weight
+        self.content=content_type
 
     manage_options= SimpleItem.manage_options+(
         {'label':'Main Config','action':'changeECHO_sqlElementForm'},
@@ -37,21 +38,30 @@ class ECHO_sqlElement(SimpleItem):
         else:
             return 0
         
+    def getContent_type(self):
+        """get weight"""
+        
+        if hasattr(self,'content_type'):
+            return self.content_type
+        else:
+            return 0
         
 
     def changeECHO_sqlElementForm(self):
         """change"""
-        pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_sqlElement.zpt').__of__(self)
+        
+        pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self)
         return pt()
 
-    def changeECHO_sqlElement(self,title,query,field,baseUrl,weight,RESPONSE=None):
+    def changeECHO_sqlElement(self,title,query,field,baseUrl,weight,content_type,RESPONSE=None):
         """change"""
         self.title=title
         self.query=query
         self.field=field
         self.baseUrl=baseUrl
         self.weight=weight
-
+        self.content_type=content_type
+        
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
@@ -70,14 +80,14 @@ class ECHO_sqlElement(SimpleItem):
             return ret
     
 
-def manage_AddECHO_sqlElementForm(self):
+def manage_addECHO_sqlElementForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/AddECHO_sqlElement.zpt').__of__(self)
+    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self)
     return pt()
 
-def manage_AddECHO_sqlElement(self,id,title,query,field,baseUrl,RESPONSE=None):
+def manage_addECHO_sqlElement(self,id,title,query,field,baseUrl,weight,content_type,RESPONSE=None):
     """Add an ECHO_sqlelement"""
-    self._setObject(id,ECHO_sqlElement(id,title,query,field,baseUrl))
+    self._setObject(id,ECHO_sqlElement(id,title,query,field,baseUrl,weight,content_type))
     
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
@@ -88,20 +98,21 @@ class ECHO_pageTemplate(ZopePageTemplate
     meta_type="ECHO_pageTemplate"
 
     _default_content_fn = os.path.join(package_home(globals()),
-                                       'ECHO_pageTemplateDefault.html')
+                                       'html/ECHO_pageTemplateDefault.html')
 
     manage_options=ZopePageTemplate.manage_options+(
-        {'label':'Weight','action':'changeECHO_pageTemplateWeightForm'},
+        {'label':'Weight and Type','action':'changeECHO_pageTemplateWeightForm'},
         )
 
     def changeECHO_pageTemplateWeightForm(self):
         """change"""
-        pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
+        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateWeight(self,weight,RESPONSE=None):
+    def changeECHO_pageTemplateWeight(self,weight,content_type,RESPONSE=None):
         """change"""
         self.weight=weight
+        self.content_type=content_type
 
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -112,6 +123,14 @@ class ECHO_pageTemplate(ZopePageTemplate
             return self.weight
         else:
             return 0
+        
+    def getContent_Type(self):
+        """get weight"""
+        if hasattr(self,'weight'):
+            return self.weight
+        else:
+            return 0
+
 
 
 
@@ -122,15 +141,15 @@ class ECHO_pageTemplate(ZopePageTemplate
 ##             text = open(self._default_cont).read()
 ##         self.pt_edit(text, content_type)
 
-def manage_AddECHO_pageTemplateForm(self):
+def manage_addECHO_pageTemplateForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/AddECHO_pageTemplate.zpt').__of__(self)
+    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt').__of__(self)
     return pt()
 
 from urllib import quote
 
 
-def manage_AddECHO_pageTemplate(self, id, weight= 0,title=None, text=None,
+def manage_addECHO_pageTemplate(self, id, weight= 0,content_type=0,title=None, text=None,
                            REQUEST=None, submit=None):
     "Add a Page Template with optional file content."
 
@@ -140,6 +159,7 @@ def manage_AddECHO_pageTemplate(self, id
         self._setObject(id, ECHO_pageTemplate(id, text))
         ob = getattr(self, id)
         setattr(ob,'weight',weight)
+        setattr(ob,'content_type',content_type)
         if title:
             ob.pt_setTitle(title)
         return ob
@@ -184,7 +204,7 @@ class ECHO_navigation(Folder):
 
     def ECHO_navigationConfigForm(self):
         """configForm"""
-        pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_navigation.zpt').__of__(self)
+        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_navigation.zpt').__of__(self)
         return pt()
     
     def ECHO_navigationConfig(self,title,pathToHierarchy,RESPONSE=None):
@@ -440,12 +460,12 @@ class ECHO_navigation(Folder):
         
         return keys
 
-def manage_AddECHO_navigationForm(self):
+def manage_addECHO_navigationForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/AddECHO_navigation.zpt').__of__(self)
+    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_navigation.zpt').__of__(self)
     return pt()
 
-def manage_AddECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None):
+def manage_addECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None):
     """Add an ECHO_root"""
     self._setObject(id,ECHO_navigation(id,title,pathToHierarchy))