[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services/utility - configure.zcml:1.9 configureutility.pt:1.2 useconfiguration.py:1.5 utilities.pt:1.3 useconfiguration.pt:NONE

[Guido van Rossum]

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

Modified Files:
	configure.zcml configureutility.pt useconfiguration.py 
	utilities.pt 
Removed Files:
	useconfiguration.pt 
Log Message:
Change most UI refenences to "configuration" into "registration".
Remove some dead wood.


=== Zope3/src/zope/app/browser/services/utility/configure.zcml 1.8 => 1.9 ===
--- Zope3/src/zope/app/browser/services/utility/configure.zcml:1.8	Mon Apr 28 11:54:11 2003
+++ Zope3/src/zope/app/browser/services/utility/configure.zcml	Mon Apr 28 12:52:08 2003
@@ -47,7 +47,7 @@
        an interface, a permission, and a registration status
        (Unregistered, Registered or Active). -->
   <addform
-      label="New Utility Configuration"
+      label="New Utility Registration"
       for="zope.app.interfaces.services.utility.ILocalUtility"
       name="addConfiguration.html"
       schema="zope.app.interfaces.services.utility.IUtilityConfiguration"
@@ -65,7 +65,7 @@
        (Thus leaving only permission and registration status.) -->
   <editform
       menu="zmi_views" title="Edit"
-      label="Utility Configuration"
+      label="Utility Registration"
       name="index.html"
       schema="zope.app.interfaces.services.utility.IUtilityConfiguration"
       permission="zope.ManageServices"


=== Zope3/src/zope/app/browser/services/utility/configureutility.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/services/utility/configureutility.pt:1.1	Thu Apr  3 17:05:32 2003
+++ Zope3/src/zope/app/browser/services/utility/configureutility.pt	Mon Apr 28 12:52:08 2003
@@ -5,13 +5,13 @@
      >
 
 <h2 i18n:translate="" tal:condition="request/name">
-  Utility configurations for interface
+  Utility registrations for interface
   <span tal:replace="request/interface" i18n:name="interface"/>
   with name
   <span tal:replace="request/name" i18n:name="utility_name" />
 </h2>
 <h2 i18n:translate="" tal:condition="not:request/name">
-  Utility configurations for interface
+  Utility registrations for interface
   <span tal:replace="request/interface" i18n:name="interface"/>
 </h2>
 


=== Zope3/src/zope/app/browser/services/utility/useconfiguration.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/services/utility/useconfiguration.py:1.4	Tue Apr  8 15:32:21 2003
+++ Zope3/src/zope/app/browser/services/utility/useconfiguration.py	Mon Apr 28 12:52:08 2003
@@ -19,34 +19,11 @@
 from zope.app.browser.component.interfacewidget import InterfaceWidget
 from zope.app.browser.services.configuration import AddComponentConfiguration
 from zope.app.form.widget import CustomWidget
-from zope.app.interfaces.services.configuration import IUseConfiguration
-from zope.app.traversing import traverse
-from zope.component import getAdapter, getServiceManager, getView
+from zope.component import getServiceManager, getView
 from zope.interface.implements import flattenInterfaces
 from zope.proxy.introspection import removeAllProxies
 from zope.publisher.browser import BrowserView
 
-class UseConfiguration(BrowserView):
-    """View for displaying the configurations for a utility.
-    """
-
-    def uses(self):
-        """Get a sequence of configuration summaries
-        """
-        component = self.context
-        useconfig = getAdapter(component, IUseConfiguration)
-        result = []
-        for path in useconfig.usages():
-            config = traverse(component, path)
-            url = getView(config, 'absolute_url', self.request)
-            result.append({'name': config.name,
-                           'interface': config.interface.__name__,
-                           'path': path,
-                           'url': url(),
-                           'status': config.status,
-                           })
-        return result
-        
 
 class UtilityInterfaceWidget(InterfaceWidget):
     """Custom widget to select an interface from the component's interfaces.


=== Zope3/src/zope/app/browser/services/utility/utilities.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/services/utility/utilities.pt:1.2	Thu Apr 24 14:06:06 2003
+++ Zope3/src/zope/app/browser/services/utility/utilities.pt	Mon Apr 28 12:52:08 2003
@@ -5,7 +5,7 @@
      tal:define="configs view/getConfigs"
      >
 
-<h2 i18n:translate="">Configured utilities in this utility service:</h2>
+<h2 i18n:translate="">Utilities registered in this utility service:</h2>
 
 <table tal:condition="configs">
   <tbody>
@@ -36,7 +36,7 @@
         <a href="."
            tal:attributes="href config/configurl"
            i18n:translate=""
-           >(configure)</a>
+           >(change registration)</a>
       </td>
     </tr>
   </tbody>

=== Removed File Zope3/src/zope/app/browser/services/utility/useconfiguration.pt ===