Author: jmorliaguet
Date: Mon Apr  3 22:16:00 2006
New Revision: 2774

Added:
   cpsskins/branches/jmo-perspectives/standard/
      - copied from r2772, cpsskins/branches/jmo-perspectives/ui/standard/
   cpsskins/branches/jmo-perspectives/standard/README.txt
      - copied unchanged from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/README.txt
   cpsskins/branches/jmo-perspectives/standard/__init__.py
      - copied unchanged from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/__init__.py
   cpsskins/branches/jmo-perspectives/standard/configure.zcml
      - copied unchanged from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/configure.zcml
   cpsskins/branches/jmo-perspectives/standard/displays/
      - copied from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/displays/
   cpsskins/branches/jmo-perspectives/standard/engine.zcml
      - copied unchanged from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/engine.zcml
   cpsskins/branches/jmo-perspectives/standard/filters/
      - copied from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/filters/
   cpsskins/branches/jmo-perspectives/standard/formats/
      - copied from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/formats/
   cpsskins/branches/jmo-perspectives/standard/interfaces.py
      - copied unchanged from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/interfaces.py
   cpsskins/branches/jmo-perspectives/standard/negotiation/
      - copied from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/negotiation/
   cpsskins/branches/jmo-perspectives/standard/portlets/
      - copied from r2773, 
cpsskins/branches/jmo-perspectives/ui/standard/portlets/
Removed:
   cpsskins/branches/jmo-perspectives/ui/standard/
Modified:
   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/README.txt
   cpsskins/branches/jmo-perspectives/io/style.py
   cpsskins/branches/jmo-perspectives/io/style.zcml
   cpsskins/branches/jmo-perspectives/standard/displays/storage.py
   cpsskins/branches/jmo-perspectives/standard/filters/effect/configure.zcml
   cpsskins/branches/jmo-perspectives/standard/filters/effect/views.py
   cpsskins/branches/jmo-perspectives/standard/filters/layout/configure.zcml
   cpsskins/branches/jmo-perspectives/standard/filters/layout/views.py
   cpsskins/branches/jmo-perspectives/standard/filters/style/__init__.py
   cpsskins/branches/jmo-perspectives/standard/filters/style/configure.zcml
   cpsskins/branches/jmo-perspectives/standard/filters/style/css.py
   cpsskins/branches/jmo-perspectives/standard/filters/style/views.py
   cpsskins/branches/jmo-perspectives/standard/filters/widget/__init__.py
   cpsskins/branches/jmo-perspectives/standard/filters/widget/configure.zcml
   cpsskins/branches/jmo-perspectives/standard/filters/widget/views.py
   cpsskins/branches/jmo-perspectives/standard/filters/widget/widgets.py
   cpsskins/branches/jmo-perspectives/standard/negotiation/engine.py
   cpsskins/branches/jmo-perspectives/standard/negotiation/page.py
   cpsskins/branches/jmo-perspectives/standard/negotiation/perspective.py
   cpsskins/branches/jmo-perspectives/standard/negotiation/theme.py
   cpsskins/branches/jmo-perspectives/standard/portlets/macroslot/portlet.py
   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/tests/test_portlets.py
   cpsskins/branches/jmo-perspectives/thememanager.py
   cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml
   cpsskins/branches/jmo-perspectives/ui/authoring/views.py
   cpsskins/branches/jmo-perspectives/ui/configure.zcml
   cpsskins/branches/jmo-perspectives/ui/manager/views.py
Log:

- moved ui.standard cpsskins.standard



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   
Mon Apr  3 22:16:00 2006
@@ -24,8 +24,8 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 
 from cpsskins import configuration
-from cpsskins.ui.standard.filters.widget.interfaces import IWidgetView
-from cpsskins.ui.standard.formats.widget import IWidget
+from cpsskins.standard.filters.widget.interfaces import IWidgetView
+from cpsskins.standard.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   Mon Apr  3 22:16:00 2006
@@ -86,6 +86,8 @@
 
   <include package=".storage" />
 
+  <include package=".standard" />
+
   <include package=".relations" />
 
   <include package=".ui" />

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 Mon Apr  3 
22:16:00 2006
@@ -24,7 +24,7 @@
 The slots A and B have their own display
 
     >>> from cpsskins.elements.interfaces import IDisplayable
-    >>> from cpsskins.ui.standard.displays.boxgroup import BoxGroup
+    >>> from cpsskins.standard.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        Mon Apr 
 3 22:16:00 2006
@@ -61,14 +61,14 @@
    it corresponds to the 'view' in the MVC paradigm.
 
     >>> from zope.interface.verify import verifyClass
-    >>> from cpsskins.ui.standard.displays.box import Box
-    >>> from cpsskins.ui.standard.displays.interfaces import IDisplay
+    >>> from cpsskins.standard.displays.box import Box
+    >>> from cpsskins.standard.displays.interfaces import IDisplay
     >>> verifyClass(IDisplay, Box)
     True
 
     the box is then formatted with a widget.
 
-    >>> from cpsskins.ui.standard.formats.widget import Widget
+    >>> from cpsskins.standard.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.ui.standard.filters.widget import WidgetFilter
-    >>> from cpsskins.ui.standard.formats.widget import IWidget
+    >>> from cpsskins.standard.filters.widget import WidgetFilter
+    >>> from cpsskins.standard.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      Mon Apr  3 
22:16:00 2006
@@ -32,7 +32,7 @@
 from cpsskins.relations import DyadicRelation, TriadicRelation
 from cpsskins.relations.interfaces import IRelationTool
 from cpsskins.ontology import hasDisplay, hasDisplayFromPerspective
-from cpsskins.ui.standard.displays.storage import IDisplayStorage
+from cpsskins.standard.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       Mon Apr  3 
22:16:00 2006
@@ -25,7 +25,7 @@
 
 from cpsskins.elements import Element
 from cpsskins.elements.interfaces import IType, IFormat, IFormattable
-from cpsskins.ui.standard.formats.storage import IFormatStorage
+from cpsskins.standard.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/README.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/README.txt    (original)
+++ cpsskins/branches/jmo-perspectives/io/README.txt    Mon Apr  3 22:16:00 2006
@@ -76,7 +76,7 @@
 IResourceType.
 
     >>> from cpsskins.setup.interfaces import IResourceType
-    >>> from cpsskins.ui.standard.formats.style import Style
+    >>> from cpsskins.standard.formats.style import Style
 
     >>> resource = Style()
     >>> resource_type = queryType(resource, IResourceType)

Modified: cpsskins/branches/jmo-perspectives/io/style.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/style.py      (original)
+++ cpsskins/branches/jmo-perspectives/io/style.py      Mon Apr  3 22:16:00 2006
@@ -24,7 +24,7 @@
 from zope.component import adapts
 from zope.interface import implements
 
-from cpsskins.ui.standard.formats.style import IStyle
+from cpsskins.standard.formats.style import IStyle
 from cpsskins.elements.interfaces import IIdentifiable
 from cpsskins.io.interfaces import IDataExporter, IDataImporter
 

Modified: cpsskins/branches/jmo-perspectives/io/style.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/style.zcml    (original)
+++ cpsskins/branches/jmo-perspectives/io/style.zcml    Mon Apr  3 22:16:00 2006
@@ -5,7 +5,7 @@
   <!-- XML export -->
   <browser:view
       provides="cpsskins.io.interfaces.IDataExporter"
-      for="cpsskins.ui.standard.formats.style.IStyle"
+      for="cpsskins.standard.formats.style.IStyle"
       class=".style.Exporter"
       permission="zope.ManageContent"
   />

Modified: cpsskins/branches/jmo-perspectives/standard/displays/storage.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/displays/storage.py  
(original)
+++ cpsskins/branches/jmo-perspectives/standard/displays/storage.py     Mon Apr 
 3 22:16:00 2006
@@ -19,7 +19,7 @@
 
 from zope.interface import implements
 
-from cpsskins.ui.standard.displays.interfaces import IDisplayStorage
+from cpsskins.standard.displays.interfaces import IDisplayStorage
 from cpsskins.storage import Storage
 
 class DisplayStorage(Storage):

Modified: 
cpsskins/branches/jmo-perspectives/standard/filters/effect/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/standard/filters/effect/configure.zcml    
    (original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/effect/configure.zcml   
Mon Apr  3 22:16:00 2006
@@ -5,7 +5,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.ui.standard.formats.effect.IEffect"
+      for="cpsskins.standard.formats.effect.IEffect"
       class=".views.EffectEditor"
       template="effect_editor.pt"
       permission="zope.ManageContent"
@@ -15,8 +15,8 @@
 
   <cpsskins:filter
       name="effect"
-      predicate="cpsskins.ui.standard.formats.effect.hasEffect"
-      for="cpsskins.ui.standard.formats.effect.IEffect"
+      predicate="cpsskins.standard.formats.effect.hasEffect"
+      for="cpsskins.standard.formats.effect.IEffect"
       factory=".EffectFilter"
   />
 

Modified: cpsskins/branches/jmo-perspectives/standard/filters/effect/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/effect/views.py      
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/effect/views.py Mon Apr 
 3 22:16:00 2006
@@ -19,7 +19,7 @@
 
 from zope.app.form.browser.editview import EditView
 
-from cpsskins.ui.standard.formats.effect import IEffect
+from cpsskins.standard.formats.effect import IEffect
 
 class EffectEditor(EditView):
     """Effect editor view"""

Modified: 
cpsskins/branches/jmo-perspectives/standard/filters/layout/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/standard/filters/layout/configure.zcml    
    (original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/layout/configure.zcml   
Mon Apr  3 22:16:00 2006
@@ -5,7 +5,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.ui.standard.formats.layout.ILayout"
+      for="cpsskins.standard.formats.layout.ILayout"
       class=".views.LayoutEditor"
       template="layout_editor.pt"
       permission="zope.ManageContent"
@@ -16,8 +16,8 @@
 
   <cpsskins:filter
       name="layout"
-      predicate="cpsskins.ui.standard.formats.layout.hasLayout"
-      for="cpsskins.ui.standard.formats.layout.ILayout"
+      predicate="cpsskins.standard.formats.layout.hasLayout"
+      for="cpsskins.standard.formats.layout.ILayout"
       factory=".LayoutFilter"
   />
 

Modified: cpsskins/branches/jmo-perspectives/standard/filters/layout/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/layout/views.py      
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/layout/views.py Mon Apr 
 3 22:16:00 2006
@@ -19,7 +19,7 @@
 
 from zope.app.form.browser.editview import EditView
 
-from cpsskins.ui.standard.formats.layout import ILayout
+from cpsskins.standard.formats.layout import ILayout
 
 class LayoutEditor(EditView):
     """Layout editor view"""

Modified: cpsskins/branches/jmo-perspectives/standard/filters/style/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/style/__init__.py    
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/style/__init__.py       
Mon Apr  3 22:16:00 2006
@@ -22,7 +22,7 @@
 from zope.interface import implements, Interface
 from zope.component import adapts
 
-from cpsskins.ui.standard.formats.style import IStyle
+from cpsskins.standard.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.ui.standard.formats.style import Style
+    >>> from cpsskins.standard.formats.style import Style
 
     >>> s = Style()
     >>> s.identifier = 12345
@@ -100,7 +100,7 @@
 class CSSRenderer(object):
     """Render a style in CSS
 
-    >>> from cpsskins.ui.standard.formats.style import Style
+    >>> from cpsskins.standard.formats.style import Style
 
     >>> s = Style()
     >>> s.identifier = 12345

Modified: 
cpsskins/branches/jmo-perspectives/standard/filters/style/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/style/configure.zcml 
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/style/configure.zcml    
Mon Apr  3 22:16:00 2006
@@ -8,8 +8,8 @@
 
   <cpsskins:filter
       name="style"
-      predicate="cpsskins.ui.standard.formats.style.hasStyle"
-      for="cpsskins.ui.standard.formats.style.IStyle"
+      predicate="cpsskins.standard.formats.style.hasStyle"
+      for="cpsskins.standard.formats.style.IStyle"
       factory=".StyleFilter"
   />
 
@@ -17,7 +17,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.ui.standard.formats.style.IStyle"
+      for="cpsskins.standard.formats.style.IStyle"
       class=".views.StyleEditor"
       template="style_editor.pt"
       permission="zope.ManageContent"
@@ -32,7 +32,7 @@
       layer="cpsskins.browser.skin.cpsskins" />
 
   <browser:pages
-      for="cpsskins.ui.standard.formats.style.IStyle"
+      for="cpsskins.standard.formats.style.IStyle"
       class=".views.JSONView"
       permission="zope.ManageContent">
 
@@ -73,7 +73,7 @@
   <adapter
       factory=".CSSRenderer"
       provides=".ICSSRenderer"
-      for="cpsskins.ui.standard.formats.style.IStyle"
+      for="cpsskins.standard.formats.style.IStyle"
   />
 
   <browser:pages

Modified: cpsskins/branches/jmo-perspectives/standard/filters/style/css.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/style/css.py 
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/style/css.py    Mon Apr 
 3 22:16:00 2006
@@ -21,9 +21,9 @@
 from zope.interface import implements, Interface
 from zope.component import getUtility, getUtilitiesFor
 
-from cpsskins.ui.standard.formats.storage import IFormatStorage
-from cpsskins.ui.standard.formats.style import IStyle
-from cpsskins.ui.standard.filters.style import ICSSRenderer
+from cpsskins.standard.formats.storage import IFormatStorage
+from cpsskins.standard.formats.style import IStyle
+from cpsskins.standard.filters.style import ICSSRenderer
 from cpsskins.setup.interfaces import ISetting, IResource
 
 class IStylesheetView(Interface):

Modified: cpsskins/branches/jmo-perspectives/standard/filters/style/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/style/views.py       
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/style/views.py  Mon Apr 
 3 22:16:00 2006
@@ -23,7 +23,7 @@
 
 from cpsskins import configuration
 from cpsskins import minjson as json
-from cpsskins.ui.standard.formats.style import IStyle
+from cpsskins.standard.formats.style import IStyle
 
 class StyleEditor(EditView):
     """Style editor view"""

Modified: cpsskins/branches/jmo-perspectives/standard/filters/widget/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/widget/__init__.py   
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/widget/__init__.py      
Mon Apr  3 22:16:00 2006
@@ -26,8 +26,8 @@
 from zope.i18nmessageid import MessageFactory
 
 from cpsskins.browser.rendering.interfaces import IFilterView
-from cpsskins.ui.standard.formats.widget import IWidget
-from cpsskins.ui.standard.filters.widget.interfaces import (
+from cpsskins.standard.formats.widget import IWidget
+from cpsskins.standard.filters.widget.interfaces import (
                                                  IBasicWidgetView, IWidgetView)
 
 logger = logging.getLogger("cpsskins")

Modified: 
cpsskins/branches/jmo-perspectives/standard/filters/widget/configure.zcml
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/standard/filters/widget/configure.zcml    
    (original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/widget/configure.zcml   
Mon Apr  3 22:16:00 2006
@@ -5,7 +5,7 @@
 
   <browser:page
       name="edit.html"
-      for="cpsskins.ui.standard.formats.widget.IWidget"
+      for="cpsskins.standard.formats.widget.IWidget"
       class=".views.WidgetEditor"
       template="widget_editor.pt"
       permission="zope.ManageContent"
@@ -15,8 +15,8 @@
 
   <cpsskins:filter
       name="widget"
-      predicate="cpsskins.ui.standard.formats.widget.hasWidget"
-      for="cpsskins.ui.standard.formats.widget.IWidget"
+      predicate="cpsskins.standard.formats.widget.hasWidget"
+      for="cpsskins.standard.formats.widget.IWidget"
       factory=".WidgetFilter"
       stylesheet="widgets.css"
   />

Modified: cpsskins/branches/jmo-perspectives/standard/filters/widget/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/widget/views.py      
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/widget/views.py Mon Apr 
 3 22:16:00 2006
@@ -19,7 +19,7 @@
 
 from zope.app.form.browser.editview import EditView
 
-from cpsskins.ui.standard.formats.widget import IWidget
+from cpsskins.standard.formats.widget import IWidget
 
 class WidgetEditor(EditView):
     """Widget editor view"""

Modified: cpsskins/branches/jmo-perspectives/standard/filters/widget/widgets.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/filters/widget/widgets.py    
(original)
+++ cpsskins/branches/jmo-perspectives/standard/filters/widget/widgets.py       
Mon Apr  3 22:16:00 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.ui.standard.filters.widget import WidgetView
+from cpsskins.standard.filters.widget import WidgetView
 
 # Base classes divided into categories.
 

Modified: cpsskins/branches/jmo-perspectives/standard/negotiation/engine.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/negotiation/engine.py        
(original)
+++ cpsskins/branches/jmo-perspectives/standard/negotiation/engine.py   Mon Apr 
 3 22:16:00 2006
@@ -20,7 +20,7 @@
 from zope.interface import implements
 
 from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.ui.standard.negotiation.interfaces import \
+from cpsskins.standard.negotiation.interfaces import \
      IRequestNegotiationScheme
 
 class Request(NegotiationScheme):

Modified: cpsskins/branches/jmo-perspectives/standard/negotiation/page.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/negotiation/page.py  
(original)
+++ cpsskins/branches/jmo-perspectives/standard/negotiation/page.py     Mon Apr 
 3 22:16:00 2006
@@ -21,7 +21,7 @@
 from zope.component import queryUtility
 
 from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.ui.standard.negotiation.interfaces import (
+from cpsskins.standard.negotiation.interfaces import (
     IQueryParameterNegotiationScheme, ICookieNegotiationScheme,
     ILocalNegotiationScheme, IDefaultNegotiationScheme,
     IContextNegotiationScheme)

Modified: cpsskins/branches/jmo-perspectives/standard/negotiation/perspective.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/negotiation/perspective.py   
(original)
+++ cpsskins/branches/jmo-perspectives/standard/negotiation/perspective.py      
Mon Apr  3 22:16:00 2006
@@ -21,7 +21,7 @@
 from zope.interface import implements
 
 from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.ui.standard.negotiation.interfaces import \
+from cpsskins.standard.negotiation.interfaces import \
      ISessionNegotiationScheme
 
 class Session(NegotiationScheme):

Modified: cpsskins/branches/jmo-perspectives/standard/negotiation/theme.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/negotiation/theme.py 
(original)
+++ cpsskins/branches/jmo-perspectives/standard/negotiation/theme.py    Mon Apr 
 3 22:16:00 2006
@@ -21,7 +21,7 @@
 from zope.interface import implements
 
 from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.ui.standard.negotiation.interfaces import (
+from cpsskins.standard.negotiation.interfaces import (
     IQueryParameterNegotiationScheme, ICookieNegotiationScheme,
     ILocalNegotiationScheme, IDefaultNegotiationScheme,
     IContextNegotiationScheme)

Modified: 
cpsskins/branches/jmo-perspectives/standard/portlets/macroslot/portlet.py
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/standard/portlets/macroslot/portlet.py    
    (original)
+++ cpsskins/branches/jmo-perspectives/standard/portlets/macroslot/portlet.py   
Mon Apr  3 22:16:00 2006
@@ -25,7 +25,7 @@
 from cpsskins import Portlet
 from cpsskins.interfaces import IPortlet
 
-from cpsskins.ui.standard.portlets.macroslot.skin import IMacrolessSkin
+from cpsskins.standard.portlets.macroslot.skin import IMacrolessSkin
 
 _ = MessageFactory("cpsskins")
 

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    Mon Apr  3 
22:16:00 2006
@@ -22,9 +22,9 @@
 from zope.testing.doctestunit import DocTestSuite
 
 
-from cpsskins.ui.standard.displays.area import Area
-from cpsskins.ui.standard.displays.box import Box
-from cpsskins.ui.standard.displays.boxgroup import BoxGroup
+from cpsskins.standard.displays.area import Area
+from cpsskins.standard.displays.box import Box
+from cpsskins.standard.displays.boxgroup import BoxGroup
 
 from cpsskins.tests.setup import setUp
 
@@ -47,9 +47,9 @@
         unittest.makeSuite(TestBoxGroup),
         # TODO: fix the test
         #DocTestSuite('cpsskins.elements.display', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.displays.area', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.displays.box', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.displays.boxgroup', setUp=setUp),
+        DocTestSuite('cpsskins.standard.displays.area', setUp=setUp),
+        DocTestSuite('cpsskins.standard.displays.box', setUp=setUp),
+        DocTestSuite('cpsskins.standard.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    Mon Apr  3 
22:16:00 2006
@@ -25,13 +25,13 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('cpsskins.ui.standard.filters.widget', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.filters.layout', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.filters.effect', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.filters.style', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.filters.htmlcleaner',
+        DocTestSuite('cpsskins.standard.filters.widget', setUp=setUp),
+        DocTestSuite('cpsskins.standard.filters.layout', setUp=setUp),
+        DocTestSuite('cpsskins.standard.filters.effect', setUp=setUp),
+        DocTestSuite('cpsskins.standard.filters.style', setUp=setUp),
+        DocTestSuite('cpsskins.standard.filters.htmlcleaner',
                      setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.filters.accesskeys',
+        DocTestSuite('cpsskins.standard.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     Mon Apr  3 
22:16:00 2006
@@ -21,9 +21,9 @@
 
 from zope.testing.doctestunit import DocTestSuite
 
-from cpsskins.ui.standard.formats.layout import Layout
-from cpsskins.ui.standard.formats.style import Style
-from cpsskins.ui.standard.formats.widget import Widget
+from cpsskins.standard.formats.layout import Layout
+from cpsskins.standard.formats.style import Style
+from cpsskins.standard.formats.widget import Widget
 from cpsskins.tests.setup import setUp
 
 class TestLayout:
@@ -45,9 +45,9 @@
         unittest.makeSuite(TestWidget),
         # TODO fix test setup
         # DocTestSuite('cpsskins.elements.format', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.formats.layout', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.formats.style', setUp=setUp),
-        DocTestSuite('cpsskins.ui.standard.formats.widget', setUp=setUp),
+        DocTestSuite('cpsskins.standard.formats.layout', setUp=setUp),
+        DocTestSuite('cpsskins.standard.formats.style', setUp=setUp),
+        DocTestSuite('cpsskins.standard.formats.widget', setUp=setUp),
         ))
 
 if __name__ == '__main__':

Modified: cpsskins/branches/jmo-perspectives/tests/test_portlets.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_portlets.py   (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_portlets.py   Mon Apr  3 
22:16:00 2006
@@ -21,12 +21,12 @@
 
 from zope.testing.doctestunit import DocTestSuite
 
-from cpsskins.ui.standard.portlets.actions.portlet import Actions
-from cpsskins.ui.standard.portlets.breadcrumbs.portlet import Breadcrumbs
-from cpsskins.ui.standard.portlets.custom.portlet import Custom
-from cpsskins.ui.standard.portlets.dummy.portlet import Dummy
-from cpsskins.ui.standard.portlets.image.portlet import Image
-from cpsskins.ui.standard.portlets.macroslot.portlet import MacroSlot
+from cpsskins.standard.portlets.actions.portlet import Actions
+from cpsskins.standard.portlets.breadcrumbs.portlet import Breadcrumbs
+from cpsskins.standard.portlets.custom.portlet import Custom
+from cpsskins.standard.portlets.dummy.portlet import Dummy
+from cpsskins.standard.portlets.image.portlet import Image
+from cpsskins.standard.portlets.macroslot.portlet import MacroSlot
 
 class TestActionsPortlet:
     def makeTestObject(self):

Modified: cpsskins/branches/jmo-perspectives/thememanager.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/thememanager.py  (original)
+++ cpsskins/branches/jmo-perspectives/thememanager.py  Mon Apr  3 22:16:00 2006
@@ -32,10 +32,10 @@
 from cpsskins.caching import ImageCache
 from cpsskins.elements.interfaces import ITheme, IThemeContainer
 from cpsskins.elements.interfaces import IFormattable
-from cpsskins.ui.standard.displays.interfaces import IDisplayStorage
-from cpsskins.ui.standard.displays.storage import DisplayStorage
-from cpsskins.ui.standard.formats.storage import IFormatStorage
-from cpsskins.ui.standard.formats.storage import FormatStorage
+from cpsskins.standard.displays.interfaces import IDisplayStorage
+from cpsskins.standard.displays.storage import DisplayStorage
+from cpsskins.standard.formats.storage import IFormatStorage
+from cpsskins.standard.formats.storage import FormatStorage
 from cpsskins.interfaces import IThemeManagementFolder, IImageCache
 from cpsskins.ontology import isDefault, hasFormat, hasDisplay
 from cpsskins.perspectives import Perspective

Modified: cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml      
(original)
+++ cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml      Mon Apr 
 3 22:16:00 2006
@@ -15,6 +15,18 @@
       name="authoring.js" file="authoring.js"
       layer="cpsskins.browser.skin.cpsskins" />
 
+  <!-- Negotiation view -->
+
+  <browser:view
+    for="*"
+    name="authoring"
+    provides=".views.IAuthoring"
+    class=".views.Authoring"
+    permission="zope.Public"
+    allowed_interface=".views.IAuthoring"
+    layer="cpsskins.browser.skin.cpsskins"
+  />
+
   <browser:pages
       for="*"
       layer="cpsskins.browser.skin.cpsskins"

Modified: cpsskins/branches/jmo-perspectives/ui/authoring/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/authoring/views.py    (original)
+++ cpsskins/branches/jmo-perspectives/ui/authoring/views.py    Mon Apr  3 
22:16:00 2006
@@ -40,8 +40,13 @@
 
 _ = MessageFactory("cpsskins")
 
+class IAuthoring(Interface):
+    """Authoring views"""
+
 class Authoring(BrowserView):
 
+    implements(IAuthoring)
+
     def __init__(self, context, request):
         self.context = context
         self.request = request

Modified: cpsskins/branches/jmo-perspectives/ui/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/configure.zcml        (original)
+++ cpsskins/branches/jmo-perspectives/ui/configure.zcml        Mon Apr  3 
22:16:00 2006
@@ -1,12 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope";>
 
-  <!-- default engine / standard resources -->
-
-  <include package=".standard" />
-
-  <include package=".framework" />
-
 
   <!-- Editing, authoring -->
 
@@ -25,4 +19,9 @@
 
   <include package=".manager" />
 
+
+  <!-- ajax framework-->
+
+  <include package=".framework" />
+
 </configure>

Modified: cpsskins/branches/jmo-perspectives/ui/manager/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/manager/views.py      (original)
+++ cpsskins/branches/jmo-perspectives/ui/manager/views.py      Mon Apr  3 
22:16:00 2006
@@ -30,6 +30,7 @@
 from cpsskins.elements.pageblock import PageBlock
 from cpsskins.elements.cell import Cell
 from cpsskins.elements.slot import Slot
+from cpsskins.ui.authoring.views import IAuthoring
 from cpsskins.utils import getThemeManager
 from interfaces import IThemeManagerView
 
@@ -62,9 +63,9 @@
         """
         context = self.context
         request = self.request
-        negotiation = zapi.getMultiAdapter((context, request), INegotiation,
-                                            'negotiation')
-        negotiation.setWorkTheme(name)
+        authoring = zapi.getMultiAdapter((context, request), IAuthoring,
+                                         name='authoring')
+        authoring.setWorkTheme(name)
         request.response.redirect('./@@editor.html')
 
     def addTheme(self):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to