[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/basic - configure.zcml:1.3 standardmacros.py:1.3

[Jim Fulton]

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

Modified Files:
	configure.zcml standardmacros.py 
Log Message:
Added the rotterdam skin. The way cool new UI done (well, started)
at the Rotterdam sprinathon.

Modified the skin to reflect the grand renaming.

Also refactored the skins and standard mapping interfaces so we no
longer need IStandardMacros just to say that standard macros have a
__getitem__ method. 



=== Zope3/src/zope/app/browser/skins/basic/configure.zcml 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/skins/basic/configure.zcml:1.2	Wed Dec 25 09:12:40 2002
+++ Zope3/src/zope/app/browser/skins/basic/configure.zcml	Thu Dec 26 15:20:47 2002
@@ -8,7 +8,7 @@
   <browser:view name="standard_macros"
                 permission="zope.View"
                 factory=".standardmacros.StandardMacros" 
-                allowed_interface=".standardmacros.IStandardMacros"
+                allowed_interface="zope.interface.common.mapping.IItemMapping"
                 />
 
   <browser:view name="view_macros"


=== Zope3/src/zope/app/browser/skins/basic/standardmacros.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/skins/basic/standardmacros.py:1.2	Wed Dec 25 09:12:40 2002
+++ Zope3/src/zope/app/browser/skins/basic/standardmacros.py	Thu Dec 26 15:20:47 2002
@@ -18,11 +18,14 @@
 $Id$
 """
 from zope.interface import Interface
+from zope.interface.common.mapping import IItemMapping
 from zope.component import getView
 from zope.publisher.browser import BrowserView
 
 class Macros:
 
+    __implements__ = IItemMapping
+
     macro_pages = ()
 
     def __getitem__(self, key):
@@ -39,14 +42,8 @@
         raise KeyError, key
 
 
-class IStandardMacros(Interface):
-
-    def __getitem__(key):
-        """Return the macro named 'key'"""
-
-
 class StandardMacros(BrowserView, Macros):
 
-    __implements__ = IStandardMacros
+    __implements__ = BrowserView.__implements__, Macros.__implements__
 
     macro_pages = ('view_macros', 'dialog_macros')