[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop - StandardMacros.py:1.2 configure.zcml:1.4

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop
In directory cvs.zope.org:/tmp/cvs-serv6739/lib/python/Zope/App/ZMI/Browser/ZopeTop

Modified Files:
	StandardMacros.py configure.zcml 
Log Message:
Made ZopeTop skin work again, wrt the new standard_macros implementation.


=== Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop/StandardMacros.py 1.1 => 1.2 ===
--- Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop/StandardMacros.py:1.1	Wed Oct 23 11:02:29 2002
+++ Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop/StandardMacros.py	Thu Oct 31 08:19:17 2002
@@ -17,17 +17,11 @@
 
 $Id$
 """
-from Zope.App.ZMI.ZMIViewUtility import ZMIViewUtility
-from Zope.App.PageTemplate.ViewPageTemplateFile import ViewPageTemplateFile
-from Zope.App.ZMI.StandardMacros import Macros
+from Zope.App.ZMI.StandardMacros import StandardMacros as ZMIMacros
 
-class StandardMacros(ZMIViewUtility, Macros):
+class StandardMacros(ZMIMacros):
 
-    __implements__ = ZMIViewUtility.__implements__
+    __implements__ = ZMIMacros.__implements__
 
-    macro_pages = (
-            ViewPageTemplateFile('www/view_macros.pt'), 
-            ViewPageTemplateFile('www/widget_macros.pt'),
-            ViewPageTemplateFile('www/dialog_macros.pt')
-            )
+    macro_pages = ('view_macros', 'widget_macros', 'dialog_macros')
 


=== Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop/configure.zcml 1.3 => 1.4 ===
--- Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop/configure.zcml:1.3	Wed Oct 23 11:01:06 2002
+++ Zope3/lib/python/Zope/App/ZMI/Browser/ZopeTop/configure.zcml	Thu Oct 31 08:19:17 2002
@@ -9,10 +9,27 @@
 
   <browser:skin name="ZopeTop" layers="templates images css default" />
 
-  <browser:view name="standard_macros"
+  <browser:view
+      name="standard_macros"
+      permission="Zope.View"
+      factory=".StandardMacros."
+      allowed_interface="Zope.App.ZMI.StandardMacros.IStandardMacros"
+      layer="templates" />
+
+  <browser:view name="view_macros"
                 permission="Zope.View"
-                factory=".StandardMacros."
-		layer="templates" />
+                template="www/view_macros.pt"
+                layer="templates" />
+
+  <browser:view name="widget_macros"
+                permission="Zope.View"
+                template="www/widget_macros.pt" 
+                layer="templates" />
+
+  <browser:view name="dialog_macros"
+                permission="Zope.View"
+                template="www/dialog_macros.pt"
+                layer="templates" />
 
   <browser:resource name="zopetopBasic.css" 
                	file="www/zopetopBasic.css"