[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - pagefolder.py:1.1 pagefolder_contents.pt:1.1 sitemanagement_contents.py:1.1 caches.pt:1.3 configure.zcml:1.34 connections.pt:1.3 service.py:1.16 package.py:NONE packages_contents.pt:NONE viewpackage_contents.pt:NONE
Jim Fulton
jim@zope.com
Sun, 23 Mar 2003 11:46:14 -0500
Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv2186/src/zope/app/browser/services
Modified Files:
caches.pt configure.zcml connections.pt service.py
Added Files:
pagefolder.py pagefolder_contents.pt
sitemanagement_contents.py
Removed Files:
package.py packages_contents.pt viewpackage_contents.pt
Log Message:
Renamed "packages" to "site-management folders".
Reanemd "view sub-packages" to "page folders".
=== Added File Zope3/src/zope/app/browser/services/pagefolder.py ===
##############################################################################
#
# 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: pagefolder.py,v 1.1 2003/03/23 16:45:43 jim Exp $
"""
from zope.app.browser.container.contents import Contents
from zope.app.interfaces.services.pagefolder import IPageFolder
from zope.app.pagetemplate import ViewPageTemplateFile
from zope.app.services.zpt import ZPTTemplate
class PageFolderContents(Contents):
__used_for__ = IPageFolder
index = ViewPageTemplateFile('pagefolder_contents.pt')
def add(self, name):
self.context.setObject(name, ZPTTemplate())
self.request.response.redirect('@@contents.html')
=== Added File Zope3/src/zope/app/browser/services/pagefolder_contents.pt ===
<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>Page Folder Contents</p>
<div metal:use-macro="view/contentsMacros/macros/contents_table" />
<br />
<div tal:condition="context/configured">
<input type="text" name="name" />
<input type="submit" name="@@add.html:method" value="Add"
i18nXXX:attributes="value string:menu_add_button"
/>
</div>
<input type="submit" name="@@removeObjects.html:method" value="Delete"
i18nXXX:attributes="value string:menu_delete_button" />
</form>
</div>
</body>
</html>
=== Added File Zope3/src/zope/app/browser/services/sitemanagement_contents.py ===
<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>Package Contents</p>
<div metal:use-macro="view/contentsMacros/macros/contents_table" />
<br />
<input type="text" name="name" />
<input type="submit" name="@@addPackage.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/src/zope/app/browser/services/caches.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/services/caches.pt:1.2 Wed Dec 25 09:12:36 2002
+++ Zope3/src/zope/app/browser/services/caches.pt Sun Mar 23 11:45:43 2003
@@ -21,9 +21,8 @@
</div>
<p metal:fill-slot="help_text">To configure a cache, add a database
- adapter component to a <em>package</em> in <a
- href="../../../Packages">Packages</a> or to the <a
- href="../../../Packages/default">default package</a>. After the component
+ adapter component to a <em>site-management folder</em>.
+ After the component
is added, add a cache configuration that configures the component to
provide a cache.
</p>
=== Zope3/src/zope/app/browser/services/configure.zcml 1.33 => 1.34 ===
--- Zope3/src/zope/app/browser/services/configure.zcml:1.33 Fri Mar 21 15:59:55 2003
+++ Zope3/src/zope/app/browser/services/configure.zcml Sun Mar 23 11:45:43 2003
@@ -489,14 +489,14 @@
<pages
for="zope.app.interfaces.services.service.IServiceManager"
permission="zope.ManageServices"
- class="zope.app.browser.services.package.PackagesContents">
+ class="zope.app.browser.services.service.SiteManagementFoldersContents">
<page name="contents.html"
attribute="index"
menu="zmi_views" title="Contents"
/>
- <page name="addPackage.html"
- attribute="addPackage"
+ <page name="addSiteManagementFolder.html"
+ attribute="addSiteManagementFolder"
/>
<page name="removeObjects.html"
attribute="removeObjects"
@@ -526,10 +526,10 @@
-<!-- Package -->
+<!-- SiteManagementFolder -->
<pages
- for="zope.app.interfaces.services.package.IPackage"
+ for="zope.app.interfaces.services.folder.ISiteManagementFolder"
permission="zope.ManageServices"
class="zope.app.browser.container.contents.JustContents">
@@ -538,7 +538,7 @@
</pages>
<pages
- for="zope.app.interfaces.services.package.IPackage"
+ for="zope.app.interfaces.services.folder.ISiteManagementFolder"
permission="zope.ManageServices"
class="zope.app.browser.container.contents.Contents"
>
@@ -552,7 +552,7 @@
<view
name="+"
- for="zope.app.interfaces.services.package.IPackage"
+ for="zope.app.interfaces.services.folder.ISiteManagementFolder"
permission="zope.ManageServices"
class="zope.app.browser.services.service.ComponentAdding">
@@ -615,10 +615,10 @@
title="Module"
/>
-<!-- View Package -->
+<!-- PageFolder -->
<pages
- for="zope.app.interfaces.services.service.IViewPackage"
+ for="zope.app.interfaces.services.pagefolder.IPageFolder"
permission="zope.ManageServices"
class="zope.app.browser.container.contents.JustContents">
@@ -627,9 +627,9 @@
</pages>
<pages
- for="zope.app.interfaces.services.service.IViewPackage"
+ for="zope.app.interfaces.services.pagefolder.IPageFolder"
permission="zope.ManageServices"
- class="zope.app.browser.services.package.ViewPackageContents"
+ class="zope.app.browser.services.pagefolder.PageFolderContents"
>
<page name="contents.html"
@@ -644,7 +644,7 @@
</pages>
<editform
- schema="zope.app.interfaces.services.service.IViewPackageInfo."
+ schema="zope.app.interfaces.services.pagefolder.IPageFolderInfo."
name="DefaultConfiguration.html"
menu="zmi_views" title="Default Configuration"
permission="zope.ManageServices"
@@ -653,7 +653,7 @@
<menuItem
menu="zmi_actions"
- for="zope.app.interfaces.services.service.IViewPackage"
+ for="zope.app.interfaces.services.pagefolder.IPageFolder"
title="Add"
action="."
filter="nothing"
@@ -661,7 +661,7 @@
<menuItem
menu="zmi_views"
- for="zope.app.interfaces.services.service.IViewPackage"
+ for="zope.app.interfaces.services.pagefolder.IPageFolder"
title="Contents"
action="@@contents.html"
filter="context/configured"
@@ -670,8 +670,8 @@
<menuItem
menu="add_component"
for="zope.app.interfaces.container.IAdding"
- action="zope.app.services.ViewPackage"
- title="View Sub-Package" />
+ action="zope.app.services.PageFolder"
+ title="Page Folder" />
<!-- Session service -->
@@ -732,7 +732,7 @@
<view
name="AddService"
- for="zope.app.interfaces.services.package.IPackage"
+ for="zope.app.interfaces.services.folder.ISiteManagementFolder"
permission="zope.ManageServices"
class="zope.app.browser.services.service.ServiceAdding">
=== Zope3/src/zope/app/browser/services/connections.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/services/connections.pt:1.2 Wed Dec 25 09:12:36 2002
+++ Zope3/src/zope/app/browser/services/connections.pt Sun Mar 23 11:45:43 2003
@@ -21,9 +21,8 @@
</div>
<p metal:fill-slot="help_text">To configure a connection, add a database
- adapter component to a <em>package</em> in <a
- href="../../../Packages">Packages</a> or to the <a
- href="../../../Packages/default">default package</a>. After the component
+ adapter component to a <em>site-management folder</em>.
+ After the component
is added, add a connection configuration that configures the component to
provide a connection.
</p>
=== Zope3/src/zope/app/browser/services/service.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/browser/services/service.py:1.15 Fri Mar 21 16:00:28 2003
+++ Zope3/src/zope/app/browser/services/service.py Sun Mar 23 11:45:43 2003
@@ -17,21 +17,23 @@
"""
from zope.app.browser.container.adding import Adding
-from zope.component import getView, getAdapter, queryView
-from zope.proxy.context import ContextWrapper, ContextSuper
+from zope.app.browser.container.contents import Contents
+from zope.app.form.utility import setUpWidgets, getWidgetsDataForContent
from zope.app.interfaces.container import IZopeContainer
-from zope.component import getServiceManager
-from zope.publisher.browser import BrowserView
-from zope.app.services.service import ServiceConfiguration
from zope.app.interfaces.services.configuration import IConfiguration
-from zope.app.form.utility import setUpWidgets, getWidgetsDataForContent
-from zope.app.traversing import traverse, getPath
+from zope.app.interfaces.services.configuration import Registered, Active
+from zope.app.interfaces.services.configuration import Unregistered
from zope.app.interfaces.services.service import ILocalService
+from zope.app.interfaces.services.service import IServiceManager
+from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.app.services.folder import SiteManagementFolder
+from zope.app.services.service import ServiceConfiguration
+from zope.app.traversing import traverse, getPath
+from zope.component import getServiceManager
+from zope.component import getView, getAdapter, queryView
+from zope.proxy.context import ContextWrapper, ContextSuper
from zope.proxy.context import getWrapperContainer
-from zope.app.interfaces.services.configuration \
- import Unregistered, Registered, Active
-
-__metaclass__ = type
+from zope.publisher.browser import BrowserView
class ComponentAdding(Adding):
"""Adding subclass used for configurable components."""
@@ -204,3 +206,15 @@
else:
new_active.status = Active
return active + " activated"
+
+
+class SiteManagementFoldersContents(Contents):
+
+ __used_for__ = IServiceManager
+
+ index = ViewPageTemplateFile('sitemanagement_contents.pt')
+
+ def addSiteManagementFolder(self, name):
+ self.context.setObject(name, SiteManagementFolder())
+ self.request.response.redirect('@@contents.html')
+
=== Removed File Zope3/src/zope/app/browser/services/package.py ===
=== Removed File Zope3/src/zope/app/browser/services/packages_contents.pt ===
=== Removed File Zope3/src/zope/app/browser/services/viewpackage_contents.pt ===