[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser - viewpackage.py:1.2 viewpackage_contents.pt:1.2 add_service_2.pt:1.3 configure.zcml:1.6
Jim Fulton
jim@zope.com
Thu, 19 Dec 2002 15:38:56 -0500
Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser
In directory cvs.zope.org:/tmp/cvs-serv26340/lib/python/Zope/App/OFS/Services/ServiceManager/Browser
Modified Files:
add_service_2.pt configure.zcml
Added Files:
viewpackage.py viewpackage_contents.pt
Log Message:
Merged changes made by Albertas and Jim from the AdapterAndView-branch
branch:
- Added TTW adapter service
Todo:
o Named adapters
o Getting classes in persistent modules working so we can actually
create TTW adapters.
- Added TTW view service
o View service
o View configurations
For configuting views from view factories
o Page configurations
For configuring views based on templates (and optional classes)
o View (sub)packages. These get added to packages. You configure
them with default configuration info and then add page templates
to them. Added page temlates are automatically added as views with
the same name.
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/viewpackage.py 1.1 => 1.2 ===
--- /dev/null Thu Dec 19 15:38:56 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/viewpackage.py Thu Dec 19 15:38:25 2002
@@ -0,0 +1,38 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""
+
+Revision information: $Id$
+"""
+from Zope.App.OFS.Container.Views.Browser.Contents import Contents
+from Zope.App.OFS.Services.ServiceManager.IServiceManager \
+ import IServiceManager
+from Zope.App.OFS.Services.zpt import ZPTTemplate
+
+
+from Zope.Publisher.Browser.BrowserView import BrowserView
+
+from Zope.App.PageTemplate import ViewPageTemplateFile
+from Zope.App.OFS.Container.IContainer import IContainer
+from Zope.ComponentArchitecture import queryView, getView
+
+class ViewPackageContents(Contents):
+
+ __used_for__ = IServiceManager
+
+ index = ViewPageTemplateFile('viewpackage_contents.pt')
+
+ def add(self, name):
+ self.context.setObject(name, ZPTTemplate())
+ self.request.response.redirect('.')
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/viewpackage_contents.pt 1.1 => 1.2 ===
--- /dev/null Thu Dec 19 15:38:56 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/viewpackage_contents.pt Thu Dec 19 15:38:25 2002
@@ -0,0 +1,27 @@
+<html metal:use-macro="views/standard_macros/page">
+<head>
+<style metal:fill-slot="headers" type="text/css">
+</style>
+</head>
+<body>
+<div metal:fill-slot="body">
+
+<form action="." method="get"
+ tal:define="container_contents view/listContentInfo"
+ >
+
+ <p>View Package Contents</p>
+
+ <div metal:use-macro="view/contentsMacros/macros/contents_table" />
+
+ <br />
+ <input type="text" name="name" />
+ <input type="submit" name="@@add.html:method" value="Add"
+ i18nXXX:attributes="value string:menu_add_button" />
+ <input type="submit" name="@@removeObjects.html:method" value="Delete"
+ i18nXXX:attributes="value string:menu_delete_button" />
+</form>
+
+</div>
+</body>
+</html>
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/add_service_2.pt 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/add_service_2.pt:1.2 Sat Nov 30 13:39:17 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/add_service_2.pt Thu Dec 19 15:38:25 2002
@@ -34,7 +34,7 @@
</tr>
</table>
- <input type="submit" />
+ <input type="submit" value="Finish" />
</form>
</div></body></html>
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml 1.5 => 1.6 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml:1.5 Wed Dec 18 18:37:02 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml Thu Dec 19 15:38:25 2002
@@ -149,7 +149,7 @@
<view for="Persistence.IPersistentModuleManager."
factory=".Browser.EditModule."
>
- <page name="edit.html" template="Views/Browser/edit_module.pt" />
+ <page name="edit.html" template="Browser/edit_module.pt" />
</view>
<menuItems menu="zmi_views" for="Persistence.IPersistentModuleManager.">
@@ -159,12 +159,54 @@
<view for="Zope.App.OFS.Container.IAdding."
name="Module"
factory=".Browser.AddModule."
+ permission="Zope.ManageServices"
>
- <page name="index.html" template="Views/Browser/add_module.pt" />
+ <page name="index.html" template="Browser/add_module.pt" />
<page name="action.html" attribute="action" />
</view>
<menuItem menu="add_component" for="Zope.App.OFS.Container.IAdding."
action="Module" title="Module" />
+
+
+<!-- View Package -->
+
+ <defaultView for=".interfaces.IViewPackage." name="contents.html" />
+
+ <view
+ for=".interfaces.IViewPackage."
+ permission="Zope.ManageServices"
+ factory=".Browser.viewpackage.ViewPackageContents.">
+
+ <page name="contents.html"
+ attribute="index"
+ />
+ <page name="add.html"
+ attribute="add"
+ />
+ <page name="removeObjects.html"
+ attribute="removeObjects"
+ />
+ </view>
+
+ <form:edit
+ schema=".interfaces.IViewPackageInfo."
+ name="DefaultConfiguration.html"
+ permission="Zope.ManageServices"
+ label="Default configuration parameters"
+ />
+
+ <menuItems menu="zmi_views" for=".interfaces.IViewPackage.">
+ <menuItem title="Contents"
+ action="@@contents.html"/>
+ <menuItem title="Default Configuration"
+ action="@@DefaultConfiguration.html"/>
+ </menuItems>
+
+ <menuItem menu="add_component" for="Zope.App.OFS.Container.IAdding."
+ action="Zope.App.OFS.Services.ServiceManager.viewpackage.ViewPackage"
+ title="View Sub-Package" />
+
+
</zope:zopeConfigure>