Author: jmorliaguet
Date: Wed Oct 12 23:33:03 2005
New Revision: 28223

Added:
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/__init__.py 
  (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/configure.zcml
      - copied, changed from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/__init__.py
   (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/configure.zcml
   (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/effect.py
      - copied, changed from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/htmlcleaner.py
      - copied, changed from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/htmlcleaner.py
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/interfaces.py
      - copied unchanged from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/interfaces.py
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/layout.py
      - copied, changed from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/style.py
      - copied, changed from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/style.py
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/widget.py
      - copied, changed from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/widgets.css
      - copied unchanged from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widgets.css
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/widgets.zcml
      - copied unchanged from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widgets.zcml
Removed:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py
   
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/htmlcleaner.py
   
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/style.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
   
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widgets.css
   
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widgets.zcml
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/configure.zcml
Log:

- moved filters to settings.engines



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/configure.zcml   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/configure.zcml   
Wed Oct 12 23:33:03 2005
@@ -20,6 +20,4 @@
   </pages>
 
 
-  <include package=".filters" />
-
 </configure>

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py 
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py 
    Wed Oct 12 23:33:03 2005
@@ -23,8 +23,8 @@
 from zope.i18nmessageid import MessageFactory
 from zope.publisher.interfaces.browser import IBrowserRequest
 
-from cpsskins.browser.renderers.filters.interfaces import IWidgetView
-from cpsskins.browser.renderers.filters.interfaces import IBasicWidgetView
+from cpsskins.settings.engines.common.filters.interfaces import IWidgetView
+from cpsskins.settings.engines.common.filters.interfaces import 
IBasicWidgetView
 from cpsskins.configuration.interfaces import IRegistry
 
 _ = MessageFactory("cpsskins")

Added: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/__init__.py
==============================================================================
--- (empty file)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/__init__.py    
    Wed Oct 12 23:33:03 2005
@@ -0,0 +1,21 @@
+##############################################################################
+#
+# Copyright (c) 2005 Nuxeo 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.
+#
+##############################################################################
+"""
+
+$Id$
+"""
+__docformat__ = "reStructuredText"
+# make this directory a package
+
+pass

Copied: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/configure.zcml 
(from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/configure.zcml)
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/configure.zcml
   (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/configure.zcml 
    Wed Oct 12 23:33:03 2005
@@ -1,83 +1,6 @@
 <configure
-    xmlns="http://namespaces.zope.org/cpsskins";
-    xmlns:browser="http://namespaces.zope.org/browser";
-    xmlns:zope="http://namespaces.zope.org/zope";>
-
-
-  <!-- Widget filter: presents data by means of widgets -->
-
-  <filter
-      name="widget"
-      predicate="cpsskins.ontology.hasWidget"
-      for="cpsskins.elements.formats.interfaces.IWidget"
-      factory=".widget.WidgetFilter"
-      stylesheet="widgets.css"
-  />
-
-  <browser:page
-      for="*"
-      permission="zope.Public"
-      name="cpsskins_redirect"
-      class=".widget.WidgetView"
-      attribute="redirect"
-  />
-
-  <zope:vocabulary
-     name="WidgetsByType"
-     factory=".widget.WidgetsByTypeVocabulary"
-  />
-
-  <include file="widgets.zcml" />
-
-
-  <!-- HTML Cleaner filter: cleans the html code --> 
-
-  <filter
-      name="htmlcleaner"
-      for="cpsskins.elements.displays.interfaces.IDisplay"
-      factory=".htmlcleaner.HTMLCleaner"
-  />
-
-
-  <!-- Style filter: adds CSS classes to control the style of elements --> 
-
-  <filter
-      name="style"
-      predicate="cpsskins.ontology.hasStyle"
-      for="cpsskins.elements.formats.interfaces.IStyle"
-      factory=".style.StyleFilter"
-  />
-
-
-  <!-- Layout filter: adds inline CSS properties to control the layout of
-       an element --> 
-
-  <filter
-      name="layout"
-      predicate="cpsskins.ontology.hasLayout"
-      for="cpsskins.elements.formats.interfaces.ILayout"
-      factory=".layout.LayoutFilter"
-  />
-
-
-  <!-- Effect filter: transforms images --> 
-
-  <filter
-      name="effect"
-      predicate="cpsskins.ontology.hasEffect"
-      for="cpsskins.elements.formats.interfaces.IEffect"
-      factory=".effect.EffectFilter"
-  />
-
-  <zope:vocabulary
-     name="effects by type"
-     factory=".effect.EffectsByTypeVocabulary"
-  />
-
-  <zope:vocabulary
-     name="web image formats"
-     factory=".effect.WebImageFormatVocabulary"
-  />
+    xmlns="http://namespaces.zope.org/zope";>
 
+  <include package=".filters" />
 
 </configure>

Added: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/__init__.py
==============================================================================
--- (empty file)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/__init__.py
        Wed Oct 12 23:33:03 2005
@@ -0,0 +1 @@
+# make a package

Added: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/configure.zcml
==============================================================================
--- (empty file)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/configure.zcml
     Wed Oct 12 23:33:03 2005
@@ -0,0 +1,83 @@
+<configure
+    xmlns="http://namespaces.zope.org/cpsskins";
+    xmlns:browser="http://namespaces.zope.org/browser";
+    xmlns:zope="http://namespaces.zope.org/zope";>
+
+
+  <!-- Widget filter: presents data by means of widgets -->
+
+  <filter
+      name="widget"
+      predicate="cpsskins.ontology.hasWidget"
+      for="cpsskins.elements.formats.interfaces.IWidget"
+      factory=".widget.WidgetFilter"
+      stylesheet="widgets.css"
+  />
+
+  <browser:page
+      for="*"
+      permission="zope.Public"
+      name="cpsskins_redirect"
+      class=".widget.WidgetView"
+      attribute="redirect"
+  />
+
+  <zope:vocabulary
+     name="WidgetsByType"
+     factory=".widget.WidgetsByTypeVocabulary"
+  />
+
+  <include file="widgets.zcml" />
+
+
+  <!-- HTML Cleaner filter: cleans the html code --> 
+
+  <filter
+      name="htmlcleaner"
+      for="cpsskins.elements.displays.interfaces.IDisplay"
+      factory=".htmlcleaner.HTMLCleaner"
+  />
+
+
+  <!-- Style filter: adds CSS classes to control the style of elements --> 
+
+  <filter
+      name="style"
+      predicate="cpsskins.ontology.hasStyle"
+      for="cpsskins.elements.formats.interfaces.IStyle"
+      factory=".style.StyleFilter"
+  />
+
+
+  <!-- Layout filter: adds inline CSS properties to control the layout of
+       an element --> 
+
+  <filter
+      name="layout"
+      predicate="cpsskins.ontology.hasLayout"
+      for="cpsskins.elements.formats.interfaces.ILayout"
+      factory=".layout.LayoutFilter"
+  />
+
+
+  <!-- Effect filter: transforms images --> 
+
+  <filter
+      name="effect"
+      predicate="cpsskins.ontology.hasEffect"
+      for="cpsskins.elements.formats.interfaces.IEffect"
+      factory=".effect.EffectFilter"
+  />
+
+  <zope:vocabulary
+     name="effects by type"
+     factory=".effect.EffectsByTypeVocabulary"
+  />
+
+  <zope:vocabulary
+     name="web image formats"
+     factory=".effect.WebImageFormatVocabulary"
+  />
+
+
+</configure>

Copied: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/effect.py
 (from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py)
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py    
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/effect.py
  Wed Oct 12 23:33:03 2005
@@ -30,7 +30,7 @@
 
 from cpsskins.model.interfaces import IImage
 from cpsskins.elements.displays.interfaces import IDisplay
-from interfaces import IFilter
+from cpsskins.browser.renderers.filters.interfaces import IFilter
 from cpsskins.thememanager import getThemeManager
 
 INFO = logging.INFO

Copied: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/htmlcleaner.py
 (from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/htmlcleaner.py)
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/htmlcleaner.py
   (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/htmlcleaner.py
     Wed Oct 12 23:33:03 2005
@@ -24,7 +24,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.displays.interfaces import IDisplay
-from interfaces import IFilter
+from cpsskins.browser.renderers.filters.interfaces import IFilter
 
 class HTMLCleaner(object):
     """Cleans and optimizes the html code.

Copied: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/layout.py
 (from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py)
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py    
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/layout.py
  Wed Oct 12 23:33:03 2005
@@ -25,7 +25,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from cpsskins.elements.formats.interfaces import IFormat
-from interfaces import IFilter
+from cpsskins.browser.renderers.filters.interfaces import IFilter
 
 startTag = re.compile('<.*?>')
 styleAttr = re.compile(' style="(.*?)"')

Copied: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/style.py
 (from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/style.py)
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/style.py 
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/style.py
   Wed Oct 12 23:33:03 2005
@@ -24,7 +24,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.formats.interfaces import IStyle, ICSSRenderer
-from interfaces import IFilter
+from cpsskins.browser.renderers.filters.interfaces import IFilter
 
 startTag = re.compile('<.*?>')
 classAttr = re.compile(' class="(.*?)"')

Copied: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/widget.py
 (from r28221, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py)
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py    
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/common/filters/widget.py
  Wed Oct 12 23:33:03 2005
@@ -25,10 +25,11 @@
 from zope.publisher.interfaces import IRequest
 from zope.schema.vocabulary import SimpleVocabulary
 
+from cpsskins.browser.renderers.filters.interfaces import IFilter
 from cpsskins.configuration.interfaces import IRegistry
 from cpsskins.elements.formats.interfaces import IWidget
-from interfaces import IFilter, IBasicWidgetView, IWidgetView
 from cpsskins.model import DisplayData, HTML
+from interfaces import IBasicWidgetView, IWidgetView
 
 import logging
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/settings/engines/configure.zcml    
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/settings/engines/configure.zcml    
Wed Oct 12 23:33:03 2005
@@ -3,6 +3,8 @@
 
   <include package=".default" />
 
+  <include package=".common" />
+
   <include package=".jsr168" />
 
   <!-- Page, content authoring -->
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to