[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - add_svc_config.pt:1.3 caches.pt:1.5 configure.zcml:1.45 configureCache.pt:1.2 configureConnection.pt:1.2 connection.zcml:1.5 connections.pt:1.7 serviceactivation.pt:1.6 services.pt:1.6 view_search.pt:1.4 add_cache.pt:NONE cacheConfiguration.pt:NONE connectionConfiguration.pt:NONE
Guido van Rossum
guido@python.org
Mon, 28 Apr 2003 12:52:38 -0400
Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv23829
Modified Files:
add_svc_config.pt caches.pt configure.zcml configureCache.pt
configureConnection.pt connection.zcml connections.pt
serviceactivation.pt services.pt view_search.pt
Removed Files:
add_cache.pt cacheConfiguration.pt connectionConfiguration.pt
Log Message:
Change most UI refenences to "configuration" into "registration".
Remove some dead wood.
=== Zope3/src/zope/app/browser/services/add_svc_config.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/services/add_svc_config.pt:1.2 Mon Mar 3 18:16:04 2003
+++ Zope3/src/zope/app/browser/services/add_svc_config.pt Mon Apr 28 12:52:07 2003
@@ -4,13 +4,13 @@
<form action="add_svc_config.html">
- <p>Configure this object to provide the following service(s):
+ <p>Register this object to provide the following service(s):
<table>
<thead>
<tr>
- <th>Configure</th>
+ <th>Register</th>
<th>Service name</th>
<th>Activate</th>
</tr>
=== Zope3/src/zope/app/browser/services/caches.pt 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/services/caches.pt:1.4 Mon Apr 28 11:04:38 2003
+++ Zope3/src/zope/app/browser/services/caches.pt Mon Apr 28 12:52:07 2003
@@ -5,7 +5,7 @@
tal:define="configs view/getConfigs"
>
-<h2 i18n:translate="">Configured caches in this cache service:</h2>
+<h2 i18n:translate="">Caches registered in this cache service:</h2>
<table tal:condition="configs">
<tbody>
@@ -33,7 +33,7 @@
<a href="."
tal:attributes="href config/configurl"
i18n:translate=""
- >(configure)</a>
+ >(change registration)</a>
</td>
</tr>
</tbody>
=== Zope3/src/zope/app/browser/services/configure.zcml 1.44 => 1.45 ===
--- Zope3/src/zope/app/browser/services/configure.zcml:1.44 Mon Apr 28 11:54:10 2003
+++ Zope3/src/zope/app/browser/services/configure.zcml Mon Apr 28 12:52:07 2003
@@ -258,7 +258,7 @@
keyword_arguments = "forInterface presentationType class_
viewName permission"
set_before_add = "layer"
- label = "Configure a view"
+ label = "Register a view"
permission="zope.ManageServices"
fields="forInterface viewName presentationType
class_ layer permission status"
@@ -304,7 +304,7 @@
content_factory = ".view.PageConfiguration"
keyword_arguments = "forInterface class_ viewName permission"
set_before_add = "template layer"
- label = "Configure a view page"
+ label = "Register a view page"
permission="zope.ManageServices"
fields="forInterface viewName
template class_ layer permission status"
=== Zope3/src/zope/app/browser/services/configureCache.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/services/configureCache.pt:1.1 Mon Apr 28 11:04:38 2003
+++ Zope3/src/zope/app/browser/services/configureCache.pt Mon Apr 28 12:52:07 2003
@@ -4,7 +4,7 @@
i18n:domain="zope"
>
-<h2 i18n:translate="">Cache configurations for
+<h2 i18n:translate="">Cache registrations for
<i tal:content="request/name" i18n:name="cache_name">name</i></h2>
<form method="POST"
=== Zope3/src/zope/app/browser/services/configureConnection.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/services/configureConnection.pt:1.1 Tue Apr 22 18:17:38 2003
+++ Zope3/src/zope/app/browser/services/configureConnection.pt Mon Apr 28 12:52:07 2003
@@ -4,7 +4,7 @@
i18n:domain="zope"
>
-<h2 i18n:translate="">Connection configurations for
+<h2 i18n:translate="">Connection registrations for
<i tal:content="request/name" i18n:name="connection_name">name</i></h2>
<form method="POST"
=== Zope3/src/zope/app/browser/services/connection.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/services/connection.zcml:1.4 Mon Apr 28 11:54:11 2003
+++ Zope3/src/zope/app/browser/services/connection.zcml Mon Apr 28 12:52:07 2003
@@ -23,16 +23,16 @@
menu="zmi_views" title="Connections"
/>
-<!-- Browser directives for configuring individual connection objects -->
+<!-- Browser directives for registering individual connection objects -->
- <!-- Configuration page for connection objects. You get here by
- clicking on the (configure) link for a particular connection
- in the "Connections" tab of the connection service. It shows
- a menu of different configurations, at most one of which
- is active. You can activate a different configuration, or
- click on an individual configuration to edit it.
- (Note that this page doesn't really apply to a single connection,
- it applies to a single connection name. -->
+ <!-- Registration page for connection objects. You get here by
+ clicking on the (change registration) link for a particular
+ connection in the "Connections" tab of the connection service.
+ It shows a menu of different registration, at most one of which
+ is active. You can activate a different registration, or click
+ on an individual registration to edit it. (Note that this page
+ doesn't really apply to a single connection, it applies to a
+ single connection name. -->
<page
for="zope.app.interfaces.services.connection.ILocalConnectionService"
name="configureConnection.html"
@@ -42,12 +42,12 @@
/>
<!-- When creating a new connection object, you are taken to this
- form to configure it. The form lets you the connection
- parameters, a permission, and a registration status
- (Unregistered, Registered or Active). -->
+ form to register it. The form lets you define the connection
+ name, a permission, and a registration status (Unregistered,
+ Registered or Active). -->
<!--TBD: class AddCacheConfiguration-->
<addform
- label="New Connection Configuration"
+ label="New Connection Registration"
for="zope.app.interfaces.rdb.IZopeDatabaseAdapter"
name="addConfiguration.html"
schema="zope.app.interfaces.services.connection.IConnectionConfiguration"
@@ -59,13 +59,13 @@
fields="name componentPath permission status"
/>
- <!-- When editing the configuration of an existing connection object,
+ <!-- When editing the registration of an existing connection object,
you are taken to this form. It is similar to the above add
form, but doesn't let you change the name or path.
(Thus leaving only permission and registration status.) -->
<editform
menu="zmi_views" title="Edit"
- label="Connection Configuration"
+ label="Edit Connection Registration"
name="index.html"
schema="zope.app.interfaces.services.connection.IConnectionConfiguration"
permission="zope.ManageServices"
=== Zope3/src/zope/app/browser/services/connections.pt 1.6 => 1.7 ===
--- Zope3/src/zope/app/browser/services/connections.pt:1.6 Mon Apr 28 11:04:38 2003
+++ Zope3/src/zope/app/browser/services/connections.pt Mon Apr 28 12:52:07 2003
@@ -5,7 +5,7 @@
tal:define="configs view/getConfigs"
>
-<h2 i18n:translate="">Configured caches in this cache service:</h2>
+<h2 i18n:translate="">Connections registered in this connection service:</h2>
<table tal:condition="configs">
<tbody>
@@ -33,7 +33,7 @@
<a href="."
tal:attributes="href config/configurl"
i18n:translate=""
- >(configure)</a>
+ >(change registration)</a>
</td>
</tr>
</tbody>
=== Zope3/src/zope/app/browser/services/serviceactivation.pt 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/services/serviceactivation.pt:1.5 Thu Apr 24 16:26:25 2003
+++ Zope3/src/zope/app/browser/services/serviceactivation.pt Mon Apr 28 12:52:07 2003
@@ -13,7 +13,7 @@
<div metal:fill-slot="body">
- <h2>Configurations for service
+ <h2>Registrations for service
<i tal:content="request/type|default">No service type specified</i>
</h2>
@@ -26,7 +26,7 @@
<thead>
<tr> <td></td>
<th align="left">Service</th>
- <th align="left">Configuration</th>
+ <th align="left">Registration</th>
</tr>
</thead>
@@ -42,7 +42,7 @@
</td>
<td><a href="foo"
tal:content="config/id"
- tal:attributes="href config/config">Configuration</a>
+ tal:attributes="href config/config">Registration</a>
</td>
</tr>
=== Zope3/src/zope/app/browser/services/services.pt 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/services/services.pt:1.5 Mon Mar 10 15:40:12 2003
+++ Zope3/src/zope/app/browser/services/services.pt Mon Apr 28 12:52:07 2003
@@ -13,18 +13,18 @@
<div metal:fill-slot="body">
<h2>
- Configured services in this service manager
+ Services registered in this service manager
</h2>
<div tal:define="registries view/listConfiguredServices">
- <p tal:condition="not:registries">No services are configured.</p>
+ <p tal:condition="not:registries">No services are registered.</p>
<div tal:condition="registries">
<p>Unless a service is disabled, the service name
- links to the active service. The (configure) link allows
- activating a different implementation or disabling the
- service altogether.
+ links to the active service. The (change registration)
+ link allows activating a different implementation or
+ disabling the service altogether.
</p>
<table>
@@ -46,12 +46,16 @@
tal:attributes=
"href string:@@serviceActivation.html?type=${reg/name}"
>
- (configure)
+ (change registration)
</a>
</td>
</tr>
<tbody>
</table>
+
+ <p><a href="default/AddService">Add a service to this service
+ mananger</a></p>
+
</div>
</div>
=== Zope3/src/zope/app/browser/services/view_search.pt 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/services/view_search.pt:1.3 Thu Jan 16 14:50:32 2003
+++ Zope3/src/zope/app/browser/services/view_search.pt Mon Apr 28 12:52:07 2003
@@ -29,7 +29,7 @@
<th>For/<br>Provided</th>
<th tal:condition="layer">Layer</th>
<th tal:condition="viewName">View name</th>
- <th>Configuration</th>
+ <th>Registration</th>
</tr>
=== Removed File Zope3/src/zope/app/browser/services/add_cache.pt ===
=== Removed File Zope3/src/zope/app/browser/services/cacheConfiguration.pt ===
=== Removed File Zope3/src/zope/app/browser/services/connectionConfiguration.pt ===