[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser - Services.pt:1.4 configure.zcml:1.3 ComponentAdding.py:NONE ServiceConfigEdit.pt:NONE ServiceConfigEditPart.pt:NONE ServiceConfigSummary.pt:NONE ServiceConfigURL.py:NONE Services.py:NONE
Marius Gedminas
mgedmin@codeworks.lt
Thu, 12 Dec 2002 06:33:03 -0500
Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser
In directory cvs.zope.org:/tmp/cvs-serv21266/lib/python/Zope/App/OFS/Services/ServiceManager/Browser
Modified Files:
Services.pt configure.zcml
Removed Files:
ComponentAdding.py ServiceConfigEdit.pt
ServiceConfigEditPart.pt ServiceConfigSummary.pt
ServiceConfigURL.py Services.py
Log Message:
Merge named-component-configuration-branch
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt 1.3 => 1.4 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt:1.3 Mon Dec 9 10:09:27 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt Thu Dec 12 06:32:32 2002
@@ -1,56 +1,32 @@
<html metal:use-macro="views/standard_macros/page">
-<body metal:fill-slot="body" tal:define="services view/update">
+<body metal:fill-slot="body">
+<div metal:use-macro="view/indexMacros/macros/body">
- <h2>Services configured in this service manager.</h2>
+ <h2 metal:fill-slot="heading">Services configured in this service manager.</h2>
- <p tal:condition="not:services">
- No services have been configured
- </p>
-
- <div tal:condition="services">
-
- <p>For each service, the service name is given and all of the
- components registered to provide the service are shown. You
- may select the component to provide the service or disable the
- service.
- </p>
-
- <p>Select a service name or a component name to visit the service
- or component. </p>
-
- <form action="." method="post"
- tal:attributes="action request/URL">
-
- <table width="100%">
-
- <tr tal:repeat="service services">
- <td valign="top" align="right">
- <a href="Roles"
- tal:content="service/name"
- tal:attributes="href service/name"
- tal:condition="service/active"
- >Roles</a>
- <span tal:replace="service/name"
- tal:condition="service/inactive" />
- </td>
- <td tal:content="structure service/view">
- </td>
- </tr>
+ <p metal:fill-slot="empty_text">No services have been configured</p>
- </table>
+ <div metal:fill-slot="extra_top">
- <input type=submit name="submit_update" value="Update"><br>
+ <p>For each service, the service name is given and all of the
+ components registered to provide the service are shown. You
+ may select the component to provide the service or disable the
+ service.
+ </p>
- </form>
+ <p>Select a service name or a component name to visit the service
+ or component.
+ </p>
</div>
- <p>To configure a service, add a service 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 is added, add a service configuration that configures the
+ <p metal:fill-slot="help_text">To configure a service, add a service
+ 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 is
+ added, add a service configuration that configures the
component to provide a service.
</p>
+</div>
</body>
</html>
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml:1.2 Sat Nov 30 13:39:17 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml Thu Dec 12 06:32:32 2002
@@ -7,17 +7,12 @@
<!-- ServiceManager -->
- <defaultView
- for=".IServiceManager."
- name="index.html"
- />
-
- <view
+ <view
for=".IServiceManager."
name="index.html"
template="Browser/Services.pt"
- class=".Browser.Services."
- permission="Zope.ManageServices"
+ class="Zope.App.OFS.Services.Browser.NameConfigurableView."
+ permission="Zope.ManageServices"
/>
<menuItems menu="zmi_views" for=".IServiceManager.">
@@ -27,7 +22,7 @@
action="Packages/@@SelectedManagementView.html"/>
<menuItem title="Default Package"
action="Packages/default/@@SelectedManagementView.html"/>
- </menuItems>
+ </menuItems>
<!-- Packages -->
@@ -35,7 +30,7 @@
<view
for=".IPackages."
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
factory=".Browser.PackagesContents.">
<page name="contents.html"
@@ -59,7 +54,7 @@
<!-- Package -->
- <view
+ <view
for=".IPackage."
permission="Zope.ManageServices"
factory="Zope.App.OFS.Container.Views.Browser.Contents."
@@ -74,103 +69,65 @@
action="@@contents.html"/>
</menuItems>
- <menu id="add_component"
+ <menu id="add_component"
title="Menu of objects to be added to service managers"
/>
- <view
+ <view
name="+"
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
for=".IPackage."
factory=".Browser.Adding.ComponentAdding">
<page name="index.html" attribute="index" />
<page name="action.html" attribute="action" />
- </view>
+ </view>
<!-- ConfigurationManager -->
- <defaultView
+ <defaultView
for=".IConfigurationManager."
name="contents.html"
/>
- <view
+ <view
for=".IConfigurationManager."
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
factory=".Browser.EditConfiguration.">
<page name="contents.html" template="Browser/editConfiguration.pt" />
- </view>
+ </view>
<menuItems menu="zmi_views" for=".IConfigurationManager.">
<menuItem title="Configuration" action="contents.html" />
</menuItems>
- <view
+ <view
for=".IConfigurationManager."
name="+"
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
factory=".Browser.Adding.ConfigurationAdding">
<page name="index.html" attribute="index" />
<page name="action.html" attribute="action" />
- </view>
+ </view>
<menuItem menu="add_component"
- for="Zope.App.OFS.Container.IAdding."
- action="Zope.App.OFS.Services.ServiceManager.ConfigurationManager"
+ for="Zope.App.OFS.Container.IAdding."
+ action="Zope.App.OFS.Services.ServiceManager.ConfigurationManager"
title="Configuration"
/>
- <menu id="add_configuration"
+ <menu id="add_configuration"
title="Menu of addable configuration objects"
/>
<!-- ServiceConfiguration -->
- <defaultView
- for=".IServiceConfiguration."
- name="index.html"
- />
-
- <menuItems menu="zmi_views" for=".IServiceConfiguration.">
- <menuItem title="Edit"
- action="index.html"/>
- </menuItems>
-
- <form:edit
- for = ".IServiceConfiguration."
- name = "index.html"
- schema = "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration."
- label = "Service Configuration"
- permission = "Zope.ManageServices"
- template = "Browser/ServiceConfigEdit.pt"
- />
-
- <form:edit
- for = ".IServiceConfiguration."
- name = "ItemEdit"
- schema =
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurationSummary."
- label = "Service Configuration"
- template = "Browser/ServiceConfigEditPart.pt"
- class = ".Browser.ServiceConfigURL."
- permission = "Zope.ManageServices"
- />
-
<view
- for = ".IServiceConfiguration."
- name = "ConfigurationSummary"
- template = "Browser/ServiceConfigSummary.pt"
- class = ".Browser.ServiceConfigURL."
- permission="Zope.ManageServices"
- />
-
- <view
for="Zope.App.OFS.Container.IAdding."
name="ServiceConfiguration"
factory=".Browser.AddServiceConfiguration."
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
>
<page name="step1.html" template="Browser/add_service_1.pt" />
@@ -189,7 +146,7 @@
<!-- Persistent Modules -->
<view for="Persistence.IPersistentModuleManager."
- factory=".Browser.EditModule."
+ factory=".Browser.EditModule."
>
<page name="edit.html" template="Views/Browser/edit_module.pt" />
</view>
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ComponentAdding.py ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigEdit.pt ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigEditPart.pt ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigSummary.pt ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigURL.py ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.py ===