[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - metadirectives.py:1.11 viewmeta.py:1.36

[Philipp von Weitershausen]

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

Modified Files:
	metadirectives.py viewmeta.py 
Log Message:
Make the browser:pages directive take the usage parameter as well.


=== Zope3/src/zope/app/publisher/browser/metadirectives.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/publisher/browser/metadirectives.py:1.10	Sun Dec  7 05:04:53 2003
+++ Zope3/src/zope/app/publisher/browser/metadirectives.py	Sun Dec  7 06:26:11 2003
@@ -138,7 +138,7 @@
 # browser pages
 #
 
-class IPagesDirective(IBasicViewInformation):
+class IPagesDirective(IBasicViewInformation, IUsage):
     """
     Define multiple pages without repeating all of the parameters.
 


=== Zope3/src/zope/app/publisher/browser/viewmeta.py 1.35 => 1.36 ===
--- Zope3/src/zope/app/publisher/browser/viewmeta.py:1.35	Sun Dec  7 05:04:53 2003
+++ Zope3/src/zope/app/publisher/browser/viewmeta.py	Sun Dec  7 06:26:11 2003
@@ -205,21 +205,22 @@
     def __init__(self, _context, for_, permission,
                  layer='default', class_=None,
                  allowed_interface=None, allowed_attributes=None,
+                 usage=u''
                  ):
         self.opts = opts(for_=for_, permission=permission,
                          layer=layer, class_=class_,
                          allowed_interface=allowed_interface,
                          allowed_attributes=allowed_attributes,
+                         usage=usage
                          )
 
     def page(self, _context, name, attribute='__call__', template=None,
-             menu=None, title=None, usage=u''):
+             menu=None, title=None):
         return page(_context,
                     name=name,
                     attribute=attribute,
                     template=template,
                     menu=menu, title=title,
-                    usage=usage,
                     **(self.opts))
 
     def __call__(self):