[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser - Services.pt:1.3.2.2 configure.zcml:1.2.10.2

Marius Gedminas mgedmin@codeworks.lt
Wed, 11 Dec 2002 09:29:22 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser
In directory cvs.zope.org:/tmp/cvs-serv15435/Zope/App/OFS/Services/ServiceManager/Browser

Modified Files:
      Tag: named-component-configuration-branch
	Services.pt configure.zcml 
Log Message:
Refactor INameConfigurable views to share a common page template and use macros
for customization.



=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt 1.3.2.1 => 1.3.2.2 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt:1.3.2.1	Tue Dec 10 14:16:02 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt	Wed Dec 11 09:29:22 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/url"
-                 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.10.1 => 1.2.10.2 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml:1.2.10.1	Tue Dec 10 14:16:02 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml	Wed Dec 11 09:29:22 2002
@@ -7,11 +7,6 @@
 
 <!-- ServiceManager -->
 
-  <defaultView
-     for=".IServiceManager."
-     name="index.html"
-     />
-
   <view
      for=".IServiceManager."
      name="index.html"