[Zope3-checkins] CVS: Zope3/src/zope/app/browser/container - configure.zcml:1.6.2.1 contents.py:1.7.2.6

[Sidnei da Silva]

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

Modified Files:
      Tag: paris-copypasterename-branch
	configure.zcml contents.py 
Log Message:
Updating from HEAD to make sure everything still works before merging

=== Zope3/src/zope/app/browser/container/configure.zcml 1.6 => 1.6.2.1 ===
--- Zope3/src/zope/app/browser/container/configure.zcml:1.6	Tue Dec 31 13:26:51 2002
+++ Zope3/src/zope/app/browser/container/configure.zcml	Tue Feb 11 09:40:59 2003
@@ -1,9 +1,6 @@
-<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'
-   >
+<zopeConfigure xmlns='http://namespaces.zope.org/browser'>
    
-   <browser:view
+   <view
        for="zope.app.interfaces.container.IContentContainer"
        name="+"  
        class="zope.app.browser.container.adding.Adding"
@@ -11,19 +8,19 @@
        allowed_attributes="addingInfo"
        >
 
-       <browser:page name="index.html"  template="add.pt" />
-       <browser:page name="action.html" attribute="action" />
+       <page name="index.html"  template="add.pt" />
+       <page name="action.html" attribute="action" />
    
-       </browser:view>
+       </view>
 
-  <browser:menuItem
+  <menuItem
       for="zope.app.interfaces.container.IWriteContainer"
       menu="zmi_actions"
       title="Add"
       action="+"
       />
 
-  <browser:page
+  <page
       for="zope.app.interfaces.container.IReadContainer"
       name="find.html" 
       menu="zmi_actions"


=== Zope3/src/zope/app/browser/container/contents.py 1.7.2.5 => 1.7.2.6 ===
--- Zope3/src/zope/app/browser/container/contents.py:1.7.2.5	Thu Feb  6 12:17:47 2003
+++ Zope3/src/zope/app/browser/container/contents.py	Tue Feb 11 09:40:59 2003
@@ -12,7 +12,6 @@
 #
 ##############################################################################
 """
-
 Revision information: $Id$
 """
 from zope.app.interfaces.container import IContainer, IZopeContainer
@@ -21,7 +20,8 @@
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 
 from zope.component import queryView, queryAdapter, getAdapter, getService
-from zope.app.interfaces.services.principalannotation import IPrincipalAnnotationService
+from zope.app.interfaces.services.principalannotation \
+     import IPrincipalAnnotationService
 from zope.publisher.browser import BrowserView
 from zope.app.interfaces.traversing import IPhysicallyLocatable
 from zope.app.traversing import traverse, getPhysicalRoot
@@ -175,6 +175,15 @@
             return ''
 
         return self._index()
+
+class JustContents(Contents):
+    """Like Contents, but does't delegate to item named index.html
+    """
+
+    def index(self):
+        return self._index()
+    
+
 
 # XXX L10N Below is prime material for localization.
 # We are a touchpoint that should contact the personalization