Changed things which used HTMLFile to use DTMLFile.

lib/python/App/ApplicationManager.py

@@ -83,11 +83,11 @@
 # 
 ##############################################################################
 __doc__="""System management components"""
-__version__='$Revision: 1.63 $'[11:-2]
+__version__='$Revision: 1.64 $'[11:-2]
 
 
 import sys,os,time,string,Globals, Acquisition, os, Undo
-from Globals import HTMLFile
+from Globals import DTMLFile
 from OFS.ObjectManager import ObjectManager
 from OFS.Folder import Folder
 from CacheManager import CacheManager
@@ -107,7 +107,7 @@ class Fake:
 
 class DatabaseManager(Fake, SimpleItem.Item, Acquisition.Implicit):
     """Database management"""
-    manage=manage_main=HTMLFile('dtml/dbMain', globals())
+    manage=manage_main=DTMLFile('dtml/dbMain', globals())
     id        ='DatabaseManagement'
     name=title='Database Management'
     meta_type ='Database Management'
@@ -128,7 +128,7 @@ Globals.default__class_init__(DatabaseManager)
 
 class VersionManager(Fake, SimpleItem.Item, Acquisition.Implicit):
     """Version management"""
-    manage=manage_main=HTMLFile('dtml/versionManager', globals())
+    manage=manage_main=DTMLFile('dtml/versionManager', globals())
     id        ='Versions'
     name=title='Version Management'
     meta_type ='Version Management'
@@ -152,7 +152,7 @@ _v_rst=None
 
 class DebugManager(Fake, SimpleItem.Item, Acquisition.Implicit):
     """Debug and profiling information"""
-    manage=manage_main=HTMLFile('dtml/debug', globals())
+    manage=manage_main=DTMLFile('dtml/debug', globals())
     id        ='DebugInfo'
     name=title='Debug Information'
     meta_type = name
@@ -166,7 +166,7 @@ class DebugManager(Fake, SimpleItem.Item, Acquisition.Implicit):
            )
         )
 
-    manage_debug=HTMLFile('dtml/debug', globals())
+    manage_debug=DTMLFile('dtml/debug', globals())
     
     def refcount(self, n=None, t=(type(Fake), type(Acquisition.Implicit))):
         # return class reference info
@@ -230,7 +230,7 @@ class DebugManager(Fake, SimpleItem.Item, Acquisition.Implicit):
 
     # Profiling support
 
-    manage_profile=HTMLFile('dtml/profile', globals())
+    manage_profile=DTMLFile('dtml/profile', globals())
 
     def manage_profile_stats(self, sort='time', limit=200):
         """Return profile data if available"""
@@ -259,8 +259,8 @@ class ApplicationManager(Folder,CacheManager):
     Versions= VersionManager()
     DebugInfo=DebugManager()
 
-    manage=manage_main=HTMLFile('dtml/cpContents', globals())
-    manage_undoForm=HTMLFile('dtml/undo', globals())
+    manage=manage_main=DTMLFile('dtml/cpContents', globals())
+    manage_undoForm=DTMLFile('dtml/undo', globals())
 
     def version_txt(self):
         if not hasattr(self, '_v_version_txt'):

lib/python/App/CacheManager.py

@@ -85,8 +85,8 @@
 __doc__='''Cache management support
 
 
-$Id: CacheManager.py,v 1.19 2001/01/08 22:46:56 brian Exp $'''
-__version__='$Revision: 1.19 $'[11:-2]
+$Id: CacheManager.py,v 1.20 2001/01/11 22:07:02 chrism Exp $'''
+__version__='$Revision: 1.20 $'[11:-2]
 
 import Globals, time, sys
 
@@ -98,8 +98,8 @@ class CacheManager:
     _vcache_age=60
     _vcache_size=400
 
-    manage_cacheParameters=Globals.HTMLFile('dtml/cacheParameters', globals())
-    manage_cacheGC=Globals.HTMLFile('dtml/cacheGC', globals())
+    manage_cacheParameters=Globals.DTMLFile('dtml/cacheParameters', globals())
+    manage_cacheGC=Globals.DTMLFile('dtml/cacheGC', globals())
 
     def cache_length(self):
         try: db=self._p_jar.db()

lib/python/App/Factory.py

@@ -84,8 +84,8 @@
 ##############################################################################
 __doc__='''Factory objects
 
-$Id: Factory.py,v 1.23 2001/01/08 22:46:56 brian Exp $'''
-__version__='$Revision: 1.23 $'[11:-2]
+$Id: Factory.py,v 1.24 2001/01/11 22:08:38 chrism Exp $'''
+__version__='$Revision: 1.24 $'[11:-2]
 
 import OFS.SimpleItem, Acquisition, Globals, AccessControl.Role
 import Products, Product
@@ -171,7 +171,7 @@ class Factory(
         product.aq_acquire('_manage_remove_product_meta_type')(
             product, self.id, self.object_type)
 
-    manage_main=Globals.HTMLFile('dtml/editFactory',globals())
+    manage_main=Globals.DTMLFile('dtml/editFactory',globals())
 
     def index_html(self, REQUEST):
         " "

lib/python/App/Management.py

@@ -85,13 +85,13 @@
 
 """Standard management interface support
 
-$Id: Management.py,v 1.38 2001/01/09 23:42:07 evan Exp $"""
+$Id: Management.py,v 1.39 2001/01/11 22:13:14 chrism Exp $"""
 
-__version__='$Revision: 1.38 $'[11:-2]
+__version__='$Revision: 1.39 $'[11:-2]
 
 import sys, Globals, ExtensionClass, urllib
 from Dialogs import MessageDialog
-from Globals import HTMLFile, DTMLFile
+from Globals import DTMLFile
 from string import split, join, find
 from AccessControl import getSecurityManager
 
@@ -207,12 +207,12 @@ class Navigation(ExtensionClass.Base):
           )),
         )
 
-    manage            =HTMLFile('dtml/manage', globals())
-    manage_menu       =HTMLFile('dtml/menu', globals())
+    manage            =DTMLFile('dtml/manage', globals())
+    manage_menu       =DTMLFile('dtml/menu', globals())
 
-    manage_top_frame  =HTMLFile('dtml/manage_top_frame', globals())
-    manage_page_header=HTMLFile('dtml/manage_page_header', globals())
-    manage_page_footer=HTMLFile('dtml/manage_page_footer', globals())
+    manage_top_frame  =DTMLFile('dtml/manage_top_frame', globals())
+    manage_page_header=DTMLFile('dtml/manage_page_header', globals())
+    manage_page_footer=DTMLFile('dtml/manage_page_footer', globals())
 
     manage_form_title__roles__=None
     manage_form_title =DTMLFile('dtml/manage_form_title', globals(),
@@ -223,7 +223,7 @@ class Navigation(ExtensionClass.Base):
         varnames=('form_title', 'help_product', 'help_topic') )
 
     manage_copyright__roles__=None
-    manage_copyright=HTMLFile('dtml/copyright', globals())
+    manage_copyright=DTMLFile('dtml/copyright', globals())
 
     
     manage_logout__roles__=None
@@ -238,7 +238,7 @@ Sorry, this is not yet implemented.
 
 
 setattr(Navigation, 'manage_page_style.css',
-        HTMLFile('dtml/manage_page_style.css', globals())
+        DTMLFile('dtml/manage_page_style.css', globals())
         )
 setattr(Navigation, 'manage_page_style.css__roles__', None)
 

lib/python/App/Permission.py

@@ -84,8 +84,8 @@
 ##############################################################################
 __doc__='''Zope registerable permissions
 
-$Id: Permission.py,v 1.5 2001/01/08 22:46:56 brian Exp $'''
-__version__='$Revision: 1.5 $'[11:-2]
+$Id: Permission.py,v 1.6 2001/01/11 22:17:15 chrism Exp $'''
+__version__='$Revision: 1.6 $'[11:-2]
 
 import OFS.SimpleItem, Acquisition, Globals, ExtensionClass, AccessControl.Role
 
@@ -138,7 +138,7 @@ class Permission(
         product.aq_acquire('_manage_remove_product_permission')(
             product, self.name)
 
-    manage_main=Globals.HTMLFile('dtml/editPermission',globals())
+    manage_main=Globals.DTMLFile('dtml/editPermission',globals())
 
     index_html=None
 
@@ -153,7 +153,7 @@ class PermissionManager(ExtensionClass.Base):
         'name': Permission.meta_type, 'action': 'manage_addPermissionForm'
         },
 
-    manage_addPermissionForm=Globals.HTMLFile('dtml/addPermission',globals())
+    manage_addPermissionForm=Globals.DTMLFile('dtml/addPermission',globals())
     def manage_addPermission(
         self, id, title, permission, REQUEST=None):
         ' '