Author: jmorliaguet
Date: Sat Oct 15 05:13:01 2005
New Revision: 28337
Added:
z3lab/cpsskins/branches/jmo-perspectives/perspectives/
- copied from r28333,
z3lab/cpsskins/branches/jmo-perspectives/elements/perspectives/
Removed:
z3lab/cpsskins/branches/jmo-perspectives/elements/perspectives/
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/controllers/theme.py
z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt
z3lab/cpsskins/branches/jmo-perspectives/elements/configure.zcml
z3lab/cpsskins/branches/jmo-perspectives/elements/displays/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/elements/theme.py
z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/tests/test_perspective.py
Log:
- moved cpsskins.elements.perspectives to cpsskins.perspectives
since not all type of perspectives are elements.
Modified: z3lab/cpsskins/branches/jmo-perspectives/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/configure.zcml (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/configure.zcml Sat Oct 15
05:13:01 2005
@@ -71,6 +71,8 @@
<include package=".engines" />
+ <include package=".perspectives" />
+
<include package=".configuration.engines" />
</configure>
Modified: z3lab/cpsskins/branches/jmo-perspectives/controllers/theme.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/controllers/theme.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/controllers/theme.py Sat Oct
15 05:13:01 2005
@@ -22,7 +22,7 @@
from cpsskins.controllers import Controller
from cpsskins.configuration.interfaces import IRegistry
-from cpsskins.elements.perspectives import SitePerspective
+from cpsskins.perspectives import SitePerspective
from cpsskins.thememanager import getThemeManager
from interfaces import IController
Modified: z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt Sat Oct
15 05:13:01 2005
@@ -3,22 +3,22 @@
>>> from cpsskins.elements.slot import Slot
>>> from cpsskins.elements.portlet import Portlet
- >>> from cpsskins.elements.perspectives import Perspective
+ >>> from cpsskins.perspectives import SitePerspective
Local portlets are displayed in *slots*
>>> portlet = Portlet('Some portlet')
- >>> portlet._identifier = 1
+ >>> portlet.identifier = 1
Let us create a slot:
>>> slot = Slot(_slot='Right')
- >>> slot._identifier = 2
+ >>> slot.identifier = 2
And a perspective:
- >>> perspective = Perspective('Some perspective')
- >>> perspective._identifier = 3
+ >>> perspective = SitePerspective('Some perspective')
+ >>> perspective.identifier = 3
Let us create a relation to connect the slots, the portlet and the perspective:
@@ -50,8 +50,8 @@
The portlet will not be visible from another perspective:
- >>> other_perspective = Perspective('Some other perspective')
- >>> other_perspective._identifier = 4
+ >>> other_perspective = SitePerspective('Some other perspective')
+ >>> other_perspective.identifier = 4
>>> storage.getSeconds(
... predicate=hasPortletFromPerspective,
@@ -68,7 +68,7 @@
- a unique identifier that is used internally
- >>> slot.getIdentifier()
+ >>> slot.identifier
2
- a slot name that is exposed to the user.
@@ -81,9 +81,9 @@
portlets:
>>> slotA = Slot(_slot='Some slot')
- >>> slotA._identifier = 5
+ >>> slotA.identifier = 5
>>> slotB = Slot(_slot='Some slot')
- >>> slotB._identifier = 6
+ >>> slotB.identifier = 6
>>> relationA = Triad(
... predicate=hasPortletFromPerspective,
Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/configure.zcml
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/configure.zcml Sat Oct
15 05:13:01 2005
@@ -265,8 +265,6 @@
<!-- package includes -->
- <include package=".perspectives" />
-
<include package=".displays" />
<include package=".formats" />
Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/displays/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/displays/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/displays/__init__.py
Sat Oct 15 05:13:01 2005
@@ -26,7 +26,7 @@
from cpsskins.elements import Element
from cpsskins.elements.interfaces import IDisplayable, IDisplay, IDisplayType
from cpsskins.elements.interfaces import IFormattable
-from cpsskins.elements.perspectives.interfaces import IPerspective
+from cpsskins.perspectives.interfaces import IPerspective
from cpsskins.relations import DyadicRelation, TriadicRelation
from cpsskins.relations.tool import RelationTool
from cpsskins.ontology import hasDisplay, hasDisplayFromPerspective
Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/theme.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/theme.py (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/theme.py Sat Oct 15
05:13:01 2005
@@ -23,7 +23,7 @@
from cpsskins.configuration.interfaces import IRegistry
from cpsskins.elements import InnerNode
-from cpsskins.elements.perspectives.interfaces import IPerspective
+from cpsskins.perspectives.interfaces import IPerspective
from cpsskins.storage.interfaces import IPerspectiveStorage
from cpsskins.thememanager import getThemeManager
from interfaces import ITheme, IThemePage
Modified: z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py Sat Oct
15 05:13:01 2005
@@ -21,7 +21,7 @@
from zope.interface import Interface
from cpsskins.elements.interfaces import IFormat, IDisplay, IPortlet
-from cpsskins.elements.perspectives.interfaces import IPerspective
+from cpsskins.perspectives.interfaces import IPerspective
from cpsskins.relations.interfaces import IRelation
class IStorage(Interface):
Modified: z3lab/cpsskins/branches/jmo-perspectives/tests/test_perspective.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/tests/test_perspective.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/tests/test_perspective.py Sat Oct
15 05:13:01 2005
@@ -21,14 +21,9 @@
from zope.testing.doctestunit import DocTestSuite
-class TestPerspective:
- def makeTestObject(self):
- return Perspective()
-
def test_suite():
return unittest.TestSuite((
- DocTestSuite('cpsskins.elements.perspectives'),
- unittest.makeSuite(TestPerspective),
+ DocTestSuite('cpsskins.perspectives'),
))
if __name__ == '__main__':
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
