Author: jmorliaguet
Date: Wed Apr 19 12:40:43 2006
New Revision: 2894
Modified:
cpsskins/branches/paris-sprint-2006/browser/__init__.py
cpsskins/branches/paris-sprint-2006/browser/configure.zcml
cpsskins/branches/paris-sprint-2006/browser/negotiation/configure.zcml
cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py
cpsskins/branches/paris-sprint-2006/browser/skin/configure.zcml
cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/storages/metaconfigure.py
cpsskins/branches/paris-sprint-2006/lib/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/__init__.py
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/configure.zcml
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/unit/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/filters/effect/__init__.py
cpsskins/branches/paris-sprint-2006/standard/filters/effect/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/authoring/icons/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/authoring/images/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/editing/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/editing/icons/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/interactiondesigner/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/layoutdesigner/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
Log:
- backported cpsskins from the zope3 trunk to zope 3.2.1 (upcoming zope-2.9.3)
Modified: cpsskins/branches/paris-sprint-2006/browser/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/__init__.py (original)
+++ cpsskins/branches/paris-sprint-2006/browser/__init__.py Wed Apr 19
12:40:43 2006
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2005-2006 Nuxeo and Contributors.
+# Copyright (c) 2005 Nuxeo and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: cpsskins/branches/paris-sprint-2006/browser/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/browser/configure.zcml Wed Apr 19
12:40:43 2006
@@ -12,7 +12,7 @@
menu="zmi_actions" title="Add"
class="zope.app.container.browser.adding.Adding"
permission="zope.ManageContent"
- layer="cpsskins.browser.skin.cpsskins">
+ layer="cpsskins">
<page name="index.html" template="skin/add.pt" />
<page name="action.html" attribute="action" />
@@ -47,7 +47,7 @@
<!-- Cache view -->
<pages
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
for="*"
class=".caching.ImageCacheView"
permission="zope.Public">
Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -10,7 +10,7 @@
class=".views.NegotiationView"
permission="zope.Public"
allowed_interface=".interfaces.INegotiation"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
</configure>
Modified: cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py Wed Apr
19 12:40:43 2006
@@ -18,14 +18,14 @@
__docformat__ = "reStructuredText"
from zope.app.publisher.browser import applySkin
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.interfaces.browser import ILayer, IDefaultBrowserLayer
from zope.publisher.interfaces.browser import IBrowserRequest
-from cpsskins.utils import getThemeManager
-class cpsskins(IBrowserRequest):
- """The default cpsskins layer"""
+from cpsskins.utils import getThemeManager
-class IDefaultSkin(cpsskins, IDefaultBrowserLayer):
- """The default cpsskins skin"""
+class IDefaultLayer(ILayer, IBrowserRequest):
+ """The default layer"""
+class IDefaultSkin(IDefaultLayer, IDefaultBrowserLayer):
+ """The default skin"""
Modified: cpsskins/branches/paris-sprint-2006/browser/skin/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/skin/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/skin/configure.zcml Wed Apr
19 12:40:43 2006
@@ -5,10 +5,14 @@
<!-- Default cpsskins skin -->
- <interface
+ <browser:layer
name="cpsskins"
- interface="cpsskins.browser.skin.IDefaultSkin"
- type="zope.publisher.interfaces.browser.IBrowserSkinType"
+ interface=".IDefaultLayer"
+ />
+
+ <browser:skin
+ name="cpsskins"
+ interface=".IDefaultSkin"
/>
<browser:page
@@ -17,7 +21,7 @@
permission="zope.View"
class=".standardmacros.StandardMacros"
allowed_interface="zope.interface.common.mapping.IItemMapping"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
<browser:page
@@ -25,7 +29,7 @@
name="skin_macros"
permission="zope.View"
template="template.pt"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
<browser:page
@@ -33,7 +37,7 @@
name="popup_macros"
permission="zope.View"
template="popup_macros.pt"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
<browser:page
@@ -41,7 +45,7 @@
name="widget_macros"
permission="zope.View"
template="widget_macros.pt"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
</configure>
Modified:
cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
Wed Apr 19 12:40:43 2006
@@ -18,7 +18,7 @@
__docformat__ = "reStructuredText"
from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.component.contentdirective import ClassDirective
+from zope.app.component.contentdirective import ContentDirective
from zope.app.component.metaconfigure import adapter
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
@@ -50,7 +50,7 @@
raise ConfigurationError("Must specify a display factory.")
# zope:content
- c = ClassDirective(_context=_context, class_=factory)
+ c = ContentDirective(_context=_context, class_=factory)
c.implements(_context=_context,interface=(IAttributeAnnotatable,))
c.require(_context=_context,
permission="zope.View",
Modified:
cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
Wed Apr 19 12:40:43 2006
@@ -20,7 +20,7 @@
import os
from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.component.contentdirective import ClassDirective
+from zope.app.component.contentdirective import ContentDirective
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
from zope.component import queryUtility, provideUtility
@@ -61,7 +61,7 @@
raise ConfigurationError("Must specify a format predicate.")
# zope:content
- c = ClassDirective(_context=_context, class_=class_)
+ c = ContentDirective(_context=_context, class_=class_)
c.implements(_context=_context,interface=(IAttributeAnnotatable,))
c.require(_context=_context,
permission="zope.View",
Modified:
cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
Wed Apr 19 12:40:43 2006
@@ -21,7 +21,7 @@
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.app.form.browser.metaconfigure import EditFormDirective
-from zope.app.component.contentdirective import ClassDirective
+from zope.app.component.contentdirective import ContentDirective
from zope.app.publisher.browser.icon import IconDirective
from zope.app.publisher.browser.menumeta import addMenuItem
from zope.app.publisher.browser.resourcemeta import resource
@@ -80,7 +80,7 @@
)
# zope:content
- c = ClassDirective(_context=_context, class_=factory)
+ c = ContentDirective(_context=_context, class_=factory)
c.implements(_context=_context,interface=(schema, IAttributeAnnotatable))
c.require(_context=_context,
permission="zope.View",
Modified:
cpsskins/branches/paris-sprint-2006/configuration/storages/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/storages/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/storages/metaconfigure.py
Wed Apr 19 12:40:43 2006
@@ -17,7 +17,7 @@
"""
__docformat__ = "reStructuredText"
-from zope.app.component.contentdirective import ClassDirective
+from zope.app.component.contentdirective import ContentDirective
from zope.app.container.interfaces import IReadContainer, IWriteContainer
from zope.configuration.exceptions import ConfigurationError
@@ -42,7 +42,7 @@
interface = IStorage
# zope:content
- c = ClassDirective(_context=_context, class_=class_)
+ c = ContentDirective(_context=_context, class_=class_)
c.factory(_context=_context, title=title, description=description)
c.allow(_context=_context,
interface=(IReadContainer, interface))
Modified: cpsskins/branches/paris-sprint-2006/lib/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/lib/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/lib/configure.zcml Wed Apr 19
12:40:43 2006
@@ -27,7 +27,7 @@
<resource
name="misc.js" file="misc.js"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
</configure>
Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/__init__.py
(original)
+++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/__init__.py Wed Apr
19 12:40:43 2006
@@ -1,9 +1,10 @@
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.interfaces.browser import ILayer, IDefaultBrowserLayer
from zope.publisher.interfaces.browser import IBrowserRequest
-class cpsskinsTest(IBrowserRequest):
+class IDefaultLayer(ILayer, IBrowserRequest):
"""The test layer"""
-class ITestSkin(cpsskinsTest, IDefaultBrowserLayer):
+class IDefaultSkin(IDefaultLayer, IDefaultBrowserLayer):
"""The test skin"""
+
Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -4,10 +4,14 @@
<!-- Test cpsskins skin -->
- <interface
+ <browser:layer
name="cpsskinsTest"
- interface="cpsskins.lib.cpsskins.tests.ITestSkin"
- type="zope.publisher.interfaces.browser.IBrowserSkinType"
+ interface=".IDefaultLayer"
+ />
+
+ <browser:skin
+ name="cpsskinsTest"
+ interface=".IDefaultSkin"
/>
<include package=".functional" />
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,7 +3,7 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_aggregator.html"
permission="zope.Public"
template="cpsskins_aggregator.pt"
@@ -11,14 +11,14 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="feedbox.html"
permission="zope.Public"
template="feedbox.pt"
/>
<browser:pages
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,14 +3,14 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_benchmarks.html"
permission="zope.Public"
template="cpsskins_benchmarks.pt"
/>
<browser:pages
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,11 +3,11 @@
<browser:resource
name="chat.css" file="chat.css"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest" />
+ layer="cpsskinsTest" />
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_chat.html"
permission="zope.Public"
template="cpsskins_chat.pt"
@@ -15,7 +15,7 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="chatbox.html"
permission="zope.Public"
template="chatbox.pt"
@@ -23,14 +23,14 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="chatinput.html"
permission="zope.Public"
template="chatinput.pt"
/>
<browser:pages
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,11 +3,11 @@
<browser:resource
name="form.css" file="form.css"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest" />
+ layer="cpsskinsTest" />
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_form_validation.html"
permission="zope.Public"
template="cpsskins_form_validation.pt"
@@ -15,14 +15,14 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="sampleform.html"
permission="zope.Public"
template="sampleform.pt"
/>
<browser:pages
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,7 +3,7 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_latency.html"
permission="zope.Public"
template="cpsskins_latency.pt"
@@ -11,14 +11,14 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_typewriter.html"
permission="zope.Public"
template="cpsskins_typewriter.pt"
/>
<browser:pages
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,7 +3,7 @@
<browser:pages
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
permission="zope.Public">
<page
@@ -20,7 +20,7 @@
<browser:pages
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
permission="zope.Public"
class=".views.FormAction">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,14 +3,14 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_quiz.html"
permission="zope.Public"
template="cpsskins_quiz.pt"
/>
<browser:pages
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,27 +3,27 @@
<browser:resource
name="container.png" file="images/container.png"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest" />
+ layer="cpsskinsTest" />
<browser:resource
name="container-open.png" file="images/container-open.png"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest" />
+ layer="cpsskinsTest" />
<browser:resource
name="node-link-branch.png" file="images/node-link-branch.png"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest" />
+ layer="cpsskinsTest" />
<browser:resource
name="node-link-last.png" file="images/node-link-last.png"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest" />
+ layer="cpsskinsTest" />
<browser:resource
name="folder.png" file="images/folder.png"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest" />
+ layer="cpsskinsTest" />
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="cpsskins_treeview.html"
permission="zope.Public"
template="cpsskins_treeview.pt"
@@ -31,14 +31,14 @@
<browser:page
for="*"
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
name="treeview_widget.html"
permission="zope.Public"
template="treeview_widget.pt"
/>
<browser:pages
- layer="cpsskins.lib.cpsskins.tests.cpsskinsTest"
+ layer="cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/unit/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/unit/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/unit/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -3,7 +3,7 @@
<browser:page
for="*"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
name="cpsskins_storage_adapters_unit.html"
permission="zope.Public"
template="cpsskins_storage_adapters.pt"
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/effect/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/effect/__init__.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/effect/__init__.py
Wed Apr 19 12:40:43 2006
@@ -21,9 +21,8 @@
from cStringIO import StringIO
from zope.app.file.image import Image
-from zope.app.schema.interfaces import IVocabularyFactory
from zope.component import adapts
-from zope.interface import implements, alsoProvides
+from zope.interface import implements
from zope.schema.vocabulary import SimpleVocabulary
from zope.security.proxy import removeSecurityProxy
@@ -112,11 +111,9 @@
"""
return SimpleVocabulary.fromItems([('Image scaling','scale')])
-alsoProvides(EffectsByTypeVocabulary, IVocabularyFactory)
def WebImageFormatVocabulary(context):
"""A vocabulary that contains the list of supported web image formats.
"""
return SimpleVocabulary.fromItems([('PNG','PNG'), ('JPEG', 'JPEG')])
-alsoProvides(WebImageFormatVocabulary, IVocabularyFactory)
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/effect/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/effect/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/effect/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -12,16 +12,14 @@
factory=".EffectFilter"
/>
- <utility
- provides="zope.app.schema.interfaces.IVocabularyFactory"
- component=".EffectsByTypeVocabulary"
+ <vocabulary
name="effects by type"
+ factory=".EffectsByTypeVocabulary"
/>
- <utility
- provides="zope.app.schema.interfaces.IVocabularyFactory"
- component=".WebImageFormatVocabulary"
+ <vocabulary
name="web image formats"
+ factory=".WebImageFormatVocabulary"
/>
</configure>
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -25,11 +25,11 @@
<browser:resource
name="style_editor.css" file="style_editor.css"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<browser:resource
name="style_editor.js" file="style_editor.js"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<browser:pages
for="cpsskins.standard.formats.style.IStyle"
@@ -95,7 +95,7 @@
<browser:pages
for="*"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.View"
class=".css.StylesheetView"
>
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/configure.zcml Wed Apr
19 12:40:43 2006
@@ -38,10 +38,9 @@
predicate=".widget.hasWidget"
/>
- <utility
- provides="zope.app.schema.interfaces.IVocabularyFactory"
- component=".widget.WidgetsVocabulary"
+ <vocabulary
name="Widgets"
+ factory=".widget.WidgetsVocabulary"
/>
<!-- Effect -->
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/widget.py Wed Apr
19 12:40:43 2006
@@ -18,11 +18,10 @@
__docformat__ = "reStructuredText"
from persistent import Persistent
-from zope.app.schema.interfaces import IVocabularyFactory
from zope.component import getUtilitiesFor
from zope.component.factory import Factory
-from zope.interface import implements, implementedBy, alsoProvides
+from zope.interface import implements, implementedBy
from zope.i18nmessageid import MessageFactory
from zope.schema.vocabulary import SimpleVocabulary
from zope.schema import List, Choice
@@ -78,4 +77,3 @@
return SimpleVocabulary.fromItems(widgets)
-alsoProvides(WidgetsVocabulary, IVocabularyFactory)
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -46,12 +46,12 @@
<!-- Macroless skin -->
- <zope:interface
- name="cpsskinsMacroless"
- interface=".portlet.IMacrolessSkin"
- type="zope.publisher.interfaces.browser.IBrowserSkinType"
+ <browser:layer
+ name="cpsskins-macroless"
+ interface=".skin.IMacrolessLayer"
/>
+
<browser:page
for="*"
name="standard_macros"
Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml Wed Apr
19 12:40:43 2006
@@ -9,11 +9,11 @@
<browser:resource
name="authoring.css" file="authoring.css"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<browser:resource
name="authoring.js" file="authoring.js"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<!-- Negotiation view -->
@@ -24,12 +24,12 @@
class=".views.Authoring"
permission="zope.Public"
allowed_interface=".views.IAuthoring"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
<browser:pages
for="*"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.ManageContent"
class=".views.Authoring">
@@ -131,7 +131,7 @@
</browser:pages>
<browser:pages
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
for="*"
permission="zope.ManageContent"
class=".views.JSONViews">
Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/icons/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/icons/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/icons/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -4,78 +4,78 @@
<resource
name="copy-16.png" file="copy-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="edit-16.png" file="edit-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="paste-16.png" file="paste-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="format-16.png" file="format-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="duplicate-16.png" file="duplicate-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="delete-16.png" file="delete-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="manage-16.png" file="manage-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="view-16.png" file="view-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="perspective-12.png" file="perspective-12.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="add-16.png" file="add-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="remove-16.png" file="remove-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="settings-48.png" file="settings-48.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="negotiation-48.png" file="negotiation-48.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="io-48.png" file="io-48.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="management-48.png" file="management-48.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="create-setting-16.png" file="create-setting-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="use-setting-16.png" file="use-setting-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="moveup-12.png" file="moveup-12.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="movedown-12.png" file="movedown-12.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
</configure>
Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/images/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/images/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/images/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -4,78 +4,78 @@
<resource
name="bg_context-menu.png" file="bg_context-menu.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="h2-bg.png" file="h2-bg.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="bg_dragbox.png" file="bg_dragbox.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="bg_alpha50.png" file="bg_alpha50.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="bg_cellgrip.png" file="bg_cellgrip.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="gray-gradient.png" file="gray-gradient.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="sizer_left.png" file="sizer_left.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="sizer_line.png" file="sizer_line.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="sizer_right.png" file="sizer_right.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="ltab.png" file="ltab.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="rtab.png" file="rtab.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="tl-tab.png" file="tl-tab.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="tr-tab.png" file="tr-tab.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="tl-tab-sel.png" file="tl-tab-sel.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="tr-tab-sel.png" file="tr-tab-sel.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="slot-corner.png" file="slot-corner.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="bg-panel.png" file="bg-panel.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="li-16.png" file="li-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="wait.gif" file="wait.gif"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
</configure>
Modified: cpsskins/branches/paris-sprint-2006/ui/editing/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/editing/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/editing/configure.zcml Wed Apr
19 12:40:43 2006
@@ -32,7 +32,7 @@
<view
name="editpanel"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
for="cpsskins.elements.interfaces.IElement"
permission="zope.ManageContent"
class=".views.EditPanel"
@@ -40,7 +40,7 @@
<pages
for="cpsskins.elements.interfaces.IElement"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.ManageContent"
class=".views.Editing">
@@ -68,7 +68,7 @@
<pages
for="cpsskins.elements.interfaces.IElement"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.ManageContent"
class=".views.ElementForm">
@@ -86,7 +86,7 @@
<page
for="cpsskins.elements.interfaces.IElement"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
name="edit.html"
permission="zope.ManageContent"
template="edit.pt"
@@ -94,7 +94,7 @@
<pages
for="cpsskins.elements.interfaces.IElement"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.ManageContent"
class=".views.SettingsView">
@@ -116,7 +116,7 @@
<!-- Presentation editor -->
<page
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
for="cpsskins.elements.interfaces.IElement"
name="presentation-editor.html"
permission="zope.ManageContent"
Modified: cpsskins/branches/paris-sprint-2006/ui/editing/icons/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/editing/icons/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/editing/icons/configure.zcml Wed Apr
19 12:40:43 2006
@@ -3,14 +3,14 @@
<resource
name="unchecked-16.png" file="unchecked-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="checked-16.png" file="checked-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
<resource
name="checked-disabled-16.png" file="checked-disabled-16.png"
- layer="cpsskins.browser.skin.cpsskins" />
+ layer="cpsskins" />
</configure>
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml Wed Apr
19 12:40:43 2006
@@ -5,7 +5,7 @@
<!-- Panels -->
<pages
for="*"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.ManageContent">
<page
@@ -75,7 +75,7 @@
<pages
for="*"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.ManageContent"
class=".views.Rendering">
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/configure.zcml Wed Apr
19 12:40:43 2006
@@ -4,7 +4,7 @@
<browser:page
for="*"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
permission="zope.ManageContent"
name="editor.html"
template="editor.pt"
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -8,7 +8,7 @@
<browser:resource
name="content-author.css" file="content_author.css"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
</configure>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -6,13 +6,13 @@
<resource
name="element-editor.css"
file="element-editor.css"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
<resource
name="green-arrow-left.png"
file="green-arrow-left.png"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
</configure>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/interactiondesigner/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/interactiondesigner/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/interactiondesigner/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -4,7 +4,7 @@
<!-- Interaction designer -->
<page
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
for="*"
name="interaction-designer.html"
permission="zope.ManageContent"
@@ -14,7 +14,7 @@
<resource
name="interaction-designer.css"
file="interaction_designer.css"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
</configure>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/layoutdesigner/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/layoutdesigner/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/layoutdesigner/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -9,7 +9,7 @@
<browser:resource
name="layout-designer.css"
file="layout_designer.css"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
</configure>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -9,7 +9,7 @@
<browser:resource
name="page-designer.css"
file="page_designer.css"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
</configure>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
Wed Apr 19 12:40:43 2006
@@ -4,7 +4,7 @@
<!-- Site manager -->
<page
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
for="*"
name="site-manager.html"
permission="zope.ManageContent"
@@ -14,7 +14,7 @@
<resource
name="site-manager.css"
file="site_manager.css"
- layer="cpsskins.browser.skin.cpsskins"
+ layer="cpsskins"
/>
<pages
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
