[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - configure.zcml:1.9

[Jim Fulton]

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

Modified Files:
	configure.zcml 
Log Message:
Changed all single-page browser:view to use browser:page instead.

Got rid of superfluous defaultView directives.

Moved menu specifications into page tags, where possible.
 


=== Zope3/src/zope/app/browser/services/configure.zcml 1.8 => 1.9 === (497/597 lines abridged)
--- Zope3/src/zope/app/browser/services/configure.zcml:1.8	Mon Dec 30 09:02:54 2002
+++ Zope3/src/zope/app/browser/services/configure.zcml	Mon Dec 30 18:50:26 2002
@@ -1,7 +1,6 @@
 <zopeConfigure
    xmlns='http://namespaces.zope.org/zope'
    xmlns:browser='http://namespaces.zope.org/browser'
-   xmlns:form='http://namespaces.zope.org/form'
    >
 
 <!--Error Reporting Service -->
@@ -43,12 +42,13 @@
       <browser:menuItem title="Caches" action="index.html"/>
     </browser:menuItems>
 
-  <browser:view
+  <browser:page
       for="zope.app.services.cache.ILocalCachingService"
       name="index.html"
       template="caches.pt"
       class=".namecomponentconfigurableview.NameComponentConfigurableView"
-      permission="zope.ManageServices" />
+      permission="zope.ManageServices" 
+      />
 
   <browser:menuItem
       menu="add_component"
@@ -81,24 +81,21 @@
 
 <!-- Event Service -->
 
-  <browser:view 
-      permission="zope.ManageServices" 
+  <browser:page
+      name="index.html" 
       for="zope.app.interfaces.services.event.IEventService"
-      factory="zope.app.browser.services.event.Control">
-
-      <browser:page name="index.html" attribute="index" />
-
-  </browser:view>
-
-  <browser:menuItems
-      menu="zmi_views" for="zope.app.interfaces.services.event.IEventService">
-    <browser:menuItem title="Control" action="@@index.html" />
-  </browser:menuItems>
+      menu="zmi_views" title="Control"
+      permission="zope.ManageServices" 
+      class="zope.app.browser.services.event.Control"
+      attribute="index" 
+      />

[-=- -=- -=- 497 lines omitted -=- -=- -=-]

-    <browser:menuItem title="Edit" action="edit.html" />
-  </browser:menuItems>
+  <browser:page 
+      name="edit.html" 
+      for="zodb.code.interfaces.IPersistentModuleManager"
+      menu="zmi_views" title="Edit"
+      class="zope.app.browser.services.module.EditModule"
+      template="edit_module.pt" 
+      permission="zope.ManageServices"
+      />
 
   <browser:view for="zope.app.interfaces.container.IAdding"
         name="Module"
@@ -753,9 +718,12 @@
       <browser:page name="action.html" attribute="action" />
   </browser:view>
 
-  <browser:menuItem menu="add_component" for="zope.app.interfaces.container.IAdding"
-     action="Module"  title="Module" />
-
+  <browser:menuItem 
+      menu="add_component" 
+      for="zope.app.interfaces.container.IAdding"
+      action="Module"  
+      title="Module" 
+      />
 
 <!-- View Package -->
 
@@ -779,9 +747,10 @@
                   />
   </browser:view>
 
-  <form:edit
+  <browser:editform
      schema="zope.app.interfaces.services.service.IViewPackageInfo."
      name="DefaultConfiguration.html"
+     menu="zmi_views" title="Default Configuration"
      permission="zope.ManageServices"
      label="Default configuration parameters"
      />
@@ -790,8 +759,6 @@
              for="zope.app.interfaces.services.service.IViewPackage">
     <browser:menuItem title="Contents"
               action="@@contents.html"/>
-    <browser:menuItem title="Default Configuration"
-              action="@@DefaultConfiguration.html"/>
   </browser:menuItems>
 
   <browser:menuItem menu="add_component"