Author: jmorliaguet Date: Fri Jun 16 11:35:17 2006 New Revision: 3424 Removed: cpsskins/branches/paris-sprint-2006/standard/displays/area.py cpsskins/branches/paris-sprint-2006/standard/displays/box.py cpsskins/branches/paris-sprint-2006/standard/displays/boxgroup.py cpsskins/branches/paris-sprint-2006/tests/test_display.py Modified: cpsskins/branches/paris-sprint-2006/doc/portlets.txt cpsskins/branches/paris-sprint-2006/setup/io/README.txt cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml cpsskins/branches/paris-sprint-2006/standard/presentations.zcml
Log: - merged all types of displays (Area, Box, BoxGroup) into a single class: Display - the next step is to make Display Elements simple string objects instead of python classes Modified: cpsskins/branches/paris-sprint-2006/doc/portlets.txt ============================================================================== --- cpsskins/branches/paris-sprint-2006/doc/portlets.txt (original) +++ cpsskins/branches/paris-sprint-2006/doc/portlets.txt Fri Jun 16 11:35:17 2006 @@ -143,26 +143,22 @@ Displaying portlets =================== -The data provided by portlets is displayed in *Display Elements* (e.g. a Box), +The data provided by portlets is displayed in Display Elements which represents the fragment of the page in which the portlet will appear. - >>> from zope.interface.verify import verifyClass - >>> from cpsskins.standard.displays.box import Box - >>> from cpsskins.elements.interfaces import IDisplay - >>> verifyClass(IDisplay, Box) - True - A same portlet can be displayed in different Display Elements depending on the context. -Provided that the portlet is associated with a given Box, the Box is in turn -associated with various Format Element (style, effects, ...) whose +Provided that the portlet is associated with a given display, the display is +in turn associated with various Format Element (style, effects, ...) whose responsibility in the rendering chain is to format elements. The type of Format that interests us here is the *widget* Format. >>> from cpsskins.standard.formats.widget import Widget >>> from cpsskins.elements.interfaces import IFormat + + >>> from zope.interface.verify import verifyClass >>> verifyClass(IFormat, Widget) True @@ -471,15 +467,15 @@ The slots A and B have their own display: >>> from cpsskins.elements.interfaces import IDisplayable - >>> from cpsskins.standard.displays.boxgroup import BoxGroup + >>> from cpsskins.elements.display import Display >>> display_slot_A = IDisplayable(slot_A).getDisplay() >>> display_slot_B = IDisplayable(slot_B).getDisplay() - >>> isinstance(display_slot_A, BoxGroup) + >>> isinstance(display_slot_A, Display) True - >>> isinstance(display_slot_B, BoxGroup) + >>> isinstance(display_slot_B, Display) True >>> display_slot_A is not display_slot_B Modified: cpsskins/branches/paris-sprint-2006/setup/io/README.txt ============================================================================== --- cpsskins/branches/paris-sprint-2006/setup/io/README.txt (original) +++ cpsskins/branches/paris-sprint-2006/setup/io/README.txt Fri Jun 16 11:35:17 2006 @@ -228,13 +228,13 @@ Export of display elements ------------------------- - >>> from cpsskins.standard.displays.area import Area - >>> area = Area() + >>> from cpsskins.elements.display import Display + >>> display = Display() - >>> print toXML(area, u'displays') + >>> print toXML(display, u'displays') <?xml version="1.0" encoding="utf-8"?> <displays> - <area id="..."/> + <display id="..."/> </displays> <BLANKLINE> Modified: cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml ============================================================================== --- cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml (original) +++ cpsskins/branches/paris-sprint-2006/standard/displays/configure.zcml Fri Jun 16 11:35:17 2006 @@ -5,28 +5,10 @@ i18n_domain="cpsskins" > - <!-- Area display --> - - <cpsskins:display - name="area" - schema=".area.IArea" - class=".area.Area" - /> - - <!-- Box display --> - - <cpsskins:display - name="box" - schema=".box.IBox" - class=".box.Box" - /> - - <!-- Box group display --> - <cpsskins:display - name="boxgroup" - schema=".boxgroup.IBoxGroup" - class=".boxgroup.BoxGroup" + name="display" + schema="cpsskins.elements.interfaces.IDisplay" + class="cpsskins.elements.display.Display" /> </configure> Modified: cpsskins/branches/paris-sprint-2006/standard/presentations.zcml ============================================================================== --- cpsskins/branches/paris-sprint-2006/standard/presentations.zcml (original) +++ cpsskins/branches/paris-sprint-2006/standard/presentations.zcml Fri Jun 16 11:35:17 2006 @@ -10,7 +10,7 @@ for="cpsskins.elements.interfaces.IThemePage"> <cpsskins:display - type="area" + type="display" /> <cpsskins:format @@ -36,7 +36,7 @@ for="cpsskins.elements.interfaces.IPageBlock"> <cpsskins:display - type="area" + type="display" /> <cpsskins:format @@ -62,7 +62,7 @@ for="cpsskins.elements.interfaces.ICell"> <cpsskins:display - type="area" + type="display" /> <cpsskins:format @@ -88,7 +88,7 @@ for="cpsskins.elements.interfaces.ISlot"> <cpsskins:display - type="boxgroup" + type="display" /> <cpsskins:format @@ -119,7 +119,7 @@ for="cpsskins.elements.interfaces.IPortlet"> <cpsskins:display - type="box" + type="display" /> <cpsskins:format -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins