changeover to new ImageFile and HTMLFile handling

lib/python/AccessControl/ACL.py

 """Access control objects"""
 
-__version__='$Revision: 1.2 $'[11:-2]
+__version__='$Revision: 1.3 $'[11:-2]
 
 
 from Persistence import Persistent
@@ -8,7 +8,7 @@ from DocumentTemplate import HTML
 from Globals import MessageDialog
 from Acquisition import Acquirer
 from string import join, strip, split
-
+from ImageFile import ImageFile
 
 
 class SafeDtml(HTML):
@@ -42,7 +42,8 @@ class ACL(Persistent, Acquirer):
 
     id         ='AccessControl'
     title      ='Access Control'
-    icon       ='AccessControl/AccessControl_icon.gif'
+    icon='AccessControlIcon'
+    AccessControlIcon=ImageFile('www/AccessControl_icon.gif', globals())
 
     _groupsForm=SafeDtml('groupsForm')
     _groupForm =SafeDtml('groupForm')

lib/python/AccessControl/User.py

 """Access control package"""
 
-__version__='$Revision: 1.21 $'[11:-2]
+__version__='$Revision: 1.22 $'[11:-2]
 
 import Globals
 from Persistence import Persistent
@@ -12,7 +12,7 @@ from DocumentTemplate import HTML
 from Globals import MessageDialog
 from base64 import decodestring
 from string import join,strip,split,lower
-
+from ImageFile import ImageFile
 
 
 class SafeDtml(HTML):
@@ -93,13 +93,14 @@ class UserFolder(Persistent, Item, Implicit, Management):
     meta_type='User Folder'
     id       ='acl_users'
     title    ='User Folder'
-    icon     ='AccessControl/UserFolder_icon.gif'
+    icon='UserFolderIcon'
+    UserFolderIcon=ImageFile('www/UserFolder_icon.gif', globals())
 
     isPrincipiaFolderish=1
     isAUserFolder=1
 
-    manage_main=Globals.HTMLFile('AccessControl/UserFolder_manage_main')
-    _editForm  =Globals.HTMLFile('AccessControl/UserFolder_manage_editForm')
+    manage_main=Globals.HTMLFile('UserFolder_manage_main', globals())
+    _editForm  =Globals.HTMLFile('UserFolder_manage_editForm', globals())
     manage=manage_main
     #index_html =manage_main
 
@@ -265,6 +266,9 @@ class UserFolderHandler:
 
 
 # $Log: User.py,v $
+# Revision 1.22  1997/12/18 16:45:28  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.21  1997/12/18 13:34:04  jim
 # Changed PersistentMapping import
 #

lib/python/App/ApplicationManager.py

 __doc__="""System management components"""
-__version__='$Revision: 1.18 $'[11:-2]
+__version__='$Revision: 1.19 $'[11:-2]
 
 
 import sys,os,time,Globals
@@ -7,7 +7,7 @@ from Globals import HTMLFile
 from OFS.ObjectManager import ObjectManager
 from CacheManager import CacheManager
 from OFS import SimpleItem
-
+from ImageFile import ImageFile
 
 
 
@@ -15,9 +15,9 @@ class ApplicationManager(ObjectManager,SimpleItem.Item,CacheManager):
     """System management"""
     __roles__=['manage',]
 
-    manage=manage_main=HTMLFile('App/appMain')
-    manage_packForm=HTMLFile('App/pack')
-    manage_undoForm=HTMLFile('App/undo')
+    manage=manage_main=HTMLFile('appMain', globals())
+    manage_packForm=HTMLFile('pack', globals())
+    manage_undoForm=HTMLFile('undo', globals())
     manage=manage_main
 
     manage_options=(
@@ -34,7 +34,9 @@ class ApplicationManager(ObjectManager,SimpleItem.Item,CacheManager):
     id        ='Control_Panel'
     name=title='Control Panel'
     meta_type ='Control Panel'
-    icon      ='OFS/ControlPanel_icon.gif'
+    icon='Icon'
+    Icon      =ImageFile('OFS/www/ControlPanel_icon.gif')
+
     process_id=os.getpid()
     process_start=int(time.time())
 

lib/python/App/CacheManager.py

@@ -58,8 +58,8 @@
 __doc__='''Cache management support
 
 
-$Id: CacheManager.py,v 1.3 1997/11/19 20:11:48 jim Exp $'''
-__version__='$Revision: 1.3 $'[11:-2]
+$Id: CacheManager.py,v 1.4 1997/12/18 16:45:29 jeffrey Exp $'''
+__version__='$Revision: 1.4 $'[11:-2]
 
 import Globals
 import time
@@ -70,7 +70,7 @@ class CacheManager:
     _cache_age=60
     _cache_size=2000
 
-    manage_cacheForm=Globals.HTMLFile('App/cache')
+    manage_cacheForm=Globals.HTMLFile('cache', globals())
 
     def cache_length(self): return len(Globals.Bobobase._jar.cache)
 
@@ -136,6 +136,9 @@ class CacheManager:
 ############################################################################## 
 #
 # $Log: CacheManager.py,v $
+# Revision 1.4  1997/12/18 16:45:29  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.3  1997/11/19 20:11:48  jim
 # Fixed bugs in check for working in a session.
 #

lib/python/App/Management.py

 """Standard management interface support
 
-$Id: Management.py,v 1.7 1997/12/05 17:10:46 brian Exp $"""
+$Id: Management.py,v 1.8 1997/12/18 16:45:30 jeffrey Exp $"""
 
-__version__='$Revision: 1.7 $'[11:-2]
+__version__='$Revision: 1.8 $'[11:-2]
 
 import sys,Globals
 from Dialogs import MessageDialog
 from Globals import HTMLFile
 from Undo import UndoSupport
-
-
+from ImageFile import ImageFile
 
 
 class Management(UndoSupport):
     """Management support"""
-    manage          =HTMLFile('App/manage')
-    manage_menu     =HTMLFile('App/menu')
-    manage_tabs     =HTMLFile('App/manage_tabs')
-    manage_copyright=HTMLFile('App/copyright')
+    # cute little tab images
+    tabs_rtab=ImageFile('www/rtab.gif', globals())
+    tabs_ltab=ImageFile('www/ltab.gif', globals())
+
+    manage          =HTMLFile('manage', globals())
+    manage_menu     =HTMLFile('menu', globals())
+    manage_tabs     =HTMLFile('manage_tabs', globals())
+    manage_copyright=HTMLFile('copyright', globals())
     manage_options  =()
+
+    PyPoweredSmall_Gif=ImageFile('www/PythonPoweredSmall.gif', globals())

lib/python/App/Undo.py

@@ -11,8 +11,8 @@
 __doc__='''short description
 
 
-$Id: Undo.py,v 1.4 1997/11/07 17:06:28 jim Exp $'''
-__version__='$Revision: 1.4 $'[11:-2]
+$Id: Undo.py,v 1.5 1997/12/18 16:45:30 jeffrey Exp $'''
+__version__='$Revision: 1.5 $'[11:-2]
 
 import Globals
 from DateTime import DateTime
@@ -20,7 +20,7 @@ from string import atof, find, atoi, split, rfind
 
 class UndoSupport:
 
-    manage_UndoForm=Globals.HTMLFile('App/undo')
+    manage_UndoForm=Globals.HTMLFile('undo', globals())
 
     def undoable_transactions(self, AUTHENTICATION_PATH=None,
 			      first_transaction=None,
@@ -87,6 +87,9 @@ class UndoSupport:
 ############################################################################## 
 #
 # $Log: Undo.py,v $
+# Revision 1.5  1997/12/18 16:45:30  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.4  1997/11/07 17:06:28  jim
 # Added session support.
 #

lib/python/App/copyright.dtml

@@ -81,7 +81,7 @@ Creations, 910 Princess Anne Street, Suite 300, Fredericksburg, VA 22401.
 
 <A NAME="PYTHON">
 <H3>
-<img src="<!--#var SOFTWARE_URL-->/App/PythonPoweredSmall.gif">
+<img src="PyPoweredSmall_Gif">
 This software is powered by <a href="http://www.python.org/">Python</a>!
 </H3>
 <p>Copyright &copy; 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,

lib/python/App/manage_tabs.dtml

@@ -6,8 +6,8 @@
   <!--#if expr="_vars['PATH_INFO'][-(_.len(action)):]==action"-->
   <TD ALIGN="CENTER" VALIGN="TOP" BGCOLOR="#FFFFFF">
   <FONT SIZE="-1">
-  <IMG ALIGN="LEFT" HSPACE="0" SRC="<!--#var SOFTWARE_URL-->/App/ltab.gif">
-  <IMG ALIGN="RIGHT" HSPACE="0" SRC="<!--#var SOFTWARE_URL-->/App/rtab.gif">
+  <IMG ALIGN="LEFT" HSPACE="0" SRC="tabs_ltab">
+  <IMG ALIGN="RIGHT" HSPACE="0" SRC="tabs_rtab">
   <STRONG>
     <!--#if action-->
     <A HREF="<!--#var action-->"><!--#var label--></A>
@@ -21,8 +21,8 @@
   <!--#else-->
   <TD ALIGN="CENTER" VALIGN="TOP" BGCOLOR="#EFEFEF">
   <FONT SIZE="-1">
-  <IMG ALIGN="LEFT" HSPACE="0" SRC="<!--#var SOFTWARE_URL-->/App/ltab.gif">
-  <IMG ALIGN="RIGHT" HSPACE="0" SRC="<!--#var SOFTWARE_URL-->/App/rtab.gif">
+  <IMG ALIGN="LEFT" HSPACE="0" SRC="tabs_ltab">
+  <IMG ALIGN="RIGHT" HSPACE="0" SRC="tabs_rtab">
   <!--#if action-->
     <A HREF="<!--#var action-->"><!--#var label--></A>
     <!--#else action-->
@@ -40,7 +40,7 @@
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="2">
 <TR>
   <TD ALIGN="LEFT" VALIGN="TOP">
-  <IMG SRC="<!--#var SOFTWARE_URL-->/<!--#var icon-->" 
+  <IMG SRC="<!--#var icon-->" 
        ALT="<!--#var meta_type-->" BORDER="0">
   <STRONG>
   <!--#if meta_type-->

lib/python/App/menu.dtml

@@ -7,7 +7,7 @@
 <TR>
   <TD VALIGN="TOP" NOWRAP>
   <A HREF="manage_main" TARGET="manage_main">
-  <IMG SRC="<!--#var SOFTWARE_URL-->/<!--#var icon-->" BORDER="0"
+  <IMG SRC="<!--#var icon-->" BORDER="0"
    ALT="Click to open this item"></A> 
   <STRONG>
   <A HREF="manage_main" TARGET="manage_main">
@@ -19,7 +19,7 @@
 </TABLE>
 <!--#tree sort=title_or_id nowrap=1-->
 <A HREF="<!--#var tree-item-url-->/manage_main" TARGET="manage_main">
-<IMG SRC="<!--#var SOFTWARE_URL-->/<!--#var icon-->" BORDER="0"
+<IMG SRC="<!--#var tree-item-url-->/<!--#var icon-->" BORDER="0"
  ALT="Click to open this item"></A> 
 <A HREF="<!--#var tree-item-url-->/manage_main" TARGET="manage_main">
 <!--#var id-->

lib/python/OFS/Application.py

@@ -11,8 +11,8 @@
 __doc__='''Application support
 
 
-$Id: Application.py,v 1.26 1997/12/17 16:45:26 jim Exp $'''
-__version__='$Revision: 1.26 $'[11:-2]
+$Id: Application.py,v 1.27 1997/12/18 16:45:38 jeffrey Exp $'''
+__version__='$Revision: 1.27 $'[11:-2]
 
 
 import Globals,Folder,os,regex,sys
@@ -42,7 +42,7 @@ class Application(Folder.Folder):
 #     'action':'manage_help',   'target':'_new'},
     )
 
-    manage_rolesForm=Globals.HTMLFile('OFS/rolesForm')
+    manage_rolesForm=Globals.HTMLFile('rolesForm', globals())
 
     _reserved_names=('standard_html_header',
 		     'standard_html_footer',
@@ -235,6 +235,9 @@ def install_products():
 ############################################################################## 
 #
 # $Log: Application.py,v $
+# Revision 1.27  1997/12/18 16:45:38  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.26  1997/12/17 16:45:26  jim
 # initial_products is dead!
 #

lib/python/OFS/CopySupport.py

 """Copy interface"""
 
-__version__='$Revision: 1.6 $'[11:-2]
+__version__='$Revision: 1.7 $'[11:-2]
 
 import Globals, Moniker, rPickle, tempfile
 from cPickle import loads, dumps
@@ -15,7 +15,7 @@ class CopyContainer:
     # Interface for containerish objects which allow
     # objects to be copied into them.
 
-    pasteDialog=Globals.HTMLFile('OFS/pasteDialog')
+    pasteDialog=Globals.HTMLFile('pasteDialog', globals())
 
     def _getMoniker(self):
         # Ask an object to return a moniker for itself.

lib/python/OFS/Document.py

 """Document object"""
 
-__version__='$Revision: 1.30 $'[11:-2]
+__version__='$Revision: 1.31 $'[11:-2]
 
 from Globals import HTML, HTMLFile
 from string import join,split,strip,rfind,atoi
 from AccessControl.Role import RoleManager
 import SimpleItem, regex
 import Acquisition
+from ImageFile import ImageFile
 
 class Document(HTML, RoleManager, SimpleItem.Item_w__name__,
 	       Acquisition.Explicit):
     """Document object"""
     meta_type      ='Document'
-    icon           ='OFS/Document_icon.gif'
+    icon='DocumentIcon'
+    DocumentIcon=ImageFile('www/Document_icon.gif', globals())
     __state_names__=HTML.__state_names__+('title','__roles__')
 
     # Documents masquerade as functions:
@@ -58,8 +60,8 @@ class Document(HTML, RoleManager, SimpleItem.Item_w__name__,
 	try: return md.AUTHENTICATED_USER.hasRole(roles)
 	except AttributeError: return 0
 
-    manage_editForm=HTMLFile('OFS/documentEdit')
-    manage_uploadForm=HTMLFile('OFS/documentUpload')
+    manage_editForm=HTMLFile('documentEdit', globals())
+    manage_uploadForm=HTMLFile('documentUpload', globals())
     manage=manage_main=manage_editDocument=manage_editForm
 
     def manage_edit(self,data,title,acl_type='A',acl_roles=[],SUBMIT='Change',
@@ -117,7 +119,7 @@ class DocumentHandler:
     """Document object handler mixin"""
     #meta_types=({'name':'Document', 'action':'manage_addDocumentForm'},)
 
-    manage_addDocumentForm=HTMLFile('OFS/documentAdd')
+    manage_addDocumentForm=HTMLFile('documentAdd', globals())
 
     def manage_addDocument(self,id,title='',file='',
 			   acl_type='A',acl_roles=[],REQUEST=None):

lib/python/OFS/DraftFolder.py

@@ -14,16 +14,17 @@ Provide an area where people can work without others seeing their changes.
 A Draft folder is a surrogate for a folder.  It get\'s subobjects by
 gettingthem from a session copy of a base folder.
 
-$Id: DraftFolder.py,v 1.4 1997/12/12 21:49:42 brian Exp $'''
-__version__='$Revision: 1.4 $'[11:-2]
+$Id: DraftFolder.py,v 1.5 1997/12/18 16:45:40 jeffrey Exp $'''
+__version__='$Revision: 1.5 $'[11:-2]
 
 import time, SimpleItem, AccessControl.Role, Persistence, Acquisition, Globals
 import AccessControl.User, Session
 from string import rfind
 from App.Management import Management
 from Globals import HTMLFile
+from ImageFile import ImageFile
 
-addForm=HTMLFile('OFS/draftFolderAdd')
+addForm=HTMLFile('draftFolderAdd', globals())
 
 def add(self,id,baseid,title='',REQUEST=None):
     """Add a new Folder object"""
@@ -54,7 +55,8 @@ class DraftFolder(Persistence.Persistent,
 		  ):
 
     meta_type='Draft Folder'
-    icon='OFS/DraftFolder.gif'
+    icon='DraftFolderIcon'
+    DraftFolderIcon=ImageFile('www/DraftFolder.gif', globals())
     isPrincipiaFolderish=1
 
     manage_options=(
@@ -200,7 +202,7 @@ class DraftFolder(Persistence.Persistent,
 
 class Supervisor(AccessControl.User.UserFolder, Session.Session):
 
-    manage=manage_main=HTMLFile('OFS/DraftFolderSupervisor')
+    manage=manage_main=HTMLFile('DraftFolderSupervisor', globals())
     manage_options=() # This is a simple item
 
     
@@ -210,6 +212,9 @@ class Supervisor(AccessControl.User.UserFolder, Session.Session):
 ############################################################################## 
 #
 # $Log: DraftFolder.py,v $
+# Revision 1.5  1997/12/18 16:45:40  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.4  1997/12/12 21:49:42  brian
 # ui update
 #

lib/python/OFS/Folder.py

 
 """Folder object
 
-$Id: Folder.py,v 1.24 1997/12/12 21:53:05 brian Exp $"""
+$Id: Folder.py,v 1.25 1997/12/18 16:45:40 jeffrey Exp $"""
 
-__version__='$Revision: 1.24 $'[11:-2]
+__version__='$Revision: 1.25 $'[11:-2]
 
 
 from Globals import HTMLFile
@@ -17,7 +17,7 @@ import SimpleItem
 from string import rfind, lower
 from content_types import content_type, find_binary, text_type
 import Image
-
+from ImageFile import ImageFile
 
 
 
@@ -26,7 +26,7 @@ class FolderHandler:
 
     # meta_types=({'name':'Folder', 'action':'manage_addFolderForm'},)
 
-    manage_addFolderForm=HTMLFile('OFS/folderAdd')
+    manage_addFolderForm=HTMLFile('folderAdd', globals())
 
     def folderClass(self):
 	return Folder
@@ -77,7 +77,10 @@ class Folder(ObjectManager,RoleManager,DocumentHandler,
     meta_type='Folder'
     id       ='folder'
     title    ='Folder object'
-    icon     ='OFS/Folder_icon.gif'
+    icon='FolderIcon'
+    FolderIcon=ImageFile('www/Folder_icon.gif', globals())
+
+    Modified_Gif=ImageFile('www/modified.gif', globals())
 
     _properties=({'id':'title', 'type': 'string'},)
 

lib/python/OFS/Image.py

 """Image object"""
 
-__version__='$Revision: 1.14 $'[11:-2]
+__version__='$Revision: 1.15 $'[11:-2]
 
 from Persistence import Persistent
 from Globals import HTMLFile
@@ -8,15 +8,17 @@ from Globals import MessageDialog
 from AccessControl.Role import RoleManager
 import SimpleItem
 import Acquisition
+from ImageFile import ImageFile
 
 class File(Persistent,RoleManager,SimpleItem.Item_w__name__,
 	   Acquisition.Implicit):
     """Image object"""
     meta_type='File'
-    icon     ='OFS/File_icon.gif'
+    icon='FileIcon'
+    FileIcon=ImageFile('www/File_icon.gif', globals())
 
-    manage_editForm   =HTMLFile('OFS/imageEdit', Kind='File', kind='file')
-    manage_uploadForm =HTMLFile('OFS/imageUpload', Kind='File', kind='file')
+    manage_editForm   =HTMLFile('imageEdit', globals(), Kind='File', kind='file')
+    manage_uploadForm =HTMLFile('imageUpload', globals(), Kind='File', kind='file')
     manage=manage_main=manage_editForm
 
     manage_options=({'icon':'', 'label':'Edit',
@@ -92,10 +94,11 @@ class File(Persistent,RoleManager,SimpleItem.Item_w__name__,
 class Image(File):
 
     meta_type='Image'
-    icon     ='OFS/Image_icon.gif'
+    icon='ImageIcon'
+    ImageIcon=ImageFile('www/Image_icon.gif', globals())
 
-    manage_editForm   =HTMLFile('OFS/imageEdit', Kind='Image', kind='image')
-    manage_uploadForm =HTMLFile('OFS/imageUpload', Kind='Image', kind='image')
+    manage_editForm   =HTMLFile('imageEdit', globals(), Kind='Image', kind='image')
+    manage_uploadForm =HTMLFile('imageUpload', globals(), Kind='Image', kind='image')
     manage=manage_main=manage_editForm
 
     def __str__(self):
@@ -106,8 +109,8 @@ class ImageHandler:
     """Image object handler mixin"""
     #meta_types=({'name':'Image', 'action':'manage_addImageForm'},)
 
-    manage_addFileForm=HTMLFile('OFS/imageAdd', Kind='File', kind='file')
-    manage_addImageForm=HTMLFile('OFS/imageAdd', Kind='Image', kind='image')
+    manage_addFileForm=HTMLFile('imageAdd', globals(),  Kind='File', kind='file')
+    manage_addImageForm=HTMLFile('imageAdd', globals(), Kind='Image', kind='image')
 
     def manage_addImage(self,id,file,title='',acl_type='A',acl_roles=[],
 			REQUEST=None):

lib/python/OFS/ObjectManager.py

 
 __doc__="""Object Manager
 
-$Id: ObjectManager.py,v 1.24 1997/12/16 20:04:43 jim Exp $"""
+$Id: ObjectManager.py,v 1.25 1997/12/18 16:45:41 jeffrey Exp $"""
 
-__version__='$Revision: 1.24 $'[11:-2]
+__version__='$Revision: 1.25 $'[11:-2]
 
 
 from SingleThreadedTransaction import Persistent
@@ -16,6 +16,7 @@ from urllib import quote
 from DocumentTemplate import html_quote
 from cgi_module_publisher import type_converters
 from DateTime import DateTime
+from ImageFile import ImageFile
 
 class ObjectManager(Acquirer,Management,Persistent):
     """Generic object manager
@@ -27,12 +28,17 @@ class ObjectManager(Acquirer,Management,Persistent):
     meta_types = dynamic_meta_types = ()
     id       ='default'
     title=''
-    icon       ='OFS/Folder_icon.gif'
+    icon='FolderIcon'
+    FolderIcon=ImageFile('www/Folder_icon.gif', globals())
     _objects   =()
     _properties =({'id':'title', 'type': 'string'},)
 
-    manage_main          =HTMLFile('OFS/main')
-    manage_propertiesForm=HTMLFile('OFS/properties')
+    manage_main          =HTMLFile('main', globals())
+    manage_propertiesForm=HTMLFile('properties', globals())
+
+    Blank_icon=ImageFile('TreeDisplay/www/Blank_icon.gif')
+    Plus_icon=ImageFile('TreeDisplay/www/Plus_icon.gif')
+    Minus_icon=ImageFile('TreeDisplay/www/Minus_icon.gif')
 
     manage_options=(
     {'icon':icon,              'label':'Objects',
@@ -455,6 +461,9 @@ class ObjectManager(Acquirer,Management,Persistent):
 ##############################################################################
 #
 # $Log: ObjectManager.py,v $
+# Revision 1.25  1997/12/18 16:45:41  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.24  1997/12/16 20:04:43  jim
 # Modified copying code to set validClipData in manage_main so that
 # the paste button shows up after copy.

lib/python/OFS/SimpleItem.py

@@ -16,13 +16,13 @@ Aqueduct database adapters, etc.
 This module can also be used as a simple template for implementing new
 item types. 
 
-$Id: SimpleItem.py,v 1.8 1997/12/12 21:49:44 brian Exp $'''
-__version__='$Revision: 1.8 $'[11:-2]
+$Id: SimpleItem.py,v 1.9 1997/12/18 16:45:42 jeffrey Exp $'''
+__version__='$Revision: 1.9 $'[11:-2]
 
 import Globals
 from DateTime import DateTime
 from CopySupport import CopySource
-
+from ImageFile import ImageFile
 
 class Item(CopySource):
 
@@ -30,7 +30,8 @@ class Item(CopySource):
 
     # Name, relative to SOFTWARE_URL of icon used to display item
     # in folder listings.
-    icon='App/arrow.jpg'
+    icon='ItemIcon'
+    ItemIcon=ImageFile('App/www/arrow.jpg')
 
     # Meta type used for selecting all objects of a given type.
     meta_type='simple item'
@@ -38,6 +39,10 @@ class Item(CopySource):
     # Default title.  
     title=''
 
+    # cute little tab images
+    tabs_rtab=ImageFile('App/www/rtab.gif')
+    tabs_ltab=ImageFile('App/www/ltab.gif')
+
     manage_tabs   =Globals.HTMLFile('App/manage_tabs')
     manage_info   =Globals.HTMLFile('App/manage_info')
     manage_options=({'icon':'', 'label':'Manage',
@@ -76,7 +81,7 @@ class Item(CopySource):
 
     def tpValues(self): return ()
 
-    _manage_editedDialog=Globals.HTMLFile('OFS/editedDialog')
+    _manage_editedDialog=Globals.HTMLFile('editedDialog', globals())
     def manage_editedDialog(self, REQUEST, **args):
 	return apply(self._manage_editedDialog,(self, REQUEST), args)
 
@@ -119,6 +124,9 @@ class Item_w__name__(Item):
 ############################################################################## 
 #
 # $Log: SimpleItem.py,v $
+# Revision 1.9  1997/12/18 16:45:42  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.8  1997/12/12 21:49:44  brian
 # ui update
 #

lib/python/OFS/main.dtml

@@ -31,7 +31,7 @@
   <!--#/if title-->
   </A> 
   <!--#if modified_in_session-->
-  <IMG SRC="<!--#var SOFTWARE_URL-->/OFS/modified.gif"
+  <IMG SRC="Modified_Gif"
    ALT="This item has been modified in a session">
   <!--#/if modified_in_session-->
   </TD>

lib/python/Products/MailHost/MailHost.py

@@ -5,13 +5,14 @@ import Acquisition, sys, regex, string, types
 import OFS.SimpleItem
 import Globals
 from Scheduler.OneTimeEvent import OneTimeEvent
+from ImageFile import ImageFile
 
-#$Id: MailHost.py,v 1.19 1997/12/12 22:05:18 brian Exp $ 
-__version__ = "$Revision: 1.19 $"[11:-2]
+#$Id: MailHost.py,v 1.20 1997/12/18 16:45:37 jeffrey Exp $ 
+__version__ = "$Revision: 1.20 $"[11:-2]
 smtpError = "SMTP Error"
 MailHostError = "MailHost Error"
 
-addForm=HTMLFile('MailHost/addMailHost_form',localhost=gethostname())
+addForm=HTMLFile('addMailHost_form', globals(), localhost=gethostname())
 def add(self, id='aMailHost', title='Some mail thing', smtp_host=None, 
         localhost='localhost', smtp_port=25, acl_type='A',acl_roles=[], 
         REQUEST=None):
@@ -29,9 +30,10 @@ class MailHost(Persistent, Acquisition.Implicit, OFS.SimpleItem.Item,
                RoleManager):
     'a mailhost...?'
     meta_type='Mail Host'
-    manage=manage_main=HTMLFile('MailHost/manageMailHost')
+    manage=manage_main=HTMLFile('manageMailHost', globals())
     index_html=None
-    icon="MailHost/MailHost_icon.gif"
+    icon='MHIcon'
+    MHIcon=ImageFile("www/MailHost_icon.gif", globals())
 
     manage_options=({'icon':'', 'label':'Edit',
 		     'action':'manage_main', 'target':'manage_main',
@@ -225,6 +227,9 @@ def decapitate(message, **kw):
 
 
 #$Log: MailHost.py,v $
+#Revision 1.20  1997/12/18 16:45:37  jeffrey
+#changeover to new ImageFile and HTMLFile handling
+#
 #Revision 1.19  1997/12/12 22:05:18  brian
 #ui update
 #

lib/python/Products/OFSP/DraftFolder.py

@@ -14,16 +14,17 @@ Provide an area where people can work without others seeing their changes.
 A Draft folder is a surrogate for a folder.  It get\'s subobjects by
 gettingthem from a session copy of a base folder.
 
-$Id: DraftFolder.py,v 1.4 1997/12/12 21:49:42 brian Exp $'''
-__version__='$Revision: 1.4 $'[11:-2]
+$Id: DraftFolder.py,v 1.5 1997/12/18 16:45:40 jeffrey Exp $'''
+__version__='$Revision: 1.5 $'[11:-2]
 
 import time, SimpleItem, AccessControl.Role, Persistence, Acquisition, Globals
 import AccessControl.User, Session
 from string import rfind
 from App.Management import Management
 from Globals import HTMLFile
+from ImageFile import ImageFile
 
-addForm=HTMLFile('OFS/draftFolderAdd')
+addForm=HTMLFile('draftFolderAdd', globals())
 
 def add(self,id,baseid,title='',REQUEST=None):
     """Add a new Folder object"""
@@ -54,7 +55,8 @@ class DraftFolder(Persistence.Persistent,
 		  ):
 
     meta_type='Draft Folder'
-    icon='OFS/DraftFolder.gif'
+    icon='DraftFolderIcon'
+    DraftFolderIcon=ImageFile('www/DraftFolder.gif', globals())
     isPrincipiaFolderish=1
 
     manage_options=(
@@ -200,7 +202,7 @@ class DraftFolder(Persistence.Persistent,
 
 class Supervisor(AccessControl.User.UserFolder, Session.Session):
 
-    manage=manage_main=HTMLFile('OFS/DraftFolderSupervisor')
+    manage=manage_main=HTMLFile('DraftFolderSupervisor', globals())
     manage_options=() # This is a simple item
 
     
@@ -210,6 +212,9 @@ class Supervisor(AccessControl.User.UserFolder, Session.Session):
 ############################################################################## 
 #
 # $Log: DraftFolder.py,v $
+# Revision 1.5  1997/12/18 16:45:40  jeffrey
+# changeover to new ImageFile and HTMLFile handling
+#
 # Revision 1.4  1997/12/12 21:49:42  brian
 # ui update
 #

lib/python/TreeDisplay/TreeTag.py

@@ -9,8 +9,8 @@
 #       rights reserved. 
 #
 ############################################################################ 
-__rcs_id__='$Id: TreeTag.py,v 1.18 1997/12/11 15:28:24 jeffrey Exp $'
-__version__='$Revision: 1.18 $'[11:-2]
+__rcs_id__='$Id: TreeTag.py,v 1.19 1997/12/18 16:45:43 jeffrey Exp $'
+__version__='$Revision: 1.19 $'[11:-2]
 
 from DocumentTemplate.DT_Util import *
 from DocumentTemplate.DT_String import String
@@ -463,9 +463,9 @@ def tpValuesIds(self, branches):
     return r
     
 
-icoSpace='<IMG SRC="%s/TreeDisplay/Blank_icon.gif" BORDER="0">' % SOFTWARE_URL
-icoPlus ='<IMG SRC="%s/TreeDisplay/Plus_icon.gif" BORDER="0">' % SOFTWARE_URL
-icoMinus='<IMG SRC="%s/TreeDisplay/Minus_icon.gif" BORDER="0">' % SOFTWARE_URL
+icoSpace='<IMG SRC="Blank_icon" BORDER="0">'
+icoPlus ='<IMG SRC="Plus_icon" BORDER="0">'
+icoMinus='<IMG SRC="Minus_icon" BORDER="0">'