[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/Views/Browser - Connections.pt:1.1.2.2 configure.zcml:1.8.2.4

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


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

Modified Files:
      Tag: named-component-configuration-branch
	Connections.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/ConnectionService/Views/Browser/Connections.pt 1.1.2.1 => 1.1.2.2 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/Views/Browser/Connections.pt:1.1.2.1	Tue Dec 10 14:16:00 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/Views/Browser/Connections.pt	Wed Dec 11 09:29:22 2002
@@ -1,56 +1,33 @@
 <html metal:use-macro="views/standard_macros/page">
-<body metal:fill-slot="body" tal:define="connections view/update">
+<body metal:fill-slot="body">
+<div metal:use-macro="view/indexMacros/macros/body">
 
-  <h2>Connections configured in this connection service.</h2>
+  <h2 metal:fill-slot="heading">Connections configured in this connection service.</h2>
 
-  <p tal:condition="not:connections">
-       No connections have been configured
-  </p>
-
-  <div tal:condition="connections">
-
-      <p>For each connection, the connection name is given and all of the
-         components registered to provide the connection are shown.  You
-         may select the component to provide the connection or disable the
-         connection.
-      </p>
-
-      <p>Select a connection name or a component name to visit the connection
-         or component. </p>
-
-      <form action="." method="post"
-            tal:attributes="action request/URL">
-
-      <table width="100%">
-
-         <tr tal:repeat="connection connections">
-           <td valign="top" align="right">
-              <a href="Roles"
-                 tal:content="connection/name"
-                 tal:attributes="href connection/url"
-                 tal:condition="connection/active"
-                 >Roles</a>
-              <span tal:replace="connection/name"
-                    tal:condition="connection/inactive" />
-           </td>
-           <td tal:content="structure connection/view">
-           </td>
-         </tr>
+  <p metal:fill-slot="empty_text">No connections have been configured</p>
 
-      </table>
+  <div metal:fill-slot="extra_top">
 
-      <input type=submit name="submit_update" value="Update"><br>
+    <p>For each connection, the connection name is given and all of the
+       components registered to provide the connection are shown.  You
+       may select the component to provide the connection or disable the
+       connection.
+    </p>
 
-      </form>
+    <p>Select a connection name or a component name to visit the connection
+       or component.
+    </p>
 
   </div>
 
-  <p>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 is added, add a connection configuration that configures the
-     component to provide a connection.
+  <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
+     is added, add a connection configuration that configures the component to
+     provide a connection.
   </p>
 
+</div>
 </body>
 </html>


=== Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/Views/Browser/configure.zcml 1.8.2.3 => 1.8.2.4 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/Views/Browser/configure.zcml:1.8.2.3	Wed Dec 11 07:37:40 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/Views/Browser/configure.zcml	Wed Dec 11 09:29:22 2002
@@ -6,14 +6,10 @@
 
 <!-- ConnectionService -->
 
-  <browser:defaultView
-      for=".ConnectionService.ILocalConnectionService."
-      name="index.html" />
-
   <browser:menuItems
       menu="zmi_views"
       for=".ConnectionService.ILocalConnectionService.">
-    <browser:menuItem title="Edit" action="index.html"/>
+    <browser:menuItem title="Connections" action="index.html"/>
   </browser:menuItems>
 
   <browser:view