[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - services.pt:1.3.10.2

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv28984

Modified Files:
      Tag: service-config-branch
	services.pt 
Log Message:
Change the way this looks according to Jim's suggestion:

  ErrorReportingService     (configure)
  Events                    (configure)
  HubIds                    (configure)
  PrincipalAnnotation       (configure)
  Subscription  (disabled)  (configure)

The service name links to the service implementation; the word
"(configure)" links to the view for changing the activation.


=== Zope3/src/zope/app/browser/services/services.pt 1.3.10.1 => 1.3.10.2 ===
--- Zope3/src/zope/app/browser/services/services.pt:1.3.10.1	Thu Mar  6 16:51:51 2003
+++ Zope3/src/zope/app/browser/services/services.pt	Fri Mar  7 13:36:07 2003
@@ -14,7 +14,7 @@
 <div metal:fill-slot="body">
 
   <h2>
-    Configured service types in this service manager
+    Configured services in this service manager
   </h2>
 
   <div tal:define="registries view/listConfiguredServices">
@@ -22,35 +22,34 @@
       <p tal:condition="not:registries">No services are configured.</p>
 
       <div tal:condition="registries">
-        <p>For each configured service type, the service name is given and
-           links to a menu for selecting the active service implementation.
-           If some service implementation is active for the service type,
-           a link to that implementation is also given.
+        <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.
         </p>
 
         <table>
-          <thead>
-            <tr> <td>Service type</td> <td>Provided by</td> </tr>
-          </thead>
           <tbody>
             <tr tal:repeat="reg registries">
               <td>
-                <a href="xxx"
-                   tal:attributes="href string:${reg/link1}/@@serviceActivation.html"
+                <a href="(link to the active service)"
+                   tal:condition="reg/component"
+                   tal:attributes=
+                     "href string:${reg/link2}/@@SelectedManagementView.html"
                    tal:content="reg/name">
                   Foobar (the service type)
                 </a>
+                <span tal:condition="not:reg/component">
+                  <span tal:content="reg/name" />
+                (disabled)</span>
               </td>
               <td>
                 <a href="xxx"
-                   tal:condition="reg/component"
-                   tal:attributes="href reg/link2"
-                   tal:content="reg/component">
-                  Foobar-1 (the name of the active service)
+                   tal:attributes=
+                   "href string:${reg/link1}/@@serviceActivation.html"
+                   >
+                  (configure)
                 </a>
-                <span tal:condition="not:reg/component">
-                  (disabled)
-                </span>
               </td>
             </tr>
           <tbody>