--- ECHO_content/ECHO_Nav.py	2004/04/02 15:06:47	1.9
+++ ECHO_content/ECHO_Nav.py	2004/04/04 14:56:05	1.10
@@ -17,7 +17,7 @@ class ECHO_sqlElement(SimpleItem):
     meta_type="ECHO_sqlElement"
     baseUrl=""
     
-    def __init__(self,id,title,query,field,searchField,baseUrl,weight,content_type):
+    def __init__(self,id,title,query,field,searchField,baseUrl,weight,contentType):
         """init"""
         self.id=id
         self.title=title
@@ -29,7 +29,7 @@ class ECHO_sqlElement(SimpleItem):
             self.searchField=searchField
         self.baseUrl=baseUrl
         self.weight=weight
-        self.content=content_type
+        self.content=contentType
 
     manage_options= SimpleItem.manage_options+(
         {'label':'Main Config','action':'changeECHO_sqlElementForm'},
@@ -48,11 +48,11 @@ class ECHO_sqlElement(SimpleItem):
         else:
             return 0
         
-    def getContent_type(self):
+    def getcontentType(self):
         """get weight"""
         
-        if hasattr(self,'content_type'):
-            return self.content_type
+        if hasattr(self,'contentType'):
+            return self.contentType
         else:
             return 0
         
@@ -63,7 +63,7 @@ class ECHO_sqlElement(SimpleItem):
         pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self)
         return pt()
 
-    def changeECHO_sqlElement(self,title,query,field,searchField,baseUrl,weight,content_type,RESPONSE=None):
+    def changeECHO_sqlElement(self,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None):
         """change"""
         self.title=title
         self.query=query
@@ -71,7 +71,7 @@ class ECHO_sqlElement(SimpleItem):
         self.searchField=searchField
         self.baseUrl=baseUrl
         self.weight=weight
-        self.content_type=content_type
+        self.contentType=contentType
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -100,9 +100,9 @@ def manage_addECHO_sqlElementForm(self):
     pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self)
     return pt()
 
-def manage_addECHO_sqlElement(self,id,title,query,field,searchField,baseUrl,weight,content_type,RESPONSE=None):
+def manage_addECHO_sqlElement(self,id,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None):
     """Add an ECHO_sqlelement"""
-    self._setObject(id,ECHO_sqlElement(id,title,query,field,searchField,baseUrl,weight,content_type))
+    self._setObject(id,ECHO_sqlElement(id,title,query,field,searchField,baseUrl,weight,contentType))
     
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
@@ -124,10 +124,10 @@ class ECHO_pageTemplate(ZopePageTemplate
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateWeight(self,weight,content_type,RESPONSE=None):
+    def changeECHO_pageTemplateWeight(self,weight,contentType,RESPONSE=None):
         """change"""
         self.weight=weight
-        self.content_type=content_type
+        self.contentType=contentType
 
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -139,7 +139,7 @@ class ECHO_pageTemplate(ZopePageTemplate
         else:
             return 0
         
-    def getContent_Type(self):
+    def getcontentType(self):
         """get weight"""
         if hasattr(self,'weight'):
             return self.weight
@@ -149,12 +149,12 @@ class ECHO_pageTemplate(ZopePageTemplate
 
 
 
-    ## def __init__(self, id, text=None, content_type=None):
+    ## def __init__(self, id, text=None, contentType=None):
 ##         self.id = str(id)
 ##         self.ZBindings_edit(self._default_bindings)
 ##         if text is None:
 ##             text = open(self._default_cont).read()
-##         self.pt_edit(text, content_type)
+##         self.pt_edit(text, contentType)
 
 def manage_addECHO_pageTemplateForm(self):
     """Form for adding"""
@@ -164,7 +164,7 @@ def manage_addECHO_pageTemplateForm(self
 from urllib import quote
 
 
-def manage_addECHO_pageTemplate(self, id, weight= 0,content_type=0,title=None, text=None,
+def manage_addECHO_pageTemplate(self, id, weight= 0,contentType=0,title=None, text=None,
                            REQUEST=None, submit=None):
     "Add a Page Template with optional file content."
 
@@ -174,7 +174,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)
+        setattr(ob,'contentType',contentType)
         if title:
             ob.pt_setTitle(title)
         return ob
@@ -184,7 +184,7 @@ def manage_addECHO_pageTemplate(self, id
         if headers is None or not file.filename:
             zpt = ECHO_pageTemplate(id)
         else:
-            zpt = ECHO_pageTemplate(id, file, headers.get('content_type'))
+            zpt = ECHO_pageTemplate(id, file, headers.get('contentType'))
 
         self._setObject(id, zpt)
         ob = getattr(self, id)