--- versionedFile/versionedFile.py	2004/11/04 08:53:38	1.18
+++ versionedFile/versionedFile.py	2004/11/23 13:09:27	1.19
@@ -8,12 +8,19 @@ from Products.PageTemplates.PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from AccessControl import ClassSecurityInfo
 import os.path
+
 import time
+try:
+    from Products.ECHO_content.ECHO_collection import ECHO_basis
+except:
+    print "ECHO Elements not imported"
+    ECHO_basis=None
 
+	
 def sortv(x,y):
     return cmp(x[0],y[0])
  
-class versionedFileFolder(Folder):
+class versionedFileFolder(Folder,ECHO_basis):
     """Folder with versioned files"""
 
     
@@ -21,16 +28,23 @@ class versionedFileFolder(Folder):
 
     security= ClassSecurityInfo()
     security.declareProtected('AUTHENTICATED_USER','addFileForm')
-    
-    manage_options = Folder.manage_options+(
+
+    if ECHO_basis:
+        optTMP= Folder.manage_options+ECHO_basis.manage_options
+    else:
+        optTMP= Folder.manage_options
+
+    manage_options =optTMP+(
 		{'label':'Generate Index.html','action':'generateIndexHTML'},
                 {'label':'Generate history_template.html','action':'generateHistoryHTML'},
-		)
+                )
 
+  
+    
     def helpDownload(self):
         """download help"""
         
-        pt=PageTemplateFile('Products/versionedFile/zpt/helpDownload').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','helpDownload')).__of__(self)
         return pt()
     
     def generateIndexHTML(self,RESPONSE=None):
@@ -113,7 +127,7 @@ class versionedFileFolder(Folder):
         if ext:
             return ext[0][1]()
         
-        pt=PageTemplateFile('Products/versionedFile/zpt/versionFileFolderMain').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionFileFolderMain')).__of__(self)
         return pt()
 
 
@@ -332,7 +346,7 @@ class versionedFile(Folder):
         if ext:
             return getattr(self,ext[0][1].getId())()
         
-        pt=PageTemplateFile('Products/versionedFile/zpt/versionHistory').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self)
         return pt()
 
     def getVersions(self):
@@ -405,7 +419,7 @@ class versionedFile(Folder):
     
 def manage_addVersionedFileForm(self):
     """interface for adding the OSAS_root"""
-    pt=PageTemplateFile('Products/versionedFile/zpt/addVersionedFile.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVersionedFile.zpt')).__of__(self)
     return pt()
 
 def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None):