Author: jmorliaguet
Date: Sat Dec 17 13:18:02 2005
New Revision: 2042

Added:
   cpsskins/branches/jmo-perspectives/ui/
      - copied from r2041, cpsskins/branches/jmo-perspectives/engines/
Removed:
   cpsskins/branches/jmo-perspectives/engines/
Modified:
   cpsskins/branches/jmo-perspectives/browser/rendering/renderer.py
   cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
   cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
   cpsskins/branches/jmo-perspectives/configure.zcml
   cpsskins/branches/jmo-perspectives/doc/portlet-ordering.txt
   cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
   cpsskins/branches/jmo-perspectives/elements/display.py
   cpsskins/branches/jmo-perspectives/elements/format.py
   cpsskins/branches/jmo-perspectives/io/style.py
   cpsskins/branches/jmo-perspectives/io/style.zcml
   cpsskins/branches/jmo-perspectives/tests/test_display.py
   cpsskins/branches/jmo-perspectives/tests/test_filters.py
   cpsskins/branches/jmo-perspectives/tests/test_format.py
   cpsskins/branches/jmo-perspectives/thememanager.py
   cpsskins/branches/jmo-perspectives/ui/contentauthor/__init__.py
   cpsskins/branches/jmo-perspectives/ui/contentauthor/filters/__init__.py
   cpsskins/branches/jmo-perspectives/ui/default/README.txt
   cpsskins/branches/jmo-perspectives/ui/default/displays/storage.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/effect/configure.zcml
   cpsskins/branches/jmo-perspectives/ui/default/filters/effect/views.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/layout/configure.zcml
   cpsskins/branches/jmo-perspectives/ui/default/filters/layout/views.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/style/__init__.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/style/configure.zcml
   cpsskins/branches/jmo-perspectives/ui/default/filters/style/css.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/style/views.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/widget/__init__.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/widget/configure.zcml
   cpsskins/branches/jmo-perspectives/ui/default/filters/widget/views.py
   cpsskins/branches/jmo-perspectives/ui/default/filters/widget/widgets.py
   cpsskins/branches/jmo-perspectives/ui/layoutdesigner/__init__.py
   cpsskins/branches/jmo-perspectives/ui/pagedesigner/__init__.py
   cpsskins/branches/jmo-perspectives/ui/pagedesigner/filters/__init__.py
Log:

- rename cpsskins.engines as cpsskins.ui since the package
  contains more than just engines.



Modified: cpsskins/branches/jmo-perspectives/browser/rendering/renderer.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/rendering/renderer.py    
(original)
+++ cpsskins/branches/jmo-perspectives/browser/rendering/renderer.py    Sat Dec 
17 13:18:02 2005
@@ -53,11 +53,10 @@
 
         # set local context info variables
         info = tree_element['info']
-        engine = info.globals.engine
 
-        markup = ''
+        markup = u''
         if ILeaf.providedBy(element):
-            markup = element(info) or ''
+            markup = element(info) or u''
         else:
             rendered = []
             for node in tree_element['children']:
@@ -67,7 +66,7 @@
                     continue
                 renderer = getMultiAdapter((node, request), IRendererView)
                 rendered.append(renderer(tree))
-            markup = ''.join(rendered)
+            markup = u''.join(rendered)
 
         # apply all the filters in sequence
         for f in self._getFilters(info):

Modified: 
cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py  
(original)
+++ cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py  
Sat Dec 17 13:18:02 2005
@@ -29,10 +29,10 @@
 from zope.configuration.exceptions import ConfigurationError
 from zope.interface import Interface, alsoProvides
 
-from cpsskins import engines
+from cpsskins import ui
 from cpsskins.browser.rendering.interfaces import IUpdateData
 
-browser_path = os.path.dirname(engines.__file__)
+ui_path = os.path.dirname(ui.__file__)
 
 def portlet(_context, name=None, title=None, description=None, factory=None,
             schema=None, icon=None):
@@ -73,7 +73,7 @@
         schema = schema,
         name = 'edit.html',
         title = 'Edit',
-        template = browser_path + '/editing/portlet_editor.pt',
+        template = ui_path + '/editing/portlet_editor.pt',
         permission="zope.ManageContent",
         menu=zmi_views,
         )()

Modified: 
cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py   
(original)
+++ cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py   
Sat Dec 17 13:18:02 2005
@@ -24,8 +24,8 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 
 from cpsskins import configuration
-from cpsskins.engines.default.filters.widget.interfaces import IWidgetView
-from cpsskins.engines.default.formats.widget import IWidget
+from cpsskins.ui.default.filters.widget.interfaces import IWidgetView
+from cpsskins.ui.default.formats.widget import IWidget
 
 _ = MessageFactory("cpsskins")
 

Modified: cpsskins/branches/jmo-perspectives/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/configure.zcml   (original)
+++ cpsskins/branches/jmo-perspectives/configure.zcml   Sat Dec 17 13:18:02 2005
@@ -88,7 +88,7 @@
 
   <include package=".relations" />
 
-  <include package=".engines" />
+  <include package=".ui" />
 
   <include package=".configuration" />
 

Modified: cpsskins/branches/jmo-perspectives/doc/portlet-ordering.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/doc/portlet-ordering.txt (original)
+++ cpsskins/branches/jmo-perspectives/doc/portlet-ordering.txt Sat Dec 17 
13:18:02 2005
@@ -24,7 +24,7 @@
 The slots A and B have their own display
 
     >>> from cpsskins.elements.interfaces import IDisplayable
-    >>> from cpsskins.engines.default.displays.boxgroup import BoxGroup
+    >>> from cpsskins.ui.default.displays.boxgroup import BoxGroup
 
     >>> display_slot_A = IDisplayable(slot_A).getDisplay()
     >>> display_slot_B = IDisplayable(slot_B).getDisplay()

Modified: cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt        
(original)
+++ cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt        Sat Dec 
17 13:18:02 2005
@@ -61,14 +61,14 @@
    it corresponds to the 'view' in the MVC paradigm.
 
     >>> from zope.interface.verify import verifyClass
-    >>> from cpsskins.engines.default.displays.box import Box
-    >>> from cpsskins.engines.default.displays.interfaces import IDisplay
+    >>> from cpsskins.ui.default.displays.box import Box
+    >>> from cpsskins.ui.default.displays.interfaces import IDisplay
     >>> verifyClass(IDisplay, Box)
     True
 
     the box is then formatted with a widget.
 
-    >>> from cpsskins.engines.default.formats.widget import Widget
+    >>> from cpsskins.ui.default.formats.widget import Widget
     >>> from cpsskins.elements.interfaces import IFormat
     >>> verifyClass(IFormat, Widget)
     True
@@ -83,8 +83,8 @@
 
 the widget filter adapts the widget providing a view:
 
-    >>> from cpsskins.engines.default.filters.widget import WidgetFilter
-    >>> from cpsskins.engines.default.formats.widget import IWidget
+    >>> from cpsskins.ui.default.filters.widget import WidgetFilter
+    >>> from cpsskins.ui.default.formats.widget import IWidget
     >>> from cpsskins.browser.rendering.interfaces import IFilterView
 
     >>> ztapi.provideAdapter(IWidget, IFilterView, WidgetFilter)

Modified: cpsskins/branches/jmo-perspectives/elements/display.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/display.py      (original)
+++ cpsskins/branches/jmo-perspectives/elements/display.py      Sat Dec 17 
13:18:02 2005
@@ -32,7 +32,7 @@
 from cpsskins.relations import DyadicRelation, TriadicRelation
 from cpsskins.relations.interfaces import IRelationTool
 from cpsskins.ontology import hasDisplay, hasDisplayFromPerspective
-from cpsskins.engines.default.displays.storage import IDisplayStorage
+from cpsskins.ui.default.displays.storage import IDisplayStorage
 
 class Display(Element):
 

Modified: cpsskins/branches/jmo-perspectives/elements/format.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/format.py       (original)
+++ cpsskins/branches/jmo-perspectives/elements/format.py       Sat Dec 17 
13:18:02 2005
@@ -25,7 +25,7 @@
 
 from cpsskins.elements import Element
 from cpsskins.elements.interfaces import IType, IFormat, IFormattable
-from cpsskins.engines.default.formats.storage import IFormatStorage
+from cpsskins.ui.default.formats.storage import IFormatStorage
 from cpsskins.ontology import hasFormat, IFormatPredicate
 from cpsskins.relations import DyadicRelation
 from cpsskins.relations.interfaces import IRelationTool

Modified: cpsskins/branches/jmo-perspectives/io/style.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/style.py      (original)
+++ cpsskins/branches/jmo-perspectives/io/style.py      Sat Dec 17 13:18:02 2005
@@ -24,7 +24,7 @@
 from zope.component import adapts
 from zope.interface import implements
 
-from cpsskins.engines.default.formats.style import IStyle
+from cpsskins.ui.default.formats.style import IStyle
 from cpsskins.io.interfaces import IDataExporter, IDataImporter
 
 class Exporter(object):

Modified: cpsskins/branches/jmo-perspectives/io/style.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/style.zcml    (original)
+++ cpsskins/branches/jmo-perspectives/io/style.zcml    Sat Dec 17 13:18:02 2005
@@ -5,7 +5,7 @@
   <!-- XML export -->
   <browser:view
       provides="cpsskins.io.interfaces.IDataExporter"
-      for="cpsskins.engines.default.formats.style.IStyle"
+      for="cpsskins.ui.default.formats.style.IStyle"
       class=".style.Exporter"
       permission="zope.ManageContent"
   />

Modified: cpsskins/branches/jmo-perspectives/tests/test_display.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_display.py    (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_display.py    Sat Dec 17 
13:18:02 2005
@@ -22,9 +22,9 @@
 from zope.testing.doctestunit import DocTestSuite
 
 
-from cpsskins.engines.default.displays.area import Area
-from cpsskins.engines.default.displays.box import Box
-from cpsskins.engines.default.displays.boxgroup import BoxGroup
+from cpsskins.ui.default.displays.area import Area
+from cpsskins.ui.default.displays.box import Box
+from cpsskins.ui.default.displays.boxgroup import BoxGroup
 
 from cpsskins.tests.setup import setUp
 
@@ -46,9 +46,9 @@
         unittest.makeSuite(TestBox),
         unittest.makeSuite(TestBoxGroup),
         DocTestSuite('cpsskins.elements.display', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.displays.area', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.displays.box', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.displays.boxgroup', 
setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.displays.area', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.displays.box', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.displays.boxgroup', setUp=setUp),
         ))
 
 if __name__ == '__main__':

Modified: cpsskins/branches/jmo-perspectives/tests/test_filters.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_filters.py    (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_filters.py    Sat Dec 17 
13:18:02 2005
@@ -25,13 +25,13 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('cpsskins.engines.default.filters.widget', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.filters.layout', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.filters.effect', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.filters.style', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.filters.htmlcleaner',
+        DocTestSuite('cpsskins.ui.default.filters.widget', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.filters.layout', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.filters.effect', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.filters.style', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.filters.htmlcleaner',
                      setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.filters.accesskeys',
+        DocTestSuite('cpsskins.ui.default.filters.accesskeys',
                      setUp=setUp),
         ))
 

Modified: cpsskins/branches/jmo-perspectives/tests/test_format.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_format.py     (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_format.py     Sat Dec 17 
13:18:02 2005
@@ -21,9 +21,9 @@
 
 from zope.testing.doctestunit import DocTestSuite
 
-from cpsskins.engines.default.formats.layout import Layout
-from cpsskins.engines.default.formats.style import Style
-from cpsskins.engines.default.formats.widget import Widget
+from cpsskins.ui.default.formats.layout import Layout
+from cpsskins.ui.default.formats.style import Style
+from cpsskins.ui.default.formats.widget import Widget
 from cpsskins.tests.setup import setUp
 
 class TestLayout:
@@ -44,9 +44,9 @@
         unittest.makeSuite(TestStyle),
         unittest.makeSuite(TestWidget),
         DocTestSuite('cpsskins.elements.format', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.formats.layout', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.formats.style', setUp=setUp),
-        DocTestSuite('cpsskins.engines.default.formats.widget', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.formats.layout', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.formats.style', setUp=setUp),
+        DocTestSuite('cpsskins.ui.default.formats.widget', setUp=setUp),
         ))
 
 if __name__ == '__main__':

Modified: cpsskins/branches/jmo-perspectives/thememanager.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/thememanager.py  (original)
+++ cpsskins/branches/jmo-perspectives/thememanager.py  Sat Dec 17 13:18:02 2005
@@ -32,10 +32,10 @@
 from cpsskins.caching import ImageCache
 from cpsskins.elements.interfaces import ITheme, IThemeContainer
 from cpsskins.elements.interfaces import IFormattable
-from cpsskins.engines.default.displays.interfaces import IDisplayStorage
-from cpsskins.engines.default.displays.storage import DisplayStorage
-from cpsskins.engines.default.formats.storage import IFormatStorage
-from cpsskins.engines.default.formats.storage import FormatStorage
+from cpsskins.ui.default.displays.interfaces import IDisplayStorage
+from cpsskins.ui.default.displays.storage import DisplayStorage
+from cpsskins.ui.default.formats.storage import IFormatStorage
+from cpsskins.ui.default.formats.storage import FormatStorage
 from cpsskins.interfaces import IThemeManagement, IImageCache
 from cpsskins.ontology import isDefault, hasFormat, hasDisplay
 from cpsskins.perspectives import Perspective

Modified: cpsskins/branches/jmo-perspectives/ui/contentauthor/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/contentauthor/__init__.py        
(original)
+++ cpsskins/branches/jmo-perspectives/ui/contentauthor/__init__.py     Sat Dec 
17 13:18:02 2005
@@ -17,8 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.engines.interfaces import IEngineType
-from cpsskins.engines.authoring.authoring import Authoring
+from cpsskins.ui.interfaces import IEngineType
+from cpsskins.ui.authoring.authoring import Authoring
 
 class IContentAuthoring(IEngineType):
     """A rendering engine for content authoring"""

Modified: 
cpsskins/branches/jmo-perspectives/ui/contentauthor/filters/__init__.py
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/contentauthor/filters/__init__.py    
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/contentauthor/filters/__init__.py     
Sat Dec 17 13:18:02 2005
@@ -17,8 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.engines.interfaces import IEngineType
-from cpsskins.engines.authoring.authoring import Authoring
+from cpsskins.ui.interfaces import IEngineType
+from cpsskins.ui.authoring.authoring import Authoring
 
 class IPageAuthoring(IEngineType):
     """A rendering engine for page authoring"""

Modified: cpsskins/branches/jmo-perspectives/ui/default/README.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/README.txt       
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/README.txt    Sat Dec 17 
13:18:02 2005
@@ -1,5 +1,5 @@
 
-$Id:$
+$Id$
 
 This directory contains the default resources, filters, formats, engine
 definitions. They are considered as mandatory parts of the application.

Modified: cpsskins/branches/jmo-perspectives/ui/default/displays/storage.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/displays/storage.py      
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/displays/storage.py   Sat Dec 
17 13:18:02 2005
@@ -19,7 +19,7 @@
 
 from zope.interface import implements
 
-from cpsskins.engines.default.displays.interfaces import IDisplayStorage
+from cpsskins.ui.default.displays.interfaces import IDisplayStorage
 from cpsskins.storage import Storage
 
 class DisplayStorage(Storage):

Modified: 
cpsskins/branches/jmo-perspectives/ui/default/filters/effect/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/effect/configure.zcml
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/effect/configure.zcml 
Sat Dec 17 13:18:02 2005
@@ -5,7 +5,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.engines.default.formats.effect.IEffect"
+      for="cpsskins.ui.default.formats.effect.IEffect"
       class=".views.EffectEditor"
       template="effect_editor.pt"
       permission="zope.ManageContent"
@@ -15,8 +15,8 @@
 
   <cpsskins:filter
       name="effect"
-      predicate="cpsskins.engines.default.formats.effect.hasEffect"
-      for="cpsskins.engines.default.formats.effect.IEffect"
+      predicate="cpsskins.ui.default.formats.effect.hasEffect"
+      for="cpsskins.ui.default.formats.effect.IEffect"
       factory=".EffectFilter"
   />
 

Modified: cpsskins/branches/jmo-perspectives/ui/default/filters/effect/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/filters/effect/views.py  
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/effect/views.py       
Sat Dec 17 13:18:02 2005
@@ -19,7 +19,7 @@
 
 from zope.app.form.browser.editview import EditView
 
-from cpsskins.engines.default.formats.effect import IEffect
+from cpsskins.ui.default.formats.effect import IEffect
 
 class EffectEditor(EditView):
     """Effect editor view"""

Modified: 
cpsskins/branches/jmo-perspectives/ui/default/filters/layout/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/layout/configure.zcml
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/layout/configure.zcml 
Sat Dec 17 13:18:02 2005
@@ -5,7 +5,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.engines.default.formats.layout.ILayout"
+      for="cpsskins.ui.default.formats.layout.ILayout"
       class=".views.LayoutEditor"
       template="layout_editor.pt"
       permission="zope.ManageContent"
@@ -16,8 +16,8 @@
 
   <cpsskins:filter
       name="layout"
-      predicate="cpsskins.engines.default.formats.layout.hasLayout"
-      for="cpsskins.engines.default.formats.layout.ILayout"
+      predicate="cpsskins.ui.default.formats.layout.hasLayout"
+      for="cpsskins.ui.default.formats.layout.ILayout"
       factory=".LayoutFilter"
   />
 

Modified: cpsskins/branches/jmo-perspectives/ui/default/filters/layout/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/filters/layout/views.py  
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/layout/views.py       
Sat Dec 17 13:18:02 2005
@@ -19,7 +19,7 @@
 
 from zope.app.form.browser.editview import EditView
 
-from cpsskins.engines.default.formats.layout import ILayout
+from cpsskins.ui.default.formats.layout import ILayout
 
 class LayoutEditor(EditView):
     """Layout editor view"""

Modified: 
cpsskins/branches/jmo-perspectives/ui/default/filters/style/__init__.py
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py    
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/style/__init__.py     
Sat Dec 17 13:18:02 2005
@@ -22,7 +22,7 @@
 from zope.interface import implements, Interface
 from zope.component import adapts
 
-from cpsskins.engines.default.formats.style import IStyle
+from cpsskins.ui.default.formats.style import IStyle
 from cpsskins.browser.rendering.interfaces import IFilterView
 from cpsskins.elements.interfaces import IIdentifiable
 
@@ -41,7 +41,7 @@
     >>> from zope.app.testing import ztapi
     >>> ztapi.provideAdapter(IStyle, ICSSRenderer, CSSRenderer)
 
-    >>> from cpsskins.engines.default.formats.style import Style
+    >>> from cpsskins.ui.default.formats.style import Style
 
     >>> s = Style()
     >>> s.identifier = 12345
@@ -100,7 +100,7 @@
 class CSSRenderer(object):
     """Render a style in CSS
 
-    >>> from cpsskins.engines.default.formats.style import Style
+    >>> from cpsskins.ui.default.formats.style import Style
 
     >>> s = Style()
     >>> s.identifier = 12345

Modified: 
cpsskins/branches/jmo-perspectives/ui/default/filters/style/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/style/configure.zcml 
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/style/configure.zcml  
Sat Dec 17 13:18:02 2005
@@ -8,8 +8,8 @@
 
   <cpsskins:filter
       name="style"
-      predicate="cpsskins.engines.default.formats.style.hasStyle"
-      for="cpsskins.engines.default.formats.style.IStyle"
+      predicate="cpsskins.ui.default.formats.style.hasStyle"
+      for="cpsskins.ui.default.formats.style.IStyle"
       factory=".StyleFilter"
   />
 
@@ -17,7 +17,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.engines.default.formats.style.IStyle"
+      for="cpsskins.ui.default.formats.style.IStyle"
       class=".views.StyleEditor"
       template="style_editor.pt"
       permission="zope.ManageContent"
@@ -33,14 +33,14 @@
 
   <jsonrpc:view
       class=".jsonrpc.Methods"
-      for="cpsskins.engines.default.formats.style.IStyle"
+      for="cpsskins.ui.default.formats.style.IStyle"
       permission="zope.Public"
       methods="getWidgetStyle getSelectorStyle getFieldRange renderPreview"
   />
 
   <jsonrpc:view
       class=".jsonrpc.Methods"
-      for="cpsskins.engines.default.formats.style.IStyle"
+      for="cpsskins.ui.default.formats.style.IStyle"
       permission="zope.ManageContent"
       methods="setSelectorStyle delSelectorStyle"
   />
@@ -50,7 +50,7 @@
   <adapter
       factory=".CSSRenderer"
       provides=".ICSSRenderer"
-      for="cpsskins.engines.default.formats.style.IStyle"
+      for="cpsskins.ui.default.formats.style.IStyle"
   />
 
   <browser:pages

Modified: cpsskins/branches/jmo-perspectives/ui/default/filters/style/css.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/filters/style/css.py     
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/style/css.py  Sat Dec 
17 13:18:02 2005
@@ -21,9 +21,9 @@
 from zope.interface import implements, Interface
 from zope.component import getUtility, getUtilitiesFor
 
-from cpsskins.engines.default.formats.storage import IFormatStorage
-from cpsskins.engines.default.formats.style import IStyle
-from cpsskins.engines.default.filters.style import ICSSRenderer
+from cpsskins.ui.default.formats.storage import IFormatStorage
+from cpsskins.ui.default.formats.style import IStyle
+from cpsskins.ui.default.filters.style import ICSSRenderer
 from cpsskins.setup.interfaces import ISetting, IResource
 
 class IStylesheetView(Interface):

Modified: cpsskins/branches/jmo-perspectives/ui/default/filters/style/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/filters/style/views.py   
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/style/views.py        
Sat Dec 17 13:18:02 2005
@@ -19,7 +19,7 @@
 
 from zope.app.form.browser.editview import EditView
 
-from cpsskins.engines.default.formats.style import IStyle
+from cpsskins.ui.default.formats.style import IStyle
 
 class StyleEditor(EditView):
     """Style editor view"""

Modified: 
cpsskins/branches/jmo-perspectives/ui/default/filters/widget/__init__.py
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py   
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/widget/__init__.py    
Sat Dec 17 13:18:02 2005
@@ -26,8 +26,8 @@
 from zope.i18nmessageid import MessageFactory
 
 from cpsskins.browser.rendering.interfaces import IFilterView
-from cpsskins.engines.default.formats.widget import IWidget
-from cpsskins.engines.default.filters.widget.interfaces import (
+from cpsskins.ui.default.formats.widget import IWidget
+from cpsskins.ui.default.filters.widget.interfaces import (
                                                  IBasicWidgetView, IWidgetView)
 
 logger = logging.getLogger("cpsskins")

Modified: 
cpsskins/branches/jmo-perspectives/ui/default/filters/widget/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/widget/configure.zcml
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/widget/configure.zcml 
Sat Dec 17 13:18:02 2005
@@ -5,7 +5,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.engines.default.formats.widget.IWidget"
+      for="cpsskins.ui.default.formats.widget.IWidget"
       class=".views.WidgetEditor"
       template="widget_editor.pt"
       permission="zope.ManageContent"
@@ -15,8 +15,8 @@
 
   <cpsskins:filter
       name="widget"
-      predicate="cpsskins.engines.default.formats.widget.hasWidget"
-      for="cpsskins.engines.default.formats.widget.IWidget"
+      predicate="cpsskins.ui.default.formats.widget.hasWidget"
+      for="cpsskins.ui.default.formats.widget.IWidget"
       factory=".WidgetFilter"
       stylesheet="widgets.css"
   />

Modified: cpsskins/branches/jmo-perspectives/ui/default/filters/widget/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/filters/widget/views.py  
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/widget/views.py       
Sat Dec 17 13:18:02 2005
@@ -19,7 +19,7 @@
 
 from zope.app.form.browser.editview import EditView
 
-from cpsskins.engines.default.formats.widget import IWidget
+from cpsskins.ui.default.formats.widget import IWidget
 
 class WidgetEditor(EditView):
     """Widget editor view"""

Modified: 
cpsskins/branches/jmo-perspectives/ui/default/filters/widget/widgets.py
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/engines/default/filters/widget/widgets.py    
    (original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/widget/widgets.py     
Sat Dec 17 13:18:02 2005
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.engines.default.filters.widget import WidgetView
+from cpsskins.ui.default.filters.widget import WidgetView
 
 # Base classes divided into categories.
 

Modified: cpsskins/branches/jmo-perspectives/ui/layoutdesigner/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/layoutdesigner/__init__.py       
(original)
+++ cpsskins/branches/jmo-perspectives/ui/layoutdesigner/__init__.py    Sat Dec 
17 13:18:02 2005
@@ -17,8 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.engines.interfaces import IEngineType
-from cpsskins.engines.authoring.authoring import Authoring
+from cpsskins.ui.interfaces import IEngineType
+from cpsskins.ui.authoring.authoring import Authoring
 
 class IPageAuthoring(IEngineType):
     """A rendering engine for page authoring"""

Modified: cpsskins/branches/jmo-perspectives/ui/pagedesigner/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/pagedesigner/__init__.py 
(original)
+++ cpsskins/branches/jmo-perspectives/ui/pagedesigner/__init__.py      Sat Dec 
17 13:18:02 2005
@@ -17,8 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.engines.interfaces import IEngineType
-from cpsskins.engines.authoring.authoring import Authoring
+from cpsskins.ui.interfaces import IEngineType
+from cpsskins.ui.authoring.authoring import Authoring
 
 class IPageAuthoring(IEngineType):
     """A rendering engine for page authoring"""

Modified: cpsskins/branches/jmo-perspectives/ui/pagedesigner/filters/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/pagedesigner/filters/__init__.py 
(original)
+++ cpsskins/branches/jmo-perspectives/ui/pagedesigner/filters/__init__.py      
Sat Dec 17 13:18:02 2005
@@ -17,8 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.engines.interfaces import IEngineType
-from cpsskins.engines.authoring.authoring import Authoring
+from cpsskins.ui.interfaces import IEngineType
+from cpsskins.ui.authoring.authoring import Authoring
 
 class IPageAuthoring(IEngineType):
     """A rendering engine for page authoring"""
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to