[Checkins] SVN: z3c.skin.pagelet/s Use z3c.layer.pagelet.IPageletBrowserLayer

[Roger Ineichen]

Log message for revision 79823:
  Use z3c.layer.pagelet.IPageletBrowserLayer
  Added macroviewlet back since we have a egg

Changed:
  U   z3c.skin.pagelet/setup.py
  U   z3c.skin.pagelet/src/z3c/skin/pagelet/__init__.py
  U   z3c.skin.pagelet/src/z3c/skin/pagelet/browser/configure.zcml
  U   z3c.skin.pagelet/src/z3c/skin/pagelet/configure.zcml
  U   z3c.skin.pagelet/src/z3c/skin/pagelet/ftesting.zcml
  D   z3c.skin.pagelet/src/z3c/skin/pagelet/layer.py
  D   z3c.skin.pagelet/src/z3c/skin/pagelet/layer.zcml
  U   z3c.skin.pagelet/src/z3c/skin/pagelet/menu.zcml

-=-
Modified: z3c.skin.pagelet/setup.py
===================================================================
--- z3c.skin.pagelet/setup.py	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/setup.py	2007-09-22 17:38:09 UTC (rev 79823)
@@ -93,6 +93,7 @@
         'z3c.i18n',
         'z3c.layer',
         'z3c.macro',
+        'z3c.macroviewlet',
         'z3c.menu',
         'z3c.pagelet',
         'z3c.template',

Modified: z3c.skin.pagelet/src/z3c/skin/pagelet/__init__.py
===================================================================
--- z3c.skin.pagelet/src/z3c/skin/pagelet/__init__.py	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/src/z3c/skin/pagelet/__init__.py	2007-09-22 17:38:09 UTC (rev 79823)
@@ -18,10 +18,10 @@
 
 from zope.viewlet.interfaces import IViewletManager
 
-from z3c.skin.pagelet import layer
+import z3c.layer.pagelet
 
 
-class IPageletBrowserSkin(layer.IPageletBrowserLayer):
+class IPageletBrowserSkin(z3c.layer.pagelet.IPageletBrowserLayer):
     """The ``Z3CPageletDemo`` application skin."""
 
 

Modified: z3c.skin.pagelet/src/z3c/skin/pagelet/browser/configure.zcml
===================================================================
--- z3c.skin.pagelet/src/z3c/skin/pagelet/browser/configure.zcml	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/src/z3c/skin/pagelet/browser/configure.zcml	2007-09-22 17:38:09 UTC (rev 79823)
@@ -120,7 +120,6 @@
       permission="zope.Public"
       />
 
-<!--
   <z3c:macroViewlet
       for="*"
       template="template.pt"
@@ -128,7 +127,6 @@
       manager="z3c.skin.pagelet.ITitle"
       layer="z3c.skin.pagelet.IPageletBrowserSkin"
       />
--->
 
   <!-- simple index.html view -->
   <z3c:pagelet

Modified: z3c.skin.pagelet/src/z3c/skin/pagelet/configure.zcml
===================================================================
--- z3c.skin.pagelet/src/z3c/skin/pagelet/configure.zcml	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/src/z3c/skin/pagelet/configure.zcml	2007-09-22 17:38:09 UTC (rev 79823)
@@ -2,7 +2,6 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="z3c">
 
-  <include file="layer.zcml" />
   <include file="menu.zcml" />
   <include package=".browser" />
 

Modified: z3c.skin.pagelet/src/z3c/skin/pagelet/ftesting.zcml
===================================================================
--- z3c.skin.pagelet/src/z3c/skin/pagelet/ftesting.zcml	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/src/z3c/skin/pagelet/ftesting.zcml	2007-09-22 17:38:09 UTC (rev 79823)
@@ -14,6 +14,7 @@
   <include package="zope.app.securitypolicy" file="meta.zcml" />
   <include package="zope.viewlet" file="meta.zcml" />
   <include package="z3c.macro" file="meta.zcml" />
+  <include package="z3c.macroviewlet" file="meta.zcml" />
   <include package="z3c.pagelet" file="meta.zcml" />
   <include package="z3c.template" file="meta.zcml" />
   <include package="z3c.zrtresource" file="meta.zcml" />
@@ -45,6 +46,7 @@
   <include package="z3c.layer.minimal" />
   <include package="z3c.layer.pagelet" />
   <include package="z3c.macro" />
+  <include package="z3c.macroviewlet" />
   <include package="z3c.pagelet" />
   <include package="z3c.skin.pagelet" />
 

Deleted: z3c.skin.pagelet/src/z3c/skin/pagelet/layer.py
===================================================================
--- z3c.skin.pagelet/src/z3c/skin/pagelet/layer.py	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/src/z3c/skin/pagelet/layer.py	2007-09-22 17:38:09 UTC (rev 79823)
@@ -1,23 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""
-$Id: layer.py 72088 2007-01-18 01:09:33Z rogerineichen $
-"""
-__docformat__ = "reStructuredText"
-
-from z3c.layer import minimal
-
-
-class IPageletBrowserLayer(minimal.IMinimalBrowserLayer):
-    """The simple layer inherited from minimal layer."""

Deleted: z3c.skin.pagelet/src/z3c/skin/pagelet/layer.zcml
===================================================================
--- z3c.skin.pagelet/src/z3c/skin/pagelet/layer.zcml	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/src/z3c/skin/pagelet/layer.zcml	2007-09-22 17:38:09 UTC (rev 79823)
@@ -1,10 +0,0 @@
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="z3c">
-
-  <interface
-      interface="z3c.skin.pagelet.layer.IPageletBrowserLayer"
-      type="zope.publisher.interfaces.browser.IBrowserSkinType"
-      />
-
-</configure>

Modified: z3c.skin.pagelet/src/z3c/skin/pagelet/menu.zcml
===================================================================
--- z3c.skin.pagelet/src/z3c/skin/pagelet/menu.zcml	2007-09-22 17:14:43 UTC (rev 79822)
+++ z3c.skin.pagelet/src/z3c/skin/pagelet/menu.zcml	2007-09-22 17:38:09 UTC (rev 79823)
@@ -8,7 +8,7 @@
       class="z3c.skin.pagelet.menu.GlobalMenu"
       provides="z3c.skin.pagelet.interfaces.IGlobalMenu"
       template="menu_tab.pt"
-      layer="z3c.skin.pagelet.layer.IPageletBrowserLayer"
+      layer="z3c.skin.pagelet.IPageletBrowserSkin"
       permission="zope.Public"
       />
 
@@ -17,7 +17,7 @@
       class="z3c.skin.pagelet.menu.ContextMenu"
       provides="z3c.skin.pagelet.interfaces.IContextMenu"
       template="menu_tab.pt"
-      layer="z3c.skin.pagelet.layer.IPageletBrowserLayer"
+      layer="z3c.skin.pagelet.IPageletBrowserSkin"
       permission="zope.Public"
       />