--- ECHO_content/ECHO_Nav.py	2004/09/27 14:39:59	1.47
+++ ECHO_content/ECHO_Nav.py	2004/10/28 13:38:39	1.48
@@ -12,9 +12,9 @@ from Products.PageTemplates.ZopePageTemp
 import os.path
 from Globals import package_home
 import urllib
-from ECHO_helpers import displayTypes,checkOnlyOneInGroup
+from ECHO_helpers import *
 from ECHO_collection import content_html
-
+from types import *
 
 
 from Globals import DTMLFile
@@ -51,6 +51,7 @@ class ECHO_ZCatalogElement(SimpleItem):
         self.weight=weight
         self.content=contentType
 
+        
     manage_options= SimpleItem.manage_options+(
         {'label':'Main Config','action':'changeECHO_ZCatalogElementForm'},
         )
@@ -75,7 +76,7 @@ class ECHO_ZCatalogElement(SimpleItem):
     def changeECHO_ZCatalogElementForm(self):
         """change"""
         
-        pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_ZCatalogElement.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_ZCatalogElement.zpt')).__of__(self)
         return pt()
 
     def changeECHO_ZCatalogElement(self,title,field,catalogId,baseUrl,weight,contentType,RESPONSE=None):
@@ -116,7 +117,7 @@ class ECHO_ZCatalogElement(SimpleItem):
 
 def manage_addECHO_ZCatalogElementForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_ZCatalogElement.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_content/zpt/AddECHO_ZCatalogElement.zpt')).__of__(self)
     return pt()
 
 def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None):
@@ -140,9 +141,9 @@ class ECHO_contentType(Image):
 
     def changeECHO_contentTypeForm(self):
         """Change the description text"""
-        pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_contentType.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_contentType.zpt')).__of__(self)
         return pt()
-
+ 
     def changeECHO_contentType(self,description,RESPONSE=None):
         """Change the Content"""
         self.description=description
@@ -238,7 +239,7 @@ class ECHO_sqlElement(SimpleItem):
     def changeECHO_sqlElementForm(self):
         """change"""
         
-        pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeECHO_sqlElement.zpt')).__of__(self)
         return pt()
 
     def changeECHO_sqlElement(self,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None):
@@ -293,7 +294,7 @@ class ECHO_sqlElement(SimpleItem):
 
 def manage_addECHO_sqlElementForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_sqlElement.zpt')).__of__(self)
     return pt()
 
 def manage_addECHO_sqlElement(self,id,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None):
@@ -321,7 +322,7 @@ class ECHO_pageTemplate(ZopePageTemplate
 
     def changeECHO_pageTemplateMainForm(self):
         """change"""
-        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_pageTemplateMain.zpt')).__of__(self)
         return pt()
 
     def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None,suffix=None,prefix=None):
@@ -370,7 +371,7 @@ class ECHO_pageTemplate(ZopePageTemplate
 
 def manage_addECHO_pageTemplateForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt')).__of__(self)
     return pt()
 
 from urllib import quote
@@ -430,7 +431,7 @@ class ECHO_navigation(Folder):
 
     def ECHO_cacheManageForm(self):
 	    """change form"""
-	    pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_cacheManageForm').__of__(self)
+	    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_cacheManageForm')).__of__(self)
 	    pt.content_type="text/html"
 	    return pt()
 
@@ -470,8 +471,10 @@ class ECHO_navigation(Folder):
         
         return "changed all CM in: "+self.title
 
-    displayedMetaTypes=displayTypes
+    
 
+    displayableMetaTypes=displayTypes
+    
     def getImageViewers(self):
         """images"""
         viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject'])
@@ -486,22 +489,26 @@ class ECHO_navigation(Folder):
         self.id=id
         self.title=title
         self.pathToHierarchy=pathToHierarchy
-
+        self.displayedMetaTypes=displayTypes
+        
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_navigationConfigForm'},
         {'label':'Cache','action':'ECHO_cacheManageForm'},
 
         )
-
+    displayedMetaTypes=displayTypes
+    
     def ECHO_navigationConfigForm(self):
         """configForm"""
-        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_navigation.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_navigation.zpt')).__of__(self)
         return pt()
     
-    def ECHO_navigationConfig(self,title,pathToHierarchy,RESPONSE=None):
+    def ECHO_navigationConfig(self,title,pathToHierarchy,displayedMetaTypes=displayTypes,RESPONSE=None):
         """config"""
         self.title=title
         self.pathToHierarchy=pathToHierarchy
+        self.displayedMetaTypes=toList(displayedMetaTypes)[0:]
+
 
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -849,7 +856,7 @@ class ECHO_navigation(Folder):
 
 def manage_addECHO_navigationForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_navigation.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_navigation.zpt')).__of__(self)
     return pt()
 
 def manage_addECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None):