make skin definitionsconforming to Zope 3.3, i.e. get rid of some deprecation messages
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1592 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
parent
947bdf851f
commit
b4dd7ccddd
4 changed files with 49 additions and 20 deletions
|
@ -3,7 +3,14 @@ $Id$
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from zope.publisher.interfaces.browser import IBrowserRequest
|
from zope.publisher.interfaces.browser import IBrowserRequest
|
||||||
|
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
|
||||||
|
from zope.app.rotterdam import Rotterdam
|
||||||
|
|
||||||
|
|
||||||
class liquid(IBrowserRequest):
|
class liquid(IBrowserRequest):
|
||||||
"""The `liquid` layer."""
|
"""The `liquid` layer."""
|
||||||
|
|
||||||
|
|
||||||
|
class Liquid(liquid, Rotterdam):
|
||||||
|
""" The Liquid skin """
|
||||||
|
|
||||||
|
|
|
@ -6,32 +6,42 @@
|
||||||
i18n_domain="zope"
|
i18n_domain="zope"
|
||||||
>
|
>
|
||||||
|
|
||||||
<layer name="liquid"
|
<!--<layer name="liquid"
|
||||||
interface="cybertools.browser.liquid.liquid" />
|
interface="cybertools.browser.liquid.liquid" />
|
||||||
|
|
||||||
<skin name="Liquid"
|
<skin name="Liquid"
|
||||||
layers="liquid rotterdam default" />
|
layers="liquid rotterdam default" />-->
|
||||||
|
|
||||||
|
<zope:interface
|
||||||
|
interface="cybertools.browser.liquid.Liquid"
|
||||||
|
type="zope.publisher.interfaces.browser.IBrowserSkinType"
|
||||||
|
name="Liquid"
|
||||||
|
/>
|
||||||
|
|
||||||
<page for="*"
|
<page for="*"
|
||||||
name="skin_macros" template="view_macros.pt"
|
name="skin_macros" template="view_macros.pt"
|
||||||
permission="zope.View"
|
permission="zope.View"
|
||||||
layer="liquid" />
|
layer="cybertools.browser.liquid.liquid" />
|
||||||
|
|
||||||
<page for="*"
|
<page for="*"
|
||||||
name="base_macros" template="view_macros.pt"
|
name="base_macros" template="view_macros.pt"
|
||||||
permission="zope.View"
|
permission="zope.View"
|
||||||
layer="liquid" />
|
layer="cybertools.browser.liquid.liquid" />
|
||||||
|
|
||||||
<page name="controller"
|
<page name="controller"
|
||||||
for="zope.app.publisher.interfaces.browser.IBrowserView"
|
for="zope.app.publisher.interfaces.browser.IBrowserView"
|
||||||
class="cybertools.browser.liquid.controller.Controller"
|
class="cybertools.browser.liquid.controller.Controller"
|
||||||
permission="zope.Public"
|
permission="zope.Public"
|
||||||
layer="liquid"
|
layer="cybertools.browser.liquid.liquid"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<resource name="zope3_tablelayout.css" file="zope3_tablelayout.css" layer="liquid" />
|
<resource name="zope3_tablelayout.css" file="zope3_tablelayout.css"
|
||||||
<resource name="base.css" file="base.css" layer="liquid" />
|
layer="cybertools.browser.liquid.liquid" />
|
||||||
<resource name="print.css" file="print.css" layer="liquid" />
|
<resource name="base.css" file="base.css"
|
||||||
<resource name="custom.css" file="custom.css" layer="liquid" />
|
layer="cybertools.browser.liquid.liquid" />
|
||||||
|
<resource name="print.css" file="print.css"
|
||||||
|
layer="cybertools.browser.liquid.liquid" />
|
||||||
|
<resource name="custom.css" file="custom.css"
|
||||||
|
layer="cybertools.browser.liquid.liquid" />
|
||||||
|
|
||||||
</configure>
|
</configure>
|
||||||
|
|
|
@ -3,7 +3,9 @@ $Id$
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from zope.publisher.interfaces.browser import IBrowserRequest
|
from zope.publisher.interfaces.browser import IBrowserRequest
|
||||||
|
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
|
||||||
|
from zope.app.rotterdam import Rotterdam
|
||||||
|
|
||||||
class liquid(IBrowserRequest):
|
|
||||||
"""The `liquid` layer."""
|
|
||||||
|
|
||||||
|
class Loops(Rotterdam):
|
||||||
|
""" The Loops skin """
|
||||||
|
|
|
@ -6,16 +6,26 @@
|
||||||
i18n_domain="zope"
|
i18n_domain="zope"
|
||||||
>
|
>
|
||||||
|
|
||||||
<layer name="loops" />
|
<!--<layer name="loops" />
|
||||||
|
|
||||||
<skin name="Loops"
|
<skin name="Loops"
|
||||||
layers="loops rotterdam default" />
|
layers="loops rotterdam default" />-->
|
||||||
|
|
||||||
<resource name="zope3_tablelayout.css" file="loops_layout.css" layer="loops" />
|
<zope:interface
|
||||||
|
interface="cybertools.browser.loops.Loops"
|
||||||
|
type="zope.publisher.interfaces.browser.IBrowserSkinType"
|
||||||
|
name="Loops"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<resource name="zope3_tablelayout.css" file="loops_layout.css"
|
||||||
|
layer="cybertools.browser.loops.Loops" />
|
||||||
<resource name="site_management_tablelayout.css"
|
<resource name="site_management_tablelayout.css"
|
||||||
file="loops_management_layout.css" layer="loops" />
|
file="loops_management_layout.css"
|
||||||
<resource name="favicon.png" file="loops_favicon.png" layer="loops" />
|
layer="cybertools.browser.loops.Loops" />
|
||||||
<resource name="zope3logo.gif" file="loops_logo.png" layer="loops" />
|
<resource name="favicon.png" file="loops_favicon.png"
|
||||||
|
layer="cybertools.browser.loops.Loops" />
|
||||||
|
<resource name="zope3logo.gif" file="loops_logo.png"
|
||||||
|
layer="cybertools.browser.loops.Loops" />
|
||||||
|
|
||||||
<!-- control management menu -->
|
<!-- control management menu -->
|
||||||
|
|
||||||
|
@ -23,7 +33,7 @@
|
||||||
name="view_get_menu"
|
name="view_get_menu"
|
||||||
permission="zope.Public"
|
permission="zope.Public"
|
||||||
class=".menu.MenuAccessView"
|
class=".menu.MenuAccessView"
|
||||||
layer="loops"
|
layer="cybertools.browser.loops.Loops"
|
||||||
allowed_interface="zope.app.publisher.interfaces.browser.IMenuAccessView"
|
allowed_interface="zope.app.publisher.interfaces.browser.IMenuAccessView"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
@ -35,14 +45,14 @@
|
||||||
name="login_logout" for="*"
|
name="login_logout" for="*"
|
||||||
class=".auth.LoginLogout"
|
class=".auth.LoginLogout"
|
||||||
permission="zope.Public"
|
permission="zope.Public"
|
||||||
layer="loops"
|
layer="cybertools.browser.loops.Loops"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<page
|
<page
|
||||||
name="loginForm.html" for="*"
|
name="loginForm.html" for="*"
|
||||||
template="loginform.pt"
|
template="loginform.pt"
|
||||||
permission="zope.Public"
|
permission="zope.Public"
|
||||||
layer="loops"
|
layer="cybertools.browser.loops.Loops"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<zope:utility
|
<zope:utility
|
||||||
|
|
Loading…
Add table
Reference in a new issue