[Checkins] SVN: zam.api/trunk/src/zam/api/ Added contents.html page for IContainmentRoot

[Roger Ineichen]

Log message for revision 84868:
  Added contents.html page for IContainmentRoot
  Added IAuthenticatorPluginLayer for zamplugin.authenticator
  Removed Plugins site level menu item 
  Added contents.html context menu item for IContainmentRoot

Changed:
  U   zam.api/trunk/src/zam/api/browser/configure.zcml
  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/browser/configure.zcml
===================================================================
--- zam.api/trunk/src/zam/api/browser/configure.zcml	2008-03-23 11:23:17 UTC (rev 84867)
+++ zam.api/trunk/src/zam/api/browser/configure.zcml	2008-03-23 11:25:31 UTC (rev 84868)
@@ -18,4 +18,18 @@
       layer="zam.api.layer.IZAMCoreLayer"
       />
 
+  <z3c:pagelet
+      name="contents.html"
+      for="zope.traversing.interfaces.IContainmentRoot"
+      class="z3c.contents.browser.ContentsPage"
+      permission="zope.ManageSite"
+      layer="zam.api.layer.ISiteManagerPluginLayer"
+      />
+
+  <defaultView
+      for="zope.traversing.interfaces.IContainmentRoot"
+      name="contents.html"
+      layer="zam.api.layer.ISiteManagerPluginLayer"
+      />
+
 </configure>

Modified: zam.api/trunk/src/zam/api/layer.py
===================================================================
--- zam.api/trunk/src/zam/api/layer.py	2008-03-23 11:23:17 UTC (rev 84867)
+++ zam.api/trunk/src/zam/api/layer.py	2008-03-23 11:25:31 UTC (rev 84868)
@@ -24,7 +24,7 @@
 
 # this plugin layers allows us to use the zam plugin configuration without
 # to make the skin depend on the plugins.
-class ISimpleAuthenticationPluginLayer(IBrowserRequest):
+class IAuthenticatorPluginLayer(IBrowserRequest):
     """Plugin layer offered for zamplugin.authentication package."""
 
 class IControlPluginLayer(IBrowserRequest):
@@ -48,7 +48,7 @@
     """ZAM browser layer without any plugin configuration."""
 
 
-class IZAMPluginLayer(ISimpleAuthenticationPluginLayer, IControlPluginLayer,
+class IZAMPluginLayer(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-03-23 11:23:17 UTC (rev 84867)
+++ zam.api/trunk/src/zam/api/menu.py	2008-03-23 11:25:31 UTC (rev 84868)
@@ -49,27 +49,30 @@
 class RootMenuItem(item.GlobalMenuItem):
     """Zope root menu item."""
 
-    viewName = 'index.html'
+    viewName = 'contents.html'
     viewInterface = interfaces.IRootMenuItemPage
     weight = 1
 
-    def getURLContext(self):
-        return api.getRoot(self.context)
 
+class ZAMRootPluginsMenuItem(item.GlobalMenuItem):
+    """Zope root menu item."""
 
-class ZAMPluginsMenuItem(item.SiteMenuItem):
-    """ZAM plugins menu item."""
-
     viewName = 'plugins.html'
-    viewInterface = zope.component.interfaces.IComponents
+    viewInterface = interfaces.IRootMenuItemPage
     weight = 1
 
-    @property
-    def available(self):
-        """Only available on ISite but not at root."""
-        site = hooks.getSite()
-        if site is not None:
-            return True
-        else:
-            return False
 
+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."""
+
+    viewName = 'plugins.html'
+    viewInterface = interfaces.IPluginManagement
+    weight = 100

Modified: zam.api/trunk/src/zam/api/menuitem.zcml
===================================================================
--- zam.api/trunk/src/zam/api/menuitem.zcml	2008-03-23 11:23:17 UTC (rev 84867)
+++ zam.api/trunk/src/zam/api/menuitem.zcml	2008-03-23 11:25:31 UTC (rev 84868)
@@ -3,6 +3,7 @@
     xmlns="http://namespaces.zope.org/browser"
     i18n_domain="zam">
 
+  <!-- IGlobalMenu -->
   <viewlet
       name="Root"
       for="*"
@@ -14,9 +15,29 @@
 
   <viewlet
       name="Plugins"
+      for="*"
+      class=".menu.ZAMRootPluginsMenuItem"
+      manager=".menu.IGlobalMenu"
+      layer=".layer.IZAMCoreLayer"
+      permission="zope.ManageServices"
+      />
+
+
+  <!-- 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.ZAMPluginsMenuItem"
-      manager=".menu.ISiteMenu"
+      class=".menu.PluginsMenuItem"
+      manager=".menu.IContextMenu"
       layer=".layer.IZAMCoreLayer"
       permission="zope.ManageServices"
       />