Author: jmorliaguet
Date: Sun Jun 25 11:49:00 2006
New Revision: 3518
Modified:
cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
cpsskins/branches/paris-sprint-2006/browser/tree/slot.py
cpsskins/branches/paris-sprint-2006/controllers/portlet.py
cpsskins/branches/paris-sprint-2006/elements/interfaces.py
cpsskins/branches/paris-sprint-2006/elements/presentation.py
cpsskins/branches/paris-sprint-2006/elements/slot.py
cpsskins/branches/paris-sprint-2006/locations/configure.zcml
cpsskins/branches/paris-sprint-2006/locations/interfaces.py
cpsskins/branches/paris-sprint-2006/locations/location.py
cpsskins/branches/paris-sprint-2006/relations/relations.py
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
cpsskins/branches/paris-sprint-2006/storage/storage.py
cpsskins/branches/paris-sprint-2006/tests/setup.py
cpsskins/branches/paris-sprint-2006/tests/test_renderers.py
cpsskins/branches/paris-sprint-2006/thememanager.py
cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
cpsskins/branches/paris-sprint-2006/utils.py
Log:
- removed unused imports
- added a vocabulary for location scopes
- removed the fadein transition on the location panel
Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py Sun Jun
25 11:49:00 2006
@@ -20,7 +20,6 @@
from zope.component import getMultiAdapter, getUtility
from zope.interface import implements
-from cpsskins.browser.rendering.interfaces import IViewer
from cpsskins.browser.negotiation.interfaces import INegotiation
from cpsskins.browser.negotiation.interfaces import INegotiationStrategy
from cpsskins.utils import getThemeManager
Modified: cpsskins/branches/paris-sprint-2006/browser/tree/slot.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/tree/slot.py (original)
+++ cpsskins/branches/paris-sprint-2006/browser/tree/slot.py Sun Jun 25
11:49:00 2006
@@ -30,7 +30,6 @@
from cpsskins.browser.tree.interfaces import INodeDuplicating, INodeTraversing
from cpsskins.elements.interfaces import IPortlet, IFormattable
from cpsskins.ontology import hasPortlet, hasPortletFromPerspective
-from cpsskins.ontology import hasPerspective
from cpsskins.relations import DyadicRelation, TriadicRelation
from cpsskins.utils import getThemeManager, getRelationStorage
Modified: cpsskins/branches/paris-sprint-2006/controllers/portlet.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/controllers/portlet.py (original)
+++ cpsskins/branches/paris-sprint-2006/controllers/portlet.py Sun Jun 25
11:49:00 2006
@@ -24,7 +24,6 @@
from cpsskins.controllers.interfaces import IController
from cpsskins.elements.interfaces import ICell
from cpsskins.elements.interfaces import IPresentable
-from cpsskins.utils import getThemeManager
class PortletController(Controller):
"""Event handler for portlets.
Modified: cpsskins/branches/paris-sprint-2006/elements/interfaces.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/interfaces.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/interfaces.py Sun Jun 25
11:49:00 2006
@@ -25,7 +25,7 @@
from zope.i18nmessageid import MessageFactory
from zope.interface import Interface, Attribute
from zope.interface.interfaces import IInterface
-from zope.schema import TextLine, List, Choice
+from zope.schema import TextLine, Choice
_ = MessageFactory("cpsskins")
Modified: cpsskins/branches/paris-sprint-2006/elements/presentation.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/presentation.py
(original)
+++ cpsskins/branches/paris-sprint-2006/elements/presentation.py Sun Jun
25 11:49:00 2006
@@ -19,14 +19,11 @@
from zope.traversing.interfaces import IPathAdapter
from zope.interface import implements
-from zope.component import getUtility, queryUtility
+from zope.component import queryUtility
from cpsskins.elements.interfaces import IFormattable
from cpsskins.elements.interfaces import IPresentable
-from cpsskins.ontology import hasFormat
-from cpsskins.ontology import IFormatPredicate
from cpsskins.setup.interfaces import IType
-from cpsskins.utils import getThemeManager, getRelationStorage
class Presentable(object):
"""This adapter makes elements presentable, i.e. formattable
Modified: cpsskins/branches/paris-sprint-2006/elements/slot.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/slot.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/slot.py Sun Jun 25
11:49:00 2006
@@ -18,17 +18,20 @@
__docformat__ = "reStructuredText"
from zope.interface import implements, alsoProvides
+from zope.i18nmessageid import MessageFactory
from zope.component import adapts, getUtility
from zope.component.factory import Factory
from zope.schema.interfaces import IVocabularyFactory
from zope.schema.vocabulary import SimpleVocabulary
from cpsskins.elements.element import InnerNode
-from cpsskins.elements.interfaces import ISlot, IBase
+from cpsskins.elements.interfaces import ISlot
from cpsskins.relations.interfaces import IRelatable
from cpsskins.storage.portlets import IPortletStorage
from cpsskins.utils import getThemeManager
+_ = MessageFactory("cpsskins")
+
class Slot(InnerNode):
"""Slot
Modified: cpsskins/branches/paris-sprint-2006/locations/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/locations/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/locations/configure.zcml Sun Jun
25 11:49:00 2006
@@ -11,4 +11,10 @@
</class>
+ <utility
+ provides="zope.schema.interfaces.IVocabularyFactory"
+ component=".interfaces.ScopesVocabulary"
+ name="location scopes"
+ />
+
</configure>
Modified: cpsskins/branches/paris-sprint-2006/locations/interfaces.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/locations/interfaces.py (original)
+++ cpsskins/branches/paris-sprint-2006/locations/interfaces.py Sun Jun 25
11:49:00 2006
@@ -17,8 +17,13 @@
"""
__docformat__ = "reStructuredText"
-from zope.interface import Interface
-from zope.schema import TextLine, Tuple
+from zope.interface import Interface, alsoProvides
+from zope.i18nmessageid import MessageFactory
+from zope.schema import TextLine, Tuple, Choice
+from zope.schema.interfaces import IVocabularyFactory
+from zope.schema.vocabulary import SimpleVocabulary
+
+_ = MessageFactory("cpsskins")
class ILocation(Interface):
"""Location"""
@@ -37,6 +42,7 @@
scope = Tuple(
title=u"Scope",
+ value_type=Choice(vocabulary="location scopes"),
)
def __call__():
@@ -44,3 +50,16 @@
def __str__():
"""Return the location's path"""
+
+scopes = {
+ (0, 0): _(u"In this folder and all sub-folders"),
+ (0, 1): _(u"Only in this folder"),
+ (1, 0): _(u"In all sub-folders"),
+}
+
+def ScopesVocabulary(context):
+ """A vocabulary that contains a list of scopes
+ """
+ return SimpleVocabulary.fromItems(scopes.items())
+
+alsoProvides(ScopesVocabulary, IVocabularyFactory)
Modified: cpsskins/branches/paris-sprint-2006/locations/location.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/locations/location.py (original)
+++ cpsskins/branches/paris-sprint-2006/locations/location.py Sun Jun 25
11:49:00 2006
@@ -17,7 +17,6 @@
"""
__docformat__ = "reStructuredText"
-from zope.component import adapts
from zope.component.factory import Factory
from zope.interface import implements
Modified: cpsskins/branches/paris-sprint-2006/relations/relations.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/relations/relations.py (original)
+++ cpsskins/branches/paris-sprint-2006/relations/relations.py Sun Jun 25
11:49:00 2006
@@ -26,7 +26,7 @@
from cpsskins.relations.predicates import Predicate
from cpsskins.relations.interfaces import IRelation
from cpsskins.relations.interfaces import IMonadicRelation, IDyadicRelation
-from cpsskins.relations.interfaces import ITriadicRelation, IRelatable
+from cpsskins.relations.interfaces import ITriadicRelation
class Relation(Persistent):
"""A relation
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
Sun Jun 25 11:49:00 2006
@@ -17,8 +17,6 @@
"""
__docformat__ = "reStructuredText"
-import time
-
from zope.app.cache.ram import RAMCache
from zope.component import getUtility, getMultiAdapter
from zope.traversing.api import getPath
Modified: cpsskins/branches/paris-sprint-2006/storage/storage.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/storage/storage.py (original)
+++ cpsskins/branches/paris-sprint-2006/storage/storage.py Sun Jun 25
11:49:00 2006
@@ -30,7 +30,6 @@
from zope.location.location import locate
from zope.traversing.api import getName
-from cpsskins.elements.interfaces import IElement
from cpsskins.setup.interfaces import IType
from cpsskins.storage.interfaces import IStorage
from cpsskins.utils import cloneObject
Modified: cpsskins/branches/paris-sprint-2006/tests/setup.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/tests/setup.py (original)
+++ cpsskins/branches/paris-sprint-2006/tests/setup.py Sun Jun 25 11:49:00 2006
@@ -19,7 +19,7 @@
from zope.app.container.interfaces import IObjectAddedEvent,
IObjectRemovedEvent
from zope.app.container.interfaces import INameChooser, IWriteContainer
-from zope.app.container.contained import NameChooser, Contained
+from zope.app.container.contained import NameChooser
from zope.app.testing import setup
from zope.component import getGlobalSiteManager
from zope.interface import implements, Interface
Modified: cpsskins/branches/paris-sprint-2006/tests/test_renderers.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/tests/test_renderers.py (original)
+++ cpsskins/branches/paris-sprint-2006/tests/test_renderers.py Sun Jun 25
11:49:00 2006
@@ -19,7 +19,7 @@
import unittest
-from zope.testing.doctestunit import DocTestSuite, DocFileSuite
+from zope.testing.doctestunit import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: cpsskins/branches/paris-sprint-2006/thememanager.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/thememanager.py (original)
+++ cpsskins/branches/paris-sprint-2006/thememanager.py Sun Jun 25 11:49:00 2006
@@ -25,9 +25,7 @@
from zope.component.persistentregistry import PersistentComponents
from zope.interface import implements, Interface
from zope.i18nmessageid import MessageFactory
-from zope.schema import TextLine
-from zope.traversing.api import getName, getParent, getPath
-from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.traversing.api import getName, getParent
from cpsskins.caching import ImageCache, IImageCache
from cpsskins.elements.interfaces import IFormattable
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py Sun Jun
25 11:49:00 2006
@@ -38,8 +38,6 @@
from cpsskins.clientstorage import ClientStorage
from cpsskins.configuration.portlets.factory import IPortletFactory
from cpsskins.configuration.portlets import DEFAULT_PROVIDER
-from cpsskins.elements.theme import Theme
-from cpsskins.elements.themepage import ThemePage
from cpsskins.elements.interfaces import IPresentable
from cpsskins.elements.interfaces import IInnerNode, IFormattable
from cpsskins.setup.interfaces import IResourceManager, IIdentifiable, IType
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py Sun Jun
25 11:49:00 2006
@@ -383,9 +383,6 @@
'model': 'location-selector',
'subviews': ['location-chooser'],
'perspectives': ['content-author'],
- 'show_effect': {
- 'transition': 'fadein',
- },
'controllers': ['main-editor-perspectives', 'main-editor-actions'],
},
Modified: cpsskins/branches/paris-sprint-2006/utils.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/utils.py (original)
+++ cpsskins/branches/paris-sprint-2006/utils.py Sun Jun 25 11:49:00 2006
@@ -21,13 +21,9 @@
from zope.component import getSiteManager, getGlobalSiteManager
from zope.location.pickling import locationCopy
-from zope.publisher.interfaces import IRequest
-from zope.security.management import getInteraction
from zope.security.proxy import removeSecurityProxy
from zope.traversing.api import getParent
-from cpsskins.locations import Location
-
startTag = re.compile('<.*?>')
classAttr = re.compile(' class="(.*?)"')
lineBreaks = re.compile('(\n|\r)')
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
