Commit d01ae146 authored by Stephan Richter's avatar Stephan Richter

Now the new STX-formatted Help Content is being used. This requires

reinitializing the Product or I had to reinitialize the entire ZODB
sometimes.
parent 20ff16f3
......@@ -85,8 +85,8 @@
__doc__='''Support for owned objects
$Id: Owned.py,v 1.3 2000/05/15 16:44:00 jim Exp $'''
__version__='$Revision: 1.3 $'[11:-2]
$Id: Owned.py,v 1.4 2000/06/16 19:42:04 srichter Exp $'''
__version__='$Revision: 1.4 $'[11:-2]
import Globals, urlparse, SpecialUsers, ExtensionClass, string
from AccessControl import getSecurityManager
......@@ -111,7 +111,7 @@ class Owned(ExtensionClass.Base):
manage_options=({'label': 'Ownership',
'action': 'manage_owner',
'help': ('OFSP','Ownership.dtml'),
'help': ('OFSP','Ownership.stx'),
'filter': ownableFilter
},
)
......
......@@ -84,7 +84,7 @@
##############################################################################
"""Access control support"""
__version__='$Revision: 1.37 $'[11:-2]
__version__='$Revision: 1.38 $'[11:-2]
from Globals import HTMLFile, MessageDialog, Dictionary
......@@ -123,11 +123,11 @@ class RoleManager(ExtensionClass.Base, PermissionMapping.RoleManager):
manage_options=(
{'label':'Security', 'action':'manage_access',
'help':('OFSP','Security.dtml'),
'help':('OFSP','Security.stx'),
'filter': _isNotBeingUsedAsAMethod,
},
{'label':'Define Permissions', 'action':'manage_access',
'help':('OFSP','Security-DefinePermissions.dtml'),
'help':('OFSP','Security-DefinePermissions.stx'),
'filter': _isBeingUsedAsAMethod,
},
)
......
......@@ -84,7 +84,7 @@
##############################################################################
"""Access control package"""
__version__='$Revision: 1.110 $'[11:-2]
__version__='$Revision: 1.111 $'[11:-2]
import Globals, socket, regex, SpecialUsers
from Globals import HTMLFile, MessageDialog, Persistent, PersistentMapping
......@@ -348,7 +348,7 @@ class BasicUserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager,
manage_options=(
(
{'label':'Contents', 'action':'manage_main',
'help':('OFSP','User-Folder_Contents.dtml')},
'help':('OFSP','User-Folder_Contents.stx')},
)
+Item.manage_options
+RoleManager.manage_options
......
......@@ -84,8 +84,8 @@
##############################################################################
__doc__='''short description
$Id: Undo.py,v 1.21 2000/06/02 20:09:37 jim Exp $'''
__version__='$Revision: 1.21 $'[11:-2]
$Id: Undo.py,v 1.22 2000/06/16 19:45:05 srichter Exp $'''
__version__='$Revision: 1.22 $'[11:-2]
import Globals, ExtensionClass
from DateTime import DateTime
......@@ -103,7 +103,7 @@ class UndoSupport(ExtensionClass.Base):
manage_options=(
{'label':'Undo', 'action':'manage_UndoForm',
'help':('OFSP','Undo.dtml')},
'help':('OFSP','Undo.stx')},
)
manage_UndoForm=Globals.HTMLFile(
......
......@@ -84,7 +84,7 @@
##############################################################################
"""DTML Method objects."""
__version__='$Revision: 1.49 $'[11:-2]
__version__='$Revision: 1.50 $'[11:-2]
import History
from Globals import HTML, HTMLFile, MessageDialog
......@@ -121,13 +121,13 @@ class DTMLMethod(HTML, Acquisition.Implicit, RoleManager,
manage_options=(
(
{'label':'Edit', 'action':'manage_main',
'help':('OFSP','DTML-DocumentOrMethod_Edit.dtml')},
'help':('OFSP','DTML-DocumentOrMethod_Edit.stx')},
{'label':'Upload', 'action':'manage_uploadForm',
'help':('OFSP','DTML-DocumentOrMethod_Upload.dtml')},
'help':('OFSP','DTML-DocumentOrMethod_Upload.stx')},
{'label':'View', 'action':'',
'help':('OFSP','DTML-DocumentOrMethod_View.dtml')},
'help':('OFSP','DTML-DocumentOrMethod_View.stx')},
{'label':'Proxy', 'action':'manage_proxyForm',
'help':('OFSP','DTML-DocumentOrMethod_Proxy.dtml')},
'help':('OFSP','DTML-DocumentOrMethod_Proxy.stx')},
)
+History.Historical.manage_options
+RoleManager.manage_options
......
......@@ -83,7 +83,7 @@
#
##############################################################################
__doc__="""Find support"""
__version__='$Revision: 1.17 $'[11:-2]
__version__='$Revision: 1.18 $'[11:-2]
import sys, os, string, time, Globals, ExtensionClass
......@@ -111,7 +111,7 @@ class FindSupport(ExtensionClass.Base):
manage_options=(
{'label':'Find', 'action':'manage_findFrame', 'target':'manage_main',
'help':('OFSP','Find.dtml')},
'help':('OFSP','Find.stx')},
)
def ZopeFind(self, obj, obj_ids=None, obj_metatypes=None,
......
......@@ -87,9 +87,9 @@
Folders are the basic container objects and are analogous to directories.
$Id: Folder.py,v 1.89 2000/05/17 20:04:25 brian Exp $"""
$Id: Folder.py,v 1.90 2000/06/16 19:40:14 srichter Exp $"""
__version__='$Revision: 1.89 $'[11:-2]
__version__='$Revision: 1.90 $'[11:-2]
import Globals, SimpleItem, ObjectManager, PropertyManager
import AccessControl.Role, webdav.Collection, FindSupport
......@@ -159,7 +159,7 @@ class Folder(
PropertyManager.PropertyManager.manage_options+
(
{'label':'View', 'action':'index_html',
'help':('OFSP','Folder_View.dtml')},
'help':('OFSP','Folder_View.stx')},
)+
FindSupport.FindSupport.manage_options+
AccessControl.Role.RoleManager.manage_options+
......
......@@ -84,7 +84,7 @@
##############################################################################
"""Image object"""
__version__='$Revision: 1.106 $'[11:-2]
__version__='$Revision: 1.107 $'[11:-2]
import Globals, string, struct, content_types
from OFS.content_types import guess_content_type
......@@ -145,11 +145,11 @@ class File(Persistent,Implicit,PropertyManager,
manage_options=(
(
{'label':'Edit', 'action':'manage_main',
'help':('OFSP','File_Edit.dtml')},
'help':('OFSP','File_Edit.stx')},
{'label':'Upload', 'action':'manage_uploadForm',
'help':('OFSP','File_Upload.dtml')},
'help':('OFSP','File_Upload.stx')},
{'label':'View', 'action':'',
'help':('OFSP','File_View.dtml')},
'help':('OFSP','File_View.stx')},
)
+PropertyManager.manage_options
+Item_w__name__.manage_options
......@@ -456,7 +456,7 @@ class Image(File):
(o['label']=='View'
and
{'label':'View', 'action':'view_image_or_file',
'help':('OFSP','Image_View.dtml')}
'help':('OFSP','Image_View.stx')}
or o)
, File.manage_options))
......
......@@ -84,9 +84,9 @@
##############################################################################
__doc__="""Object Manager
$Id: ObjectManager.py,v 1.98 2000/06/01 19:58:05 brian Exp $"""
$Id: ObjectManager.py,v 1.99 2000/06/16 19:40:14 srichter Exp $"""
__version__='$Revision: 1.98 $'[11:-2]
__version__='$Revision: 1.99 $'[11:-2]
import App.Management, Acquisition, Globals, CopySupport, Products
import os, App.FactoryDispatcher, ts_regex, Products
......@@ -145,9 +145,9 @@ class ObjectManager(
manage_options=(
{'label':'Contents', 'action':'manage_main',
'help':('OFSP','ObjectManager_Contents.dtml')},
'help':('OFSP','ObjectManager_Contents.stx')},
{'label':'Import/Export', 'action':'manage_importExportForm',
'help':('OFSP','ObjectManager_Import-Export.dtml')},
'help':('OFSP','ObjectManager_Import-Export.stx')},
)
isAnObjectManager=1
......
......@@ -84,7 +84,7 @@
##############################################################################
"""Property management"""
__version__='$Revision: 1.26 $'[11:-2]
__version__='$Revision: 1.27 $'[11:-2]
import ExtensionClass, Globals
import ZDOM
......@@ -164,7 +164,7 @@ class PropertyManager(ExtensionClass.Base, ZDOM.ElementWithAttributes):
manage_options=(
{'label':'Properties', 'action':'manage_propertiesForm',
'help':('OFSP','Properties.dtml')},
'help':('OFSP','Properties.stx')},
)
manage_propertiesForm=HTMLFile('properties', globals(),
......
......@@ -84,8 +84,8 @@
##############################################################################
"""SMTP mail objects
$Id: MailHost.py,v 1.51 2000/06/05 15:32:01 brian Exp $"""
__version__ = "$Revision: 1.51 $"[11:-2]
$Id: MailHost.py,v 1.52 2000/06/16 19:46:32 srichter Exp $"""
__version__ = "$Revision: 1.52 $"[11:-2]
from Globals import Persistent, HTMLFile, HTML, MessageDialog
from smtplib import SMTP
......@@ -133,7 +133,7 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager):
(
{'icon':'', 'label':'Edit',
'action':'manage_main', 'target':'manage_main',
'help':('MailHost','Mail-Host_Edit.dtml')},
'help':('MailHost','Mail-Host_Edit.stx')},
)
+OFS.SimpleItem.Item.manage_options
+RoleManager.manage_options
......
......@@ -147,20 +147,25 @@ class ZCatalog(Folder, Persistent, Implicit):
manage_options=Folder.manage_options + (
{'label': 'Cataloged Objects', 'action': 'manage_catalogView',
'target': 'manage_main',
'help':('ZCatalog','ZCatalog_Cataloged-Objects.dtml')},
'help':('ZCatalog','ZCatalog_Cataloged-Objects.stx')},
{'label': 'Find Items to ZCatalog', 'action': 'manage_catalogFind',
'target':'manage_main',
'help':('ZCatalog','ZCatalog_Find-Items-to-ZCatalog.dtml')},
'help':('ZCatalog','ZCatalog_Find-Items-to-ZCatalog.stx')},
{'label': 'MetaData Table', 'action': 'manage_catalogSchema',
'target':'manage_main',
'help':('ZCatalog','ZCatalog_MetaData-Table.dtml')},
'help':('ZCatalog','ZCatalog_MetaData-Table.stx')},
{'label': 'Indexes', 'action': 'manage_catalogIndexes',
'target':'manage_main',
'help':('ZCatalog','ZCatalog_Indexes.dtml')},
'help':('ZCatalog','ZCatalog_Indexes.stx')},
{'label': 'Status', 'action': 'manage_catalogStatus',
'target':'manage_main',
<<<<<<< ZCatalog.py
'help':('ZCatalog','ZCatalog_Status.stx')},
)+Folder.manage_options
=======
'help':('ZCatalog','ZCatalog_Status.dtml')},
)
>>>>>>> 1.60
__ac_permissions__=(
......
......@@ -85,8 +85,8 @@
__doc__='''Generic Database adapter
$Id: DA.py,v 1.87 2000/06/16 19:31:38 shane Exp $'''
__version__='$Revision: 1.87 $'[11:-2]
$Id: DA.py,v 1.88 2000/06/16 19:50:30 srichter Exp $'''
__version__='$Revision: 1.88 $'[11:-2]
import OFS.SimpleItem, Aqueduct, RDB
import DocumentTemplate, marshal, md5, base64, Acquisition, os
......@@ -149,11 +149,11 @@ class DA(
manage_options=(
(
{'label':'Edit', 'action':'manage_main',
'help':('ZSQLMethods','Z-SQL-Method_Edit.dtml')},
'help':('ZSQLMethods','Z-SQL-Method_Edit.stx')},
{'label':'Test', 'action':'manage_testForm',
'help':('ZSQLMethods','Z-SQL-Method_Test.dtml')},
'help':('ZSQLMethods','Z-SQL-Method_Test.stx')},
{'label':'Advanced', 'action':'manage_advancedForm',
'help':('ZSQLMethods','Z-SQL-Method_Advanced.dtml')},
'help':('ZSQLMethods','Z-SQL-Method_Advanced.stx')},
)
+OFS.SimpleItem.Item.manage_options
+AccessControl.Role.RoleManager.manage_options
......
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