[Checkins] SVN: zam.api/trunk/src/zam/api/ Added layer for new zamplugin.contents

[Roger Ineichen]

Log message for revision 85310:
  Added layer for new zamplugin.contents
  Move contents.html page configuration to zamplugin.contents

Changed:
  U   zam.api/trunk/src/zam/api/layer.py
  U   zam.api/trunk/src/zam/api/menu.py
  U   zam.api/trunk/src/zam/api/menuitem.zcml

-=-
Modified: zam.api/trunk/src/zam/api/layer.py
===================================================================
--- zam.api/trunk/src/zam/api/layer.py	2008-04-13 01:53:57 UTC (rev 85309)
+++ zam.api/trunk/src/zam/api/layer.py	2008-04-13 01:56:50 UTC (rev 85310)
@@ -23,6 +23,9 @@
 
 # this plugin layers allows us to use the zam plugin configuration without
 # to make the skin depend on the plugins.
+class IContentsPluginLayer(IBrowserRequest):
+    """Plugin layer offered for zamplugin.contents package."""
+
 class IAuthenticatorPluginLayer(IBrowserRequest):
     """Plugin layer offered for zamplugin.authentication package."""
 
@@ -47,9 +50,9 @@
     """ZAM browser layer without any plugin configuration."""
 
 
-class IZAMPluginLayer(IAuthenticatorPluginLayer, IControlPluginLayer,
-    IErrorPluginLayer, INavigationPluginLayer, ISampleDataPluginLayer,
-    ISiteManagerPluginLayer):
+class IZAMPluginLayer(IContentsPluginLayer, IAuthenticatorPluginLayer,
+    IControlPluginLayer, IErrorPluginLayer, INavigationPluginLayer,
+    ISampleDataPluginLayer, ISiteManagerPluginLayer):
     """Plugin layer offered for zamplugin configuration."""
 
 

Modified: zam.api/trunk/src/zam/api/menu.py
===================================================================
--- zam.api/trunk/src/zam/api/menu.py	2008-04-13 01:53:57 UTC (rev 85309)
+++ zam.api/trunk/src/zam/api/menu.py	2008-04-13 01:56:50 UTC (rev 85310)
@@ -56,14 +56,6 @@
     weight = 1
 
 
-class ContentsMenuItem(item.ContextMenuItem):
-    """ZAM global contents.html menu item."""
-
-    viewName = 'contents.html'
-    viewInterface = interfaces.IRootMenuItemPage
-    weight = 1
-
-
 class PluginsMenuItem(item.ContextMenuItem):
     """ZAM site plugins menu item."""
 

Modified: zam.api/trunk/src/zam/api/menuitem.zcml
===================================================================
--- zam.api/trunk/src/zam/api/menuitem.zcml	2008-04-13 01:53:57 UTC (rev 85309)
+++ zam.api/trunk/src/zam/api/menuitem.zcml	2008-04-13 01:56:50 UTC (rev 85310)
@@ -25,15 +25,6 @@
 
   <!-- IContextMenu -->
   <viewlet
-      name="Contents"
-      for="zope.traversing.interfaces.IContainmentRoot"
-      class=".menu.ContentsMenuItem"
-      manager=".menu.IContextMenu"
-      layer=".layer.IZAMCoreLayer"
-      permission="zope.ManageServices"
-      />
-
-  <viewlet
       name="Plugins"
       for="zope.location.interfaces.ISite"
       class=".menu.PluginsMenuItem"