[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/ - modify z.a.folder.browser to use browser:containerViews

[Fred L. Drake, Jr.]

Log message for revision 27486:
  - modify z.a.folder.browser to use browser:containerViews
    (for conciseness and to set a good example)
  - fix <browser:containerViews index="..."/> to create an index page instead
    of a contents page
  
  (merged from Zope3 trunk revision 27485)
  


Changed:
  A   Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/ftests/index.txt
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/ftests/test_contents.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/metaconfigure.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/folder/browser/configure.zcml


-=-
Copied: Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/ftests/index.txt (from rev 27485, Zope3/trunk/src/zope/app/container/browser/ftests/index.txt)


Property changes on: Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/ftests/index.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/ftests/test_contents.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/ftests/test_contents.py	2004-09-09 19:24:24 UTC (rev 27485)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/ftests/test_contents.py	2004-09-09 19:26:42 UTC (rev 27486)
@@ -27,6 +27,8 @@
 from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.dublincore.interfaces import IZopeDublinCore
 
+from zope.app.tests.functional import FunctionalDocFileSuite
+
 class File(Persistent):
     implements(IAttributeAnnotatable)
 
@@ -261,6 +263,7 @@
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(Test))
+    suite.addTest(FunctionalDocFileSuite("index.txt"))
     return suite
 
 if __name__=='__main__':

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/metaconfigure.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/metaconfigure.py	2004-09-09 19:24:24 UTC (rev 27485)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/metaconfigure.py	2004-09-09 19:26:42 UTC (rev 27486)
@@ -66,7 +66,7 @@
             
     if index is not None:
         page(_context, name='index.html', permission=index, for_=for_, 
-             class_=Contents, attribute='contents')
+             class_=Contents, attribute='index')
 
     if add is not None:
         viewObj = view(_context, name='+', menu='zmi_actions',

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/folder/browser/configure.zcml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/folder/browser/configure.zcml	2004-09-09 19:24:24 UTC (rev 27485)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/folder/browser/configure.zcml	2004-09-09 19:26:42 UTC (rev 27486)
@@ -17,23 +17,12 @@
       permission="zope.ManageContent"
       />
 
-  <browser:page
-      name="contents.html"
-      menu="zmi_views" title="Contents"
+  <browser:containerViews
       for="zope.app.folder.interfaces.IFolder"
-      permission="zope.ManageContent"
-      class="zope.app.container.browser.contents.Contents"
-      attribute="contents"
+      contents="zope.ManageContent"
+      index="zope.View"
       />
 
-  <browser:page
-      name="index.html"
-      for="zope.app.folder.interfaces.IFolder"
-      permission="zope.View"
-      class="zope.app.container.browser.contents.Contents"
-      attribute="index"
-      />
-
   <!-- Preview view - requires zope.app.preview -->
 
   <configure package="zope.app.preview">