[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Fix issue #209. Macro aliases were only registered for Rotterdam

[Philipp von Weitershausen]

Log message for revision 24822:
Fix issue #209. Macro aliases were only registered for Rotterdam
while they really are a very basic thing; thus moved them to the
Basic skin :). Thanks to Paolo Invernizzi for reporting.



-=-
Modified: Zope3/trunk/src/zope/app/basicskin/standardmacros.py
===================================================================
--- Zope3/trunk/src/zope/app/basicskin/standardmacros.py	2004-05-19 10:45:25 UTC (rev 24821)
+++ Zope3/trunk/src/zope/app/basicskin/standardmacros.py	2004-05-19 12:15:44 UTC (rev 24822)
@@ -22,14 +22,16 @@
 from zope.component import getView
 from zope.app.publisher.browser import BrowserView
 
-class Macros:
-
+class Macros(object):
     implements(IItemMapping)
 
-    macro_pages = ()
+    macro_pages = ()    
+    aliases = {
+        'view': 'page',
+        'dialog': 'page',
+        'addingdialog': 'page'
+        }
 
-    aliases = {}
-
     def __getitem__(self, key):
         key = self.aliases.get(key, key)
         context = self.context
@@ -44,7 +46,5 @@
                 return v
         raise KeyError, key
 
-
 class StandardMacros(BrowserView, Macros):
-
     macro_pages = ('view_macros', 'dialog_macros')

Modified: Zope3/trunk/src/zope/app/rotterdam/standardmacros.py
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/standardmacros.py	2004-05-19 10:45:25 UTC (rev 24821)
+++ Zope3/trunk/src/zope/app/rotterdam/standardmacros.py	2004-05-19 12:15:44 UTC (rev 24822)
@@ -19,5 +19,3 @@
 class StandardMacros(BaseMacros):
     macro_pages = ('skin_macros', 'view_macros', 'dialog_macros',
                    'navigation_macros')
-    
-    aliases = {'view': 'page', 'dialog': 'page', 'addingdialog': 'page'}