Fix DTML path for moved .dtml files.

doc/CHANGES.txt

@@ -11,6 +11,9 @@ Zope changes
         - Added a deprecated alias to UnrestrictedUser, Super, for use
           by user folder products that depend on the old class name.
 
+        - Fixed path for management interface files used for
+          CatalogPathAwareness and Aqueduct.
+
     Zope 2.3.0 alpha 2
 
       Features Added

lib/python/Products/ZCatalog/CatalogPathAwareness.py

@@ -101,7 +101,7 @@ class CatalogAware:
     meta_type='CatalogAware'
     default_catalog='Catalog'
 
-    manage_editCatalogerForm=DTMLFile('editCatalogerForm', globals())
+    manage_editCatalogerForm=HTMLFile('dtml/editCatalogerForm', globals())
 
     def manage_editCataloger(self, default, REQUEST=None):
         """ """

lib/python/Shared/DC/ZRDB/Aqueduct.py

@@ -84,8 +84,8 @@
 ##############################################################################
 __doc__='''Shared classes and functions
 
-$Id: Aqueduct.py,v 1.41 2000/06/13 22:10:01 amos Exp $'''
-__version__='$Revision: 1.41 $'[11:-2]
+$Id: Aqueduct.py,v 1.42 2001/01/12 11:40:54 mj Exp $'''
+__version__='$Revision: 1.42 $'[11:-2]
 
 import Globals, os
 from Globals import HTMLFile, Persistent
@@ -99,7 +99,7 @@ from DocumentTemplate import HTML
 
 from string import strip, replace
 
-dtml_dir=Globals.package_home(globals())
+dtml_dir=Globals.package_home(globals()) + '/dtml'
 
 InvalidParameter='Invalid Parameter'