[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/ZPTPage - ZPTPage.py:1.1.2.5.2.1 zptpage.zcml:1.1.2.7.2.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/ZPTPage
In directory cvs.zope.org:/tmp/cvs-serv29793/lib/python/Zope/App/OFS/Content/ZPTPage

Modified Files:
      Tag: Zope3InWonderland-branch
	ZPTPage.py zptpage.zcml 
Log Message:
- Added template attribute to allow views to be created from a
  template source file.

- Added beginnings of a Zope debugger. This required seperating site
  and server configuration.

- Added the ability to specify a config file package in the
  zopeConfigure directive. Made "config.zcml" a default for the file
  attribute in the include directive.

- Fixed mapply to unwrap proxied objects. This was necessary once
  views became wrapped in proxies. We need to investigate why they
  weren't being wrapped before. 

- I updated enough system page templates and zcml directives so that:

  - Zope now starts. :)

  - The root folder contents listing can be viewed.

  Many more templates and zcml files need to be updated to reflect the
  way views are now handled.



=== Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/ZPTPage.py 1.1.2.5 => 1.1.2.5.2.1 ===
 from Zope.Proxy.ContextWrapper import getWrapperContainer
 from Zope.Security.Proxy import ProxyFactory
-from Zope.App.OFS.Content.IHTMLContent import IHTMLContent
+from Zope.App.OFS.Content.IFileContent import IFileContent
 
 class IZPTPage(Interface):
     """ZPT Pages are a persistent implementation of Page Templates.
@@ -59,8 +59,8 @@
 
 class ZPTPage(AppPT, PageTemplate, Persistent):
 
-    # XXX Putting IHTMLContent at the end gives an error!
-    __implements__ = IHTMLContent, IZPTPage, IRenderZPTPage
+    # XXX Putting IFileContent at the end gives an error!
+    __implements__ = IFileContent, IZPTPage, IRenderZPTPage
 
     ############################################################
     # Implementation methods for interface


=== Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/zptpage.zcml 1.1.2.7 => 1.1.2.7.2.1 ===
 
   <zmi:tabs for=".ZPTPage.IZPTPage.">
-    <zmi:tab label="Edit" action="edit;view"/>
+    <zmi:tab label="Edit" action="view::edit"/>
     <zmi:tab label="View" action=""/>
     <!-- XXX This isn't working
-    <zmi:tab label="Role Permissions" action="RolePermissionsManagement;view"/>
+    <zmi:tab label="Role Permissions"
+             action="view::RolePermissionsManagement"/>
     -->
   </zmi:tabs>