[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/zopetop - configure.zcml:1.6.20.1 standardmacros.py:1.4.16.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/browser/skins/zopetop
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/browser/skins/zopetop

Modified Files:
      Tag: cw-mail-branch
	configure.zcml standardmacros.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/browser/skins/zopetop/configure.zcml 1.6 => 1.6.20.1 ===
--- Zope3/src/zope/app/browser/skins/zopetop/configure.zcml:1.6	Sat Mar  1 12:32:51 2003
+++ Zope3/src/zope/app/browser/skins/zopetop/configure.zcml	Sun Jun 22 10:22:50 2003
@@ -38,15 +38,6 @@
       layer="templates" 
       />
 
-  <browser:page
-    name="contents.html"
-    for="zope.app.interfaces.content.folder.IFolder"
-    permission="zope.ManageContent"
-    layer="templates"
-    class="zope.app.browser.container.contents.Contents"
-    template="www/folder_contents.pt" 
-    />
-
   <browser:resource  
       name="pdlib.js" 
       file="www/pdlib.js"


=== Zope3/src/zope/app/browser/skins/zopetop/standardmacros.py 1.4 => 1.4.16.1 ===
--- Zope3/src/zope/app/browser/skins/zopetop/standardmacros.py:1.4	Sun Mar 30 10:40:57 2003
+++ Zope3/src/zope/app/browser/skins/zopetop/standardmacros.py	Sun Jun 22 10:22:50 2003
@@ -23,6 +23,4 @@
 
 class StandardMacros(BaseMacros):
 
-    __implements__ = BaseMacros.__implements__
-
     macro_pages = ('view_macros', 'widget_macros', 'dialog_macros')