Author: jmorliaguet
Date: Mon Feb 27 14:34:26 2006
New Revision: 2486
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/__init__.py
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/configure.zcml
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/aggregator/configure.zcml
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/benchmarks/configure.zcml
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/configure.zcml
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/forms/configure.zcml
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/configure.zcml
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/treeview_widget.pt
Log:
- removed deprecation warning when registering layers / skins
cpsskins-test was renamed as cpsskinsTest
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/__init__.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/__init__.py
Mon Feb 27 14:34:26 2006
@@ -1,9 +1,9 @@
-from zope.publisher.interfaces.browser import ILayer, IDefaultBrowserLayer
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.publisher.interfaces.browser import IBrowserRequest
-class ITestLayer(ILayer, IBrowserRequest):
+class cpsskinsTest(IBrowserRequest):
"""The test layer"""
-class ITestSkin(ITestLayer, IDefaultBrowserLayer):
+class ITestSkin(cpsskinsTest, IDefaultBrowserLayer):
"""The test skin"""
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/configure.zcml
(original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/configure.zcml
Mon Feb 27 14:34:26 2006
@@ -1,16 +1,13 @@
<configure
+ xmlns="http://namespaces.zope.org/zope";
xmlns:browser="http://namespaces.zope.org/browser";>
- <!-- Default cpsskins layer -->
+ <!-- Test cpsskins skin -->
- <browser:layer
- name="cpsskins-test"
- interface=".ITestLayer"
- />
-
- <browser:skin
- name="cpsskins-test"
- interface=".ITestSkin"
+ <interface
+ name="cpsskinsTest"
+ interface="cpsskins.ui.framework.tests.zope3.ITestSkin"
+ type="zope.publisher.interfaces.browser.IBrowserSkinType"
/>
<include package=".functional" />
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/aggregator/configure.zcml
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/aggregator/configure.zcml
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/aggregator/configure.zcml
Mon Feb 27 14:34:26 2006
@@ -3,7 +3,7 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="cpsskins_aggregator.html"
permission="zope.Public"
template="cpsskins_aggregator.pt"
@@ -11,14 +11,14 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="feedbox.html"
permission="zope.Public"
template="feedbox.pt"
/>
<browser:pages
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/benchmarks/configure.zcml
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/benchmarks/configure.zcml
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/benchmarks/configure.zcml
Mon Feb 27 14:34:26 2006
@@ -3,14 +3,14 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="cpsskins_benchmarks.html"
permission="zope.Public"
template="cpsskins_benchmarks.pt"
/>
<browser:pages
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/configure.zcml
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/configure.zcml
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/configure.zcml
Mon Feb 27 14:34:26 2006
@@ -3,11 +3,11 @@
<browser:resource
name="chat.css" file="chat.css"
- layer="cpsskins-test" />
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest" />
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="cpsskins_chat.html"
permission="zope.Public"
template="cpsskins_chat.pt"
@@ -15,7 +15,7 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="chatbox.html"
permission="zope.Public"
template="chatbox.pt"
@@ -23,14 +23,14 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="chatinput.html"
permission="zope.Public"
template="chatinput.pt"
/>
<browser:pages
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt
Mon Feb 27 14:34:26 2006
@@ -17,7 +17,7 @@
href="/++skin++cpsskins/@@/++resource++cpsskins.css" />
<link rel="stylesheet" type="text/css"
- href="/++skin++cpsskins-test/@@/++resource++chat.css" />
+ href="/++skin++cpsskinsTest/@@/++resource++chat.css" />
</head>
<body>
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/forms/configure.zcml
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/forms/configure.zcml
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/forms/configure.zcml
Mon Feb 27 14:34:26 2006
@@ -3,11 +3,11 @@
<browser:resource
name="form.css" file="form.css"
- layer="cpsskins-test" />
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest" />
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="cpsskins_form_validation.html"
permission="zope.Public"
template="cpsskins_form_validation.pt"
@@ -15,14 +15,14 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="sampleform.html"
permission="zope.Public"
template="sampleform.pt"
/>
<browser:pages
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/configure.zcml
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/configure.zcml
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/configure.zcml
Mon Feb 27 14:34:26 2006
@@ -3,7 +3,7 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="cpsskins_latency.html"
permission="zope.Public"
template="cpsskins_latency.pt"
@@ -11,14 +11,14 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="cpsskins_typewriter.html"
permission="zope.Public"
template="cpsskins_typewriter.pt"
/>
<browser:pages
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/configure.zcml
Mon Feb 27 14:34:26 2006
@@ -3,27 +3,27 @@
<browser:resource
name="container.png" file="images/container.png"
- layer="cpsskins-test" />
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest" />
<browser:resource
name="container-open.png" file="images/container-open.png"
- layer="cpsskins-test" />
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest" />
<browser:resource
name="node-link-branch.png" file="images/node-link-branch.png"
- layer="cpsskins-test" />
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest" />
<browser:resource
name="node-link-last.png" file="images/node-link-last.png"
- layer="cpsskins-test" />
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest" />
<browser:resource
name="folder.png" file="images/folder.png"
- layer="cpsskins-test" />
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest" />
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="cpsskins_treeview.html"
permission="zope.Public"
template="cpsskins_treeview.pt"
@@ -31,14 +31,14 @@
<browser:page
for="*"
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
name="treeview_widget.html"
permission="zope.Public"
template="treeview_widget.pt"
/>
<browser:pages
- layer="cpsskins-test"
+ layer="cpsskins.ui.framework.tests.zope3.cpsskinsTest"
for="*"
class=".browser.Views"
permission="zope.Public">
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/treeview_widget.pt
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/treeview_widget.pt
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/treeview_widget.pt
Mon Feb 27 14:34:26 2006
@@ -7,25 +7,25 @@
javascript:'margin-left:'+(item['depth']-1)*15+'px'"></span>
<img class="close" ctal:attributes="nodeid item/id"
- src="/++skin++cpsskins-test/@@/++resource++container-open.png"
+ src="/++skin++cpsskinsTest/@@/++resource++container-open.png"
ctal:condition="javascript:state[item['id']] == 'open' && !item['empty']
&& item['type'] == 'inner'" />
<img class="open" ctal:attributes="nodeid item/id"
- src="/++skin++cpsskins-test/@@/++resource++container.png"
+ src="/++skin++cpsskinsTest/@@/++resource++container.png"
ctal:condition="javascript:state[item['id']] != 'open' && !item['empty']
&& item['type'] == 'inner'" />
- <img src="/++skin++cpsskins-test/@@/node-link-branch.png"
+ <img src="/++skin++cpsskinsTest/@@/node-link-branch.png"
ctal:condition="javascript:(item['type'] == 'leaf'
&& item['position'] != 'last')
|| item['empty']"/>
- <img src="/++skin++cpsskins-test/@@/node-link-last.png"
+ <img src="/++skin++cpsskinsTest/@@/node-link-last.png"
ctal:condition="javascript:item['type'] == 'leaf'
&& item['position'] == 'last'"/>
- <img src="/++skin++cpsskins-test/@@/folder.png" />
+ <img src="/++skin++cpsskinsTest/@@/folder.png" />
<span ctal:content="item/title">ITEM</span>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
