Skip to content

Z
Zope
Commit 8516304d authored by Chris McDonough's avatar Chris McDonough
Browse files
Options

Changed things which use HTMLFile to use DTMLFile.

parent 46fb7401
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
lib/python/HelpSys/HelpSys.py
View file @ 8516304d
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
import Acquisition import Acquisition
from OFS.SimpleItem import Item from OFS.SimpleItem import Item
from OFS.ObjectManager import ObjectManager from OFS.ObjectManager import ObjectManager
from Globals import Persistent, HTMLFile, HTML from Globals import Persistent, DTMLFile, HTMLFile, HTML
from Products.ZCatalog.ZCatalog import ZCatalog from Products.ZCatalog.ZCatalog import ZCatalog
from Products.ZCatalog.Lazy import LazyCat from Products.ZCatalog.Lazy import LazyCat
import Products import Products
...@@ -146,15 +146,15 @@ class HelpSys(Acquisition.Implicit, ObjectManager, Item, Persistent): ...@@ -146,15 +146,15 @@ class HelpSys(Acquisition.Implicit, ObjectManager, Item, Persistent):
searchResults=__call__ searchResults=__call__
index_html=HTMLFile('dtml/frame', globals()) index_html=DTMLFile('dtml/frame', globals())
menu=HTMLFile('dtml/menu', globals()) menu=HTMLFile('dtml/menu', globals())
search=HTMLFile('dtml/search', globals()) search=DTMLFile('dtml/search', globals())
results=HTMLFile('dtml/results', globals()) results=DTMLFile('dtml/results', globals())
main=HTML("""<html></html>""") main=HTML("""<html></html>""")
standard_html_header=HTMLFile('dtml/menu_header', globals()) standard_html_header=DTMLFile('dtml/menu_header', globals())
standard_html_footer=HTMLFile('dtml/menu_footer', globals()) standard_html_footer=DTMLFile('dtml/menu_footer', globals())
button=HTMLFile('dtml/button', globals()) button=DTMLFile('dtml/button', globals())
def HelpButton(self, topic, product): def HelpButton(self, topic, product):
""" """
...@@ -162,7 +162,7 @@ class HelpSys(Acquisition.Implicit, ObjectManager, Item, Persistent): ...@@ -162,7 +162,7 @@ class HelpSys(Acquisition.Implicit, ObjectManager, Item, Persistent):
""" """
return self.button(self, self.REQUEST, product=product, topic=topic) return self.button(self, self.REQUEST, product=product, topic=topic)
helpURL=HTMLFile('dtml/helpURL',globals()) helpURL=DTMLFile('dtml/helpURL',globals())
def helpLink(self, product='OFSP', topic='ObjectManager_Contents.stx'): def helpLink(self, product='OFSP', topic='ObjectManager_Contents.stx'):
# Generate an <a href...> tag linking to a help topic. This # Generate an <a href...> tag linking to a help topic. This
...@@ -292,7 +292,7 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent): ...@@ -292,7 +292,7 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent):
c.addColumn('url') c.addColumn('url')
c.addColumn('id') c.addColumn('id')
addTopicForm=HTMLFile('dtml/addTopic', globals()) addTopicForm=DTMLFile('dtml/addTopic', globals())
def addTopic(self, id, title, REQUEST=None): def addTopic(self, id, title, REQUEST=None):
"Add a Help Topic" "Add a Help Topic"
...@@ -351,8 +351,8 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent): ...@@ -351,8 +351,8 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent):
""" """
return apply(self.catalog.__call__, args, kw) return apply(self.catalog.__call__, args, kw)
standard_html_header=HTMLFile('dtml/topic_header', globals()) standard_html_header=DTMLFile('dtml/topic_header', globals())
standard_html_footer=HTMLFile('dtml/topic_footer', globals()) standard_html_footer=DTMLFile('dtml/topic_footer', globals())
Globals.default__class_init__(ProductHelp) Globals.default__class_init__(ProductHelp)
lib/python/HelpSys/HelpTopic.py
View file @ 8516304d
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
import Acquisition import Acquisition
from ComputedAttribute import ComputedAttribute from ComputedAttribute import ComputedAttribute
from OFS.SimpleItem import Item from OFS.SimpleItem import Item
from Globals import Persistent, HTML, HTMLFile, ImageFile from Globals import Persistent, HTML, DTMLFile, ImageFile
from OFS.DTMLDocument import DTMLDocument from OFS.DTMLDocument import DTMLDocument
from OFS.PropertyManager import PropertyManager from OFS.PropertyManager import PropertyManager
import os.path import os.path
...@@ -228,7 +228,7 @@ class DTMLTopic(HelpTopic): ...@@ -228,7 +228,7 @@ class DTMLTopic(HelpTopic):
self.title=title self.title=title
file,ext=os.path.splitext(file) file,ext=os.path.splitext(file)
prefix,file=os.path.split(file) prefix,file=os.path.split(file)
self.index_html=HTMLFile(file,prefix) self.index_html=DTMLFile(file,prefix)
if permissions is not None: if permissions is not None:
self.permissions=permissions self.permissions=permissions
if categories is not None: if categories is not None:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7