Log message for revision 114528:
No longer use HelpSys pages from ``Products.OFSP`` in core Zope 2.
Changed:
U Zope/trunk/doc/CHANGES.rst
U Zope/trunk/src/App/ApplicationManager.py
U Zope/trunk/src/App/DavLockManager.py
U Zope/trunk/src/App/Product.py
U Zope/trunk/src/App/Undo.py
U Zope/trunk/src/OFS/Cache.py
U Zope/trunk/src/OFS/DTMLMethod.py
U Zope/trunk/src/OFS/FindSupport.py
U Zope/trunk/src/OFS/Folder.py
U Zope/trunk/src/OFS/History.py
U Zope/trunk/src/OFS/Image.py
U Zope/trunk/src/OFS/ObjectManager.py
U Zope/trunk/src/OFS/OrderSupport.py
U Zope/trunk/src/OFS/PropertyManager.py
U Zope/trunk/src/OFS/SimpleItem.py
U Zope/trunk/src/OFS/dtml/addOrderedFolder.dtml
U Zope/trunk/src/OFS/dtml/documentAdd.dtml
U Zope/trunk/src/OFS/dtml/folderAdd.dtml
U Zope/trunk/src/OFS/dtml/imageAdd.dtml
U Zope/trunk/src/OFS/dtml/importExport.dtml
U Zope/trunk/src/OFS/dtml/methodAdd.dtml
U Zope/trunk/src/OFS/dtml/renameForm.dtml
U Zope/trunk/src/Products/PageTemplates/help/tales-python.stx
U Zope/trunk/src/Products/StandardCacheManagers/help/Accel.stx
U Zope/trunk/src/Products/StandardCacheManagers/help/RAM.stx
U Zope/trunk/src/Products/ZCatalog/ZCatalog.py
-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/doc/CHANGES.rst 2010-07-10 17:42:40 UTC (rev 114528)
@@ -22,6 +22,8 @@
Restructuring
+++++++++++++
+- No longer use HelpSys pages from ``Products.OFSP`` in core Zope 2.
+
- Register OFS as a package and give it an initialize function. Moved
registration of OFS classes there from Products.OFSP.
Modified: Zope/trunk/src/App/ApplicationManager.py
===================================================================
--- Zope/trunk/src/App/ApplicationManager.py 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/App/ApplicationManager.py 2010-07-10 17:42:40 UTC (rev
114528)
@@ -61,18 +61,12 @@
meta_type = 'Database Management'
icon = 'p_/DatabaseManagement_icon'
- manage_options=(
- (
- {'label':'Database', 'action':'manage_main',
- 'help':('OFSP','Database-Management_Database.stx')},
- {'label':'Activity', 'action':'manage_activity',
- 'help':('OFSP','Database-Management_Activity.stx')},
- {'label':'Cache Parameters', 'action':'manage_cacheParameters',
- 'help':('OFSP','Database-Management_Cache-Parameters.stx')},
- {'label':'Flush Cache', 'action':'manage_cacheGC',
- 'help':('OFSP','Database-Management_Flush-Cache.stx')},
- )
- )
+ manage_options=((
+ {'label':'Database', 'action':'manage_main'},
+ {'label':'Activity', 'action':'manage_activity'},
+ {'label':'Cache Parameters', 'action':'manage_cacheParameters'},
+ {'label':'Flush Cache', 'action':'manage_cacheGC'},
+ ))
# These need to be here rather to make tabs work correctly. This
# needs to be revisited.
@@ -160,13 +154,10 @@
meta_type = name
icon = 'p_/DebugManager_icon'
- manage_options=(
- ( {'label':'Debugging Info', 'action':'manage_main',
- 'help':('OFSP','Debug-Information_Debug.stx')},
- {'label':'Profiling', 'action':'manage_profile',
- 'help':('OFSP','Debug-Information_Profile.stx')},
- )
- )
+ manage_options=((
+ {'label':'Debugging Info', 'action':'manage_main'},
+ {'label':'Profiling', 'action':'manage_profile'},
+ ))
manage_debug = DTMLFile('dtml/debug', globals())
@@ -293,9 +284,8 @@
)
manage_options=(
- ({'label':'Contents', 'action':'manage_main',
- 'help':('OFSP','Control-Panel_Contents.stx')},
- ) + UndoSupport.manage_options
+ ({'label':'Contents', 'action':'manage_main'}, ) +
+ UndoSupport.manage_options
)
id = 'Control_Panel'
Modified: Zope/trunk/src/App/DavLockManager.py
===================================================================
--- Zope/trunk/src/App/DavLockManager.py 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/App/DavLockManager.py 2010-07-10 17:42:40 UTC (rev
114528)
@@ -39,8 +39,7 @@
manage_davlocks._setName('manage_davlocks')
manage_options = (
- {'label': 'Write Locks', 'action': 'manage_main',
- 'help': ('OFSP', 'DavLocks-ManageLocks.stx'), },
+ {'label': 'Write Locks', 'action': 'manage_main'}
)
def findLockedObjects(self, frompath=''):
Modified: Zope/trunk/src/App/Product.py
===================================================================
--- Zope/trunk/src/App/Product.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/App/Product.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -276,8 +276,8 @@
break
if not found:
product.manage_options = product.manage_options + (
- {'label':'Refresh', 'action':'manage_refresh',
- 'help': ('OFSP','Product_Refresh.stx')},)
+ {'label':'Refresh', 'action':'manage_refresh'},
+ )
return product
Modified: Zope/trunk/src/App/Undo.py
===================================================================
--- Zope/trunk/src/App/Undo.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/App/Undo.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -37,8 +37,7 @@
security = ClassSecurityInfo()
manage_options=(
- {'label': 'Undo', 'action': 'manage_UndoForm',
- 'help': ('OFSP', 'Undo.stx')},
+ {'label': 'Undo', 'action': 'manage_UndoForm'},
)
security.declareProtected(undo_changes, 'manage_UndoForm')
Modified: Zope/trunk/src/OFS/Cache.py
===================================================================
--- Zope/trunk/src/OFS/Cache.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/Cache.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -86,7 +86,6 @@
'label':'Cache',
'action':'ZCacheable_manage',
'filter':filterCacheTab,
- 'help':('OFSP','Cacheable-properties.stx'),
},)
security = ClassSecurityInfo()
@@ -422,7 +421,6 @@
manage_options = (
{'label':'Associate',
'action':'ZCacheManager_associate',
- 'help':('OFSP','CacheManager-associate.stx'),
},
)
Modified: Zope/trunk/src/OFS/DTMLMethod.py
===================================================================
--- Zope/trunk/src/OFS/DTMLMethod.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/DTMLMethod.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -70,15 +70,11 @@
func_code.co_varnames = 'self', 'REQUEST', 'RESPONSE'
func_code.co_argcount = 3
- manage_options = (
- (
- {'label': 'Edit', 'action': 'manage_main',
- 'help': ('OFSP', 'DTML-DocumentOrMethod_Edit.stx')},
- {'label': 'View', 'action': '',
- 'help': ('OFSP', 'DTML-DocumentOrMethod_View.stx')},
- {'label': 'Proxy', 'action': 'manage_proxyForm',
- 'help': ('OFSP', 'DTML-DocumentOrMethod_Proxy.stx')},
- )
+ manage_options = ((
+ {'label': 'Edit', 'action': 'manage_main'},
+ {'label': 'View', 'action': ''},
+ {'label': 'Proxy', 'action': 'manage_proxyForm'},
+ )
+ Historical.manage_options
+ RoleManager.manage_options
+ Item_w__name__.manage_options
Modified: Zope/trunk/src/OFS/FindSupport.py
===================================================================
--- Zope/trunk/src/OFS/FindSupport.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/FindSupport.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -52,17 +52,14 @@
security.declareProtected(view_management_screens, 'manage_findAdv')
manage_findAdv=DTMLFile('dtml/findAdv', globals(),
- management_view='Find',
- help_topic='Find_Advanced.stx',
- help_product='OFSP')
+ management_view='Find')
security.declareProtected(view_management_screens, 'manage_findResult')
manage_findResult=DTMLFile('dtml/findResult', globals(),
management_view='Find')
manage_options=(
- {'label':'Find', 'action':'manage_findForm',
- 'help':('OFSP','Find.stx')},
+ {'label':'Find', 'action':'manage_findForm'},
)
security.declareProtected(view_management_screens, 'ZopeFind')
Modified: Zope/trunk/src/OFS/Folder.py
===================================================================
--- Zope/trunk/src/OFS/Folder.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/Folder.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -92,14 +92,11 @@
_properties=({'id':'title', 'type': 'string','mode':'wd'},)
manage_options=(
- ObjectManager.manage_options+
- (
- {'label':'View', 'action':'',
- 'help':('OFSP','Folder_View.stx')},
- )+
- PropertyManager.manage_options+
- RoleManager.manage_options+
- Item.manage_options+
+ ObjectManager.manage_options +
+ ({'label': 'View', 'action': ''}, ) +
+ PropertyManager.manage_options +
+ RoleManager.manage_options +
+ Item.manage_options +
FindSupport.manage_options
)
Modified: Zope/trunk/src/OFS/History.py
===================================================================
--- Zope/trunk/src/OFS/History.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/History.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -97,10 +97,9 @@
HistoricalRevisions=Historian()
- manage_options=({'label':'History', 'action':'manage_change_history_page',
- 'help':('OFSP','History.stx')
- },
- )
+ manage_options=(
+ {'label':'History', 'action':'manage_change_history_page'},
+ )
security.declareProtected(view_history, 'manage_change_history_page')
manage_change_history_page = DTMLFile(
Modified: Zope/trunk/src/OFS/Image.py
===================================================================
--- Zope/trunk/src/OFS/Image.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/Image.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -120,10 +120,8 @@
manage_options=(
(
- {'label':'Edit', 'action':'manage_main',
- 'help':('OFSP','File_Edit.stx')},
- {'label':'View', 'action':'',
- 'help':('OFSP','File_View.stx')},
+ {'label': 'Edit', 'action': 'manage_main'},
+ {'label': 'View', 'action': ''},
)
+ PropertyManager.manage_options
+ RoleManager.manage_options
@@ -788,10 +786,8 @@
)
manage_options=(
- ({'label':'Edit', 'action':'manage_main',
- 'help':('OFSP','Image_Edit.stx')},
- {'label':'View', 'action':'view_image_or_file',
- 'help':('OFSP','Image_View.stx')},)
+ ({'label':'Edit', 'action':'manage_main'},
+ {'label':'View', 'action':'view_image_or_file'}, )
+ PropertyManager.manage_options
+ RoleManager.manage_options
+ Item_w__name__.manage_options
Modified: Zope/trunk/src/OFS/ObjectManager.py
===================================================================
--- Zope/trunk/src/OFS/ObjectManager.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/ObjectManager.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -172,8 +172,7 @@
manage_index_main=DTMLFile('dtml/index_main', globals())
manage_options=(
- {'label':'Contents', 'action':'manage_main',
- 'help':('OFSP','ObjectManager_Contents.stx')},
+ {'label':'Contents', 'action':'manage_main'},
)
isAnObjectManager=1
Modified: Zope/trunk/src/OFS/OrderSupport.py
===================================================================
--- Zope/trunk/src/OFS/OrderSupport.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/OrderSupport.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -47,11 +47,9 @@
_default_sort_key = 'position'
_default_sort_reverse = 0
- manage_options = ( { 'label':'Contents',
- 'action':'manage_main',
- 'help':('OFSP','OrderSupport_Contents.stx') }
- ,
- )
+ manage_options = (
+ {'label':'Contents', 'action':'manage_main'},
+ )
#
# ZMI Methods
Modified: Zope/trunk/src/OFS/PropertyManager.py
===================================================================
--- Zope/trunk/src/OFS/PropertyManager.py 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/OFS/PropertyManager.py 2010-07-10 17:42:40 UTC (rev
114528)
@@ -107,8 +107,7 @@
('Anonymous', 'Manager'))
manage_options=(
- {'label':'Properties', 'action':'manage_propertiesForm',
- 'help':('OFSP','Properties.stx')},
+ {'label':'Properties', 'action':'manage_propertiesForm'},
)
security.declareProtected(manage_properties, 'manage_propertiesForm')
Modified: Zope/trunk/src/OFS/SimpleItem.py
===================================================================
--- Zope/trunk/src/OFS/SimpleItem.py 2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/OFS/SimpleItem.py 2010-07-10 17:42:40 UTC (rev 114528)
@@ -460,9 +460,7 @@
security.setPermissionDefault(View, ('Manager',))
manage_options=Item.manage_options+(
- {'label':'Security',
- 'action':'manage_access',
- 'help':('OFSP', 'Security.stx')},
+ {'label': 'Security', 'action': 'manage_access'},
)
InitializeClass(SimpleItem)
Modified: Zope/trunk/src/OFS/dtml/addOrderedFolder.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/addOrderedFolder.dtml 2010-07-10 17:40:40 UTC
(rev 114527)
+++ Zope/trunk/src/OFS/dtml/addOrderedFolder.dtml 2010-07-10 17:42:40 UTC
(rev 114528)
@@ -1,10 +1,8 @@
<dtml-var manage_page_header>
<dtml-var "manage_form_title(this(), _,
- form_title='Add Folder (Ordered)',
- help_product='OFSP',
- help_topic='Folder_Add.stx'
- )">
+ form_title='Add Folder (Ordered)'
+ )">
<p class="form-help">
An ordered Folder contains other objects. Use Folders to organize your
web objects in to logical groups. The <em>create public interface</em>
Modified: Zope/trunk/src/OFS/dtml/documentAdd.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/documentAdd.dtml 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/OFS/dtml/documentAdd.dtml 2010-07-10 17:42:40 UTC (rev
114528)
@@ -1,10 +1,8 @@
<dtml-var manage_page_header>
<dtml-var "manage_form_title(this(), _,
- form_title='Add DTML Document',
- help_product='OFSP',
- help_topic='DTML-DocumentOrMethod_Add.stx'
- )">
+ form_title='Add DTML Document'
+ )">
<p class="form-help">
A DTML Document is used to hold text content. It can contain
Modified: Zope/trunk/src/OFS/dtml/folderAdd.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/folderAdd.dtml 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/OFS/dtml/folderAdd.dtml 2010-07-10 17:42:40 UTC (rev
114528)
@@ -2,9 +2,7 @@
<dtml-var "manage_form_title(this(), _,
form_title='Add Folder',
- help_product='OFSP',
- help_topic='Folder_Add.stx'
- )">
+ )">
<p class="form-help">
A Folder contains other objects. Use Folders to organize your
web objects in to logical groups. The <em>create public interface</em>
Modified: Zope/trunk/src/OFS/dtml/imageAdd.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/imageAdd.dtml 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/OFS/dtml/imageAdd.dtml 2010-07-10 17:42:40 UTC (rev
114528)
@@ -2,9 +2,7 @@
<dtml-var "manage_form_title(this(), _,
form_title='Add %s' % Kind,
- help_product='OFSP',
- help_topic='File_Add.stx'
- )">
+ )">
<p class="form-help">
Select a file to upload from your local computer by clicking the
Modified: Zope/trunk/src/OFS/dtml/importExport.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/importExport.dtml 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/OFS/dtml/importExport.dtml 2010-07-10 17:42:40 UTC (rev
114528)
@@ -1,8 +1,5 @@
<dtml-var manage_page_header>
-<dtml-var "manage_tabs(this(), _,
- help_product='OFSP',
- help_topic='ObjectManager_Import-Export.stx'
- )">
+<dtml-var "manage_tabs(this(), _, )">
<p class="form-help">
You can export Zope objects to a file in order to transfer
Modified: Zope/trunk/src/OFS/dtml/methodAdd.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/methodAdd.dtml 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/OFS/dtml/methodAdd.dtml 2010-07-10 17:42:40 UTC (rev
114528)
@@ -2,9 +2,7 @@
<dtml-var "manage_form_title(this(), _,
form_title='Add DTML Method',
- help_product='OFSP',
- help_topic='DTML-DocumentOrMethod_Add.stx'
- )">
+ )">
<p class="form-help">
A DTML Method is used to hold scripting tags and text content.
Modified: Zope/trunk/src/OFS/dtml/renameForm.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/renameForm.dtml 2010-07-10 17:40:40 UTC (rev
114527)
+++ Zope/trunk/src/OFS/dtml/renameForm.dtml 2010-07-10 17:42:40 UTC (rev
114528)
@@ -2,9 +2,7 @@
<dtml-var "manage_form_title(this(), _,
form_title='Rename Items',
- help_product='OFSP',
- help_topic='ObjectManager_Rename.stx'
- )">
+ )">
<dtml-if expr="REQUEST.has_key('ids')">
<form action="<dtml-var "REQUEST.URL1" html_quote>" method="post">
Modified: Zope/trunk/src/Products/PageTemplates/help/tales-python.stx
===================================================================
--- Zope/trunk/src/Products/PageTemplates/help/tales-python.stx 2010-07-10
17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/Products/PageTemplates/help/tales-python.stx 2010-07-10
17:42:40 UTC (rev 114528)
@@ -44,11 +44,6 @@
keep them from generating very large numbers and sequences. This
limitation helps protect against denial of service attacks.
- In addition, these utility functions are available: 'DateTime',
- 'test', and 'same_type'. See "DTML
- functions":../../OFSP/Help/dtml-funcs.stx for more
- information on these functions.
-
Finally, these functions are available in Python expressions,
but not in Python-based scripts:
Modified: Zope/trunk/src/Products/StandardCacheManagers/help/Accel.stx
===================================================================
--- Zope/trunk/src/Products/StandardCacheManagers/help/Accel.stx
2010-07-10 17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/Products/StandardCacheManagers/help/Accel.stx
2010-07-10 17:42:40 UTC (rev 114528)
@@ -1,8 +1,5 @@
Accelerated HTTP Cache Managers
- For background information, see the
- <a href="../../OFSP/Help/Caching.stx">description of cache management</a>.
-
The HTTP protocol provides for headers that can indicate to
downstream proxy caches, browser caches, and dedicated caches that
certain documents and images are cacheable. Most images, for example,
Modified: Zope/trunk/src/Products/StandardCacheManagers/help/RAM.stx
===================================================================
--- Zope/trunk/src/Products/StandardCacheManagers/help/RAM.stx 2010-07-10
17:40:40 UTC (rev 114527)
+++ Zope/trunk/src/Products/StandardCacheManagers/help/RAM.stx 2010-07-10
17:42:40 UTC (rev 114528)
@@ -1,8 +1,5 @@
RAM Cache Managers
- For background information, see the
- <a href="../../OFSP/Help/Caching.stx">description of cache management</a>.
-
The RAM cache manager allows you to cache the result of calling
expensive objects, such as Python Scripts and External Methods,
in memory. It provides access statistics and simple configuration
Modified: Zope/trunk/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/src/Products/ZCatalog/ZCatalog.py 2010-07-10 17:40:40 UTC
(rev 114527)
+++ Zope/trunk/src/Products/ZCatalog/ZCatalog.py 2010-07-10 17:42:40 UTC
(rev 114528)
@@ -96,35 +96,25 @@
manage_options = (
{'label': 'Contents', # TAB: Contents
- 'action': 'manage_main',
- 'help': ('OFSP','ObjectManager_Contents.stx')},
+ 'action': 'manage_main'},
{'label': 'Catalog', # TAB: Cataloged Objects
- 'action': 'manage_catalogView',
- 'help':('ZCatalog','ZCatalog_Cataloged-Objects.stx')},
+ 'action': 'manage_catalogView'},
{'label': 'Properties', # TAB: Properties
- 'action': 'manage_propertiesForm',
- 'help': ('OFSP','Properties.stx')},
+ 'action': 'manage_propertiesForm'},
{'label': 'Indexes', # TAB: Indexes
- 'action': 'manage_catalogIndexes',
- 'help': ('ZCatalog','ZCatalog_Indexes.stx')},
+ 'action': 'manage_catalogIndexes'},
{'label': 'Metadata', # TAB: Metadata
- 'action': 'manage_catalogSchema',
- 'help':('ZCatalog','ZCatalog_MetaData-Table.stx')},
+ 'action': 'manage_catalogSchema'},
{'label': 'Find Objects', # TAB: Find Objects
- 'action': 'manage_catalogFind',
- 'help':('ZCatalog','ZCatalog_Find-Items-to-ZCatalog.stx')},
+ 'action': 'manage_catalogFind'},
{'label': 'Advanced', # TAB: Advanced
- 'action': 'manage_catalogAdvanced',
- 'help':('ZCatalog','ZCatalog_Advanced.stx')},
+ 'action': 'manage_catalogAdvanced'},
{'label': 'Undo', # TAB: Undo
- 'action': 'manage_UndoForm',
- 'help': ('OFSP','Undo.stx')},
+ 'action': 'manage_UndoForm'},
{'label': 'Security', # TAB: Security
- 'action': 'manage_access',
- 'help': ('OFSP','Security.stx')},
+ 'action': 'manage_access'},
{'label': 'Ownership', # TAB: Ownership
- 'action': 'manage_owner',
- 'help': ('OFSP','Ownership.stx'),}
+ 'action': 'manage_owner'}
)
security.declareProtected(manage_zcatalog_entries, 'manage_main')
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
