[Zope3-checkins]
SVN: Zope3/branches/philikon-simplify-skinning/src/
* Make zope.app.layers and zope.app.skins a proper module
(even though
Philipp von Weitershausen
philikon at philikon.de
Sun Feb 19 10:43:06 EST 2006
Log message for revision 41702:
* Make zope.app.layers and zope.app.skins a proper module (even though
they're going to go away). Why they had to be created from Python
is beyond me, or why they had to be created in the first place.
* Introduce a hook to zope.app.layers and zope.app.skins that lets skins
and layers register themselves there. We need this for BBB compat
when we're using <interface /> now instead of <browser:skin />.
Accessing the skins and layers through those modules will trigger a
deprecation warning.
* Add a BBB awareness parameter to the browser:layer directive that let's
us continue to use it until its removed without issuing a deprecation
warning. We need to continue to use it for BBB reasons (because some
code might be looking up layers by getting the ILayer utilities, for
example).
Changed:
U Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/configure.zcml
U Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/configure.zcml
U Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/skin.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/basicskin/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/configure.zcml
U Zope3/branches/philikon-simplify-skinning/src/zope/app/css/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/css/configure.zcml
U Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/configure.zcml
A Zope3/branches/philikon-simplify-skinning/src/zope/app/layers.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml
U Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metaconfigure.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metadirectives.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/configure.zcml
A Zope3/branches/philikon-simplify-skinning/src/zope/app/skins.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/configure.zcml
U Zope3/branches/philikon-simplify-skinning/src/zope/app/zopetop/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/__init__.py
U Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/configure.zcml
-=-
Modified: Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -23,3 +23,7 @@
class IBugtrackerSkin(IBugtrackerLayer, Rotterdam):
"""The bugtracker skin"""
+
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('tracker', IBugtrackerSkin)
Modified: Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/bugtracker/browser/skin/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -3,9 +3,11 @@
xmlns:zope="http://namespaces.zope.org/zope"
>
+ <!-- BBB 2006/02/18, to be removed after 12 months -->
<layer
interface=".IBugtrackerLayer"
name="tracker"
+ bbb_aware="true"
/>
<zope:interface
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -3,9 +3,12 @@
xmlns:zope="http://namespaces.zope.org/zope"
i18n_domain="zope">
+ <!-- BBB 2006/02/18, to be removed after 12 months -->
<layer
name="apidoc"
- interface=".skin.apidoc" />
+ interface=".skin.apidoc"
+ bbb_aware="true"
+ />
<zope:interface
interface=".skin.APIDOC"
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/skin.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/skin.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/browser/skin.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -26,3 +26,6 @@
class APIDOC(apidoc, IDefaultBrowserLayer):
"""The `APIDOC` skin."""
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('APIDOC', APIDOC)
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/basicskin/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/basicskin/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/basicskin/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -21,3 +21,7 @@
class IBasicSkin(IDefaultBrowserLayer):
"""Basic skin that simply only contains the default layer and
nothing else"""
+
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('Basic', IBasicSkin)
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -33,6 +33,9 @@
or via `++skin++Boston`.
"""
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('Boston', Boston)
class IHead(IViewletManager):
"""Head viewlet manager."""
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/boston/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -5,9 +5,11 @@
xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="zope">
+ <!-- BBB 2006/02/18, to be removed after 12 months -->
<layer
name="boston"
interface="zope.app.boston.boston"
+ bbb_aware="true"
/>
<zope:interface
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/css/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/css/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/css/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -29,3 +29,7 @@
It is available via `++skin++zope.app.css.CSS`
or via `++skin++CSS`.
"""
+
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('CSS', CSS)
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/css/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/css/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/css/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -2,9 +2,12 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser">
+ <!-- BBB 2006/02/18, to be removed after 12 months -->
<browser:layer
name="css"
- interface="zope.app.css.layer" />
+ interface="zope.app.css.layer"
+ bbb_aware="true"
+ />
<interface
interface="zope.app.css.CSS"
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -24,3 +24,7 @@
class IDebugSkin(IDebugLayer, Rotterdam):
"""Rotterdam-based skin with debug functionality"""
+
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('Debug', IDebugSkin)
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/debugskin/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -3,9 +3,11 @@
xmlns:zope="http://namespaces.zope.org/zope"
>
+ <!-- BBB 2006/02/18, to be removed after 12 months -->
<layer
interface=".IDebugLayer"
name="debug"
+ bbb_aware="true"
/>
<zope:interface
Added: Zope3/branches/philikon-simplify-skinning/src/zope/app/layers.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/layers.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/layers.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -0,0 +1,30 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation 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.
+#
+##############################################################################
+"""Convenience module to access registered layers
+
+This module solely exists for backward compatibility reasons. It is
+to be removed by Zope 3.5. The now deprecated browser:layers
+directive puts a reference to the created interfaces in this module.
+
+BBB 2006/02/18, to be removed after 12 months
+
+$Id$
+"""
+import zope.deprecation
+
+def set(name, obj):
+ globals()[name] = obj
+ zope.deprecation.deprecated(name, "The zope.app.layers module has "
+ "been deprecated and will be removed in "
+ "Zope 3.5.")
Property changes on: Zope3/branches/philikon-simplify-skinning/src/zope/app/layers.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -8,8 +8,12 @@
<interface
interface="zope.app.publisher.interfaces.browser.IMenuItemType" />
-<browser:layer name="default"
- interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer" />
+<!-- BBB 2006/02/18, to be removed after 12 months -->
+<browser:layer
+ name="default"
+ interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+ bbb_aware="true"
+ />
<content class="zope.publisher.browser.BrowserRequest">
<allow
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metaconfigure.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metaconfigure.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metaconfigure.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -23,6 +23,8 @@
from zope.publisher.interfaces.browser import IBrowserRequest, IDefaultSkin
from zope.publisher.interfaces.browser import IBrowserSkinType
+import zope.app.layers
+import zope.app.skins
from zope.app import zapi
from zope.app.component.metaconfigure import handler
@@ -33,32 +35,15 @@
from zope.app.publisher.browser.viewmeta import view
from zope.app.component.interface import provideInterface
-##############################################################################
-#
# BBB 2006/02/18, to be removed after 12 months
-#
-
import zope.deprecation
zope.deprecation.__show__.off()
from zope.publisher.interfaces.browser import ILayer
zope.deprecation.__show__.on()
-# Create special modules that contain all layers and skins
-# TODO need deprecation warnings for those modules
-from types import ModuleType as module
-import sys
-import zope.app
-zope.app.layers = module('layers')
-sys.modules['zope.app.layers'] = zope.app.layers
-
-zope.app.skins = module('skins')
-sys.modules['zope.app.skins'] = zope.app.skins
-#
-##############################################################################
-
-
# BBB 2006/02/18, to be removed after 12 months
-def layer(_context, name=None, interface=None, base=IBrowserRequest):
+def layer(_context, name=None, interface=None, base=IBrowserRequest,
+ bbb_aware=False):
"""Provides a new layer.
>>> class Context(object):
@@ -68,7 +53,7 @@
Possibility 1: The Old Way
--------------------------
-
+
>>> context = Context()
>>> layer(context, u'layer1')
>>> iface = context.actions[0]['args'][1]
@@ -76,6 +61,7 @@
'layer1'
>>> ILayer.providedBy(iface)
True
+ >>> import sys
>>> hasattr(sys.modules['zope.app.layers'], 'layer1')
True
@@ -161,25 +147,27 @@
"You cannot specify the 'interface' and 'base' together.")
if interface is None:
- warnings.warn_explicit(
- 'Creating layers via ZCML has been deprecated. The browser:layer '
- 'directive will be removed in Zope 3.5. Layers are now interfaces '
- 'extending zope.publisher.interfaces.browser.IBrowserRequest. '
- 'They do not need further registration.',
- DeprecationWarning, _context.info.file, _context.info.line)
+ if not bbb_aware:
+ warnings.warn_explicit(
+ 'Creating layers via ZCML has been deprecated. The '
+ 'browser:layer directive will be removed in Zope 3.5. Layers '
+ 'are now interfaces extending zope.publisher.interfaces.browser'
+ '.IBrowserRequest. They do not need further registration.',
+ DeprecationWarning, _context.info.file, _context.info.line)
interface = InterfaceClass(str(name), (base, ),
__doc__='Layer: %s' %str(name),
__module__='zope.app.layers')
# Add the layer to the layers module.
# Note: We have to do this immediately, so that directives using the
# InterfaceField can find the layer.
- setattr(zope.app.layers, name, interface)
+ zope.app.layers.set(name, interface)
path = 'zope.app.layers.'+name
else:
- warnings.warn_explicit(
- 'Layer interfaces do not require registration anymore. The '
- 'browser:layer directive will be removed in Zope 3.5.',
- DeprecationWarning, _context.info.file, _context.info.line)
+ if not bbb_aware:
+ warnings.warn_explicit(
+ 'Layer interfaces do not require registration anymore. The '
+ 'browser:layer directive will be removed in Zope 3.5.',
+ DeprecationWarning, _context.info.file, _context.info.line)
path = interface.__module__ + '.' + interface.getName()
# If a name was specified, make this layer available under this name.
@@ -191,7 +179,7 @@
# Make the interface available in the `zope.app.layers` module, so
# that other directives can find the interface under the name
# before the CA is setup.
- setattr(zope.app.layers, name, interface)
+ zope.app.layers.set(name, interface)
# Register the layer interface as an interface
_context.action(
@@ -293,7 +281,7 @@
# Add the layer to the skins module.
# Note: We have to do this immediately, so that directives using the
# InterfaceField can find the layer.
- setattr(zope.app.skins, name, interface)
+ zope.app.skins.set(name, interface)
path = 'zope.app.skins'+name
# Register the layers
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metadirectives.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metadirectives.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/publisher/browser/metadirectives.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -20,7 +20,7 @@
from zope.interface import Interface
from zope.configuration.fields import GlobalObject, GlobalInterface
from zope.configuration.fields import Tokens, Path, PythonIdentifier, MessageID
-from zope.schema import TextLine, Text, Id, Int
+from zope.schema import TextLine, Text, Id, Int, Bool
from zope.app.component.metadirectives import IBasicViewInformation
from zope.app.component.fields import LayerField
@@ -599,6 +599,12 @@
required=False
)
+ bbb_aware = Bool(
+ title=u"BBB-aware",
+ description=u"Backward-compatability aware?",
+ required=False
+ )
+
class ISkinDirective(Interface):
"""Defines a browser skin
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -27,3 +27,7 @@
It is available via ``++skin++Rotterdam``.
"""
+
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('Rotterdam', Rotterdam)
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/rotterdam/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -2,9 +2,12 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser">
+ <!-- BBB 2006/02/18, to be removed after 12 months -->
<browser:layer
name="rotterdam"
- interface="zope.app.rotterdam.rotterdam" />
+ interface="zope.app.rotterdam.rotterdam"
+ bbb_aware="true"
+ />
<interface
interface="zope.app.rotterdam.Rotterdam"
Added: Zope3/branches/philikon-simplify-skinning/src/zope/app/skins.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/skins.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/skins.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -0,0 +1,30 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation 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.
+#
+##############################################################################
+"""Convenience module to access registered skins
+
+This module solely exists for backward compatibility reasons. It is
+to be removed by Zope 3.5. The now deprecated browser:skin directive
+puts a reference to the created interfaces in this module.
+
+BBB 2006/02/18, to be removed after 12 months
+
+$Id$
+"""
+import zope.deprecation
+
+def set(name, obj):
+ globals()[name] = obj
+ zope.deprecation.deprecated(name, "The zope.app.skins module has "
+ "been deprecated and will be removed in "
+ "Zope 3.5.")
Property changes on: Zope3/branches/philikon-simplify-skinning/src/zope/app/skins.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -33,6 +33,10 @@
"""Skin based on Rotterdam that includes the static tree
navigation macro."""
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('StaticTree', IStaticTreeSkin)
+
class StatefulTreeView(BrowserView):
def statefulTree(self, root=None, filter=None, tree_state=None):
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/tree/browser/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -40,9 +40,12 @@
</browser:pages>
<!-- Set up the 'StaticTree' skin -->
+
+ <!-- BBB 2006/02/18, to be removed after 12 months -->
<browser:layer
interface=".IStaticTreeLayer"
name="statictree"
+ bbb_aware="true"
/>
<interface
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/zopetop/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/zopetop/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/zopetop/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -36,3 +36,6 @@
This skin consists of its three specific layers plus the rotterdam layer.
"""
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('ZopeTop', ZopeTop)
Modified: Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/__init__.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/__init__.py 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/__init__.py 2006-02-19 15:43:05 UTC (rev 41702)
@@ -23,3 +23,7 @@
class IWikiSkin(IWikiLayer, Rotterdam):
"""Wiki skin"""
+
+# BBB 2006/02/18, to be removed after 12 months
+import zope.app.skins
+zope.app.skins.set('wiki', IWikiSkin)
Modified: Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/configure.zcml
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/configure.zcml 2006-02-19 13:12:18 UTC (rev 41701)
+++ Zope3/branches/philikon-simplify-skinning/src/zwiki/browser/skin/configure.zcml 2006-02-19 15:43:05 UTC (rev 41702)
@@ -4,9 +4,11 @@
i18n_domain="zwiki"
>
+<!-- BBB 2006/02/18, to be removed after 12 months -->
<browser:layer
interface=".IWikiLayer"
name="wiki"
+ bbb_aware="true"
/>
<interface
More information about the Zope3-Checkins
mailing list