Author: jmorliaguet
Date: Sun Oct 30 10:18:33 2005
New Revision: 28813
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/filters/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/filters/configure.zcml
Log:
- simplifications
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/filters/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/filters/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/filters/configure.zcml
Sun Oct 30 10:18:33 2005
@@ -2,13 +2,11 @@
xmlns="http://namespaces.zope.org/cpsskins";>
<filter
- for="cpsskins.elements.interfaces.ISlot"
name="slot editor (content author)"
template="slot.pt"
/>
<filter
- for="cpsskins.elements.interfaces.IPortlet"
name="portlet editor (content author)"
template="portlet.pt"
/>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py
Sun Oct 30 10:18:33 2005
@@ -19,10 +19,8 @@
import re
-from zope.component import adapts
from zope.interface import implements
-from cpsskins.elements.displays.interfaces import IDisplay
from cpsskins.browser.rendering.interfaces import IFilter
class HTMLCleaner(object):
@@ -50,12 +48,10 @@
'<div>Some text\\n\\n <p>Some other text</p> </div>'
"""
-
- adapts(IDisplay)
implements(IFilter)
- def __init__(self, context):
- self.context = context
+ def __init__(self):
+ pass
def __call__(self, markup, info):
"""Apply the filter"""
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/configure.zcml
Sun Oct 30 10:18:33 2005
@@ -7,7 +7,6 @@
<cpsskins:filter
name="htmlcleaner"
- for="cpsskins.elements.displays.interfaces.IDisplay"
factory=".HTMLCleaner"
/>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py
Sun Oct 30 10:18:33 2005
@@ -45,8 +45,7 @@
... self.identifier = '12345'
>>> from zope.app.testing import ztapi
- >>> from cpsskins.elements.formats.style import CSSRenderer
- >>> from cpsskins.elements.formats.interfaces import IStyle, ICSSRenderer
+ >>> from cpsskins.elements.formats.style import IStyle
>>> ztapi.provideAdapter(IStyle, ICSSRenderer, CSSRenderer)
>>> s = FakeStyle()
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py
Sun Oct 30 10:18:33 2005
@@ -18,13 +18,10 @@
__docformat__ = "reStructuredText"
from zope.app.traversing.api import getParent
-from zope.component import adapts
from zope.interface import implements
-from zope.publisher.interfaces import IRequest
from cpsskins.browser.rendering.interfaces import IFilter
from cpsskins.elements.interfaces import ISlot
-from cpsskins.elements.interfaces import IDisplay
OPEN = 0
CLOSED = 1
@@ -32,15 +29,12 @@
class BoxControls(object):
"""Adds a JSR-168 like portlet box controls to objects.
"""
-
- adapts(IDisplay, IRequest)
implements(IFilter)
- def __init__(self, context, request):
- self.context = context
- self.request = request
+ def __init__(self):
+ pass
- def __call__(self, data='', info=None, **kw):
+ def __call__(self, markup, info):
"""Apply the filter"""
element = info.element
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/configure.zcml
Sun Oct 30 10:18:33 2005
@@ -2,11 +2,10 @@
xmlns="http://namespaces.zope.org/cpsskins";
xmlns:browser="http://namespaces.zope.org/browser";>
- <!-- JSR-168 filter: adds JSR168-like portlet box decorations -->ยท
+ <!-- JSR-168 filter: adds JSR168-like portlet box decorations -->
<filter
name="jsr168 controls"
- for="cpsskins.elements.displays.interfaces.IDisplay"
factory=".BoxControls"
/>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/configure.zcml
Sun Oct 30 10:18:33 2005
@@ -2,37 +2,31 @@
xmlns="http://namespaces.zope.org/cpsskins";>
<filter
- for="cpsskins.elements.interfaces.ITheme"
name="theme editor (layout designer)"
template="theme.pt"
/>
<filter
- for="cpsskins.elements.interfaces.IThemePage"
name="themepage editor (layout designer)"
template="themepage.pt"
/>
<filter
- for="cpsskins.elements.interfaces.IPageBlock"
name="pageblock editor (layout designer)"
template="pageblock.pt"
/>
<filter
- for="cpsskins.elements.interfaces.ICell"
name="cell editor (layout designer)"
template="cell.pt"
/>
<filter
- for="cpsskins.elements.interfaces.ISlot"
name="slot editor (layout designer)"
template="slot.pt"
/>
<filter
- for="cpsskins.elements.interfaces.IPortlet"
name="portlet editor (layout designer)"
template="portlet.pt"
/>
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/filters/configure.zcml
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/filters/configure.zcml
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/filters/configure.zcml
Sun Oct 30 10:18:33 2005
@@ -2,37 +2,31 @@
xmlns="http://namespaces.zope.org/cpsskins";>
<filter
- for="cpsskins.elements.interfaces.ITheme"
name="theme editor (page designer)"
template="theme.pt"
/>
<filter
- for="cpsskins.elements.interfaces.IThemePage"
name="themepage editor (page designer)"
template="themepage.pt"
/>
<filter
- for="cpsskins.elements.interfaces.IPageBlock"
name="pageblock editor (page designer)"
template="pageblock.pt"
/>
<filter
- for="cpsskins.elements.interfaces.ICell"
name="cell editor (page designer)"
template="cell.pt"
/>
<filter
- for="cpsskins.elements.interfaces.ISlot"
name="slot editor (page designer)"
template="slot.pt"
/>
<filter
- for="cpsskins.elements.interfaces.IPortlet"
name="portlet editor (page designer)"
template="portlet.pt"
/>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
