Author: jmorliaguet
Date: Thu Jun 15 23:23:04 2006
New Revision: 3422
Added:
cpsskins/branches/paris-sprint-2006/standard/presentations.zcml (contents,
props changed)
Modified:
cpsskins/branches/paris-sprint-2006/doc/portlets.txt
cpsskins/branches/paris-sprint-2006/elements/configure.zcml
cpsskins/branches/paris-sprint-2006/setup/preset.py
cpsskins/branches/paris-sprint-2006/standard/configure.zcml
Log:
- test fix
- moved the standard presentation of elements to cpsskins.standard
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 Thu Jun 15
23:23:04 2006
@@ -571,7 +571,7 @@
>>> from cpsskins.browser.tree.slot import INodeMoving
>>> moving = getMultiAdapter((slot_B, request), INodeMoving)
- >>> moving.move(portlets[1])
+ >>> moved = moving.move(portlets[1])
now Slot B contains one more portlet:
Modified: cpsskins/branches/paris-sprint-2006/elements/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/elements/configure.zcml Thu Jun 15
23:23:04 2006
@@ -1,6 +1,5 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- xmlns:cpsskins="http://namespaces.zope.org/cpsskins";
xmlns:i18n="http://namespaces.zope.org/i18n";
i18n_domain="cpsskins"
>
@@ -203,28 +202,6 @@
</class>
- <cpsskins:presentation
- for=".interfaces.IThemePage">
-
- <cpsskins:display
- type="area"
- />
-
- <cpsskins:format
- name="layout"
- types="page"
- />
-
- <cpsskins:format
- name="widget"
- types="standard.page_body"
- />
-
- <cpsskins:format
- name="style"
- />
-
- </cpsskins:presentation>
<!-- Page block -->
@@ -272,29 +249,6 @@
</class>
- <cpsskins:presentation
- for=".interfaces.IPageBlock">
-
- <cpsskins:display
- type="area"
- />
-
- <cpsskins:format
- name="layout"
- types="container"
- />
-
- <cpsskins:format
- name="widget"
- types="standard.pageblock_frame"
- />
-
- <cpsskins:format
- name="style"
- />
-
- </cpsskins:presentation>
-
<!-- Cell -->
@@ -342,29 +296,6 @@
</class>
- <cpsskins:presentation
- for=".interfaces.ICell">
-
- <cpsskins:display
- type="area"
- />
-
- <cpsskins:format
- name="layout"
- types="container"
- />
-
- <cpsskins:format
- name="widget"
- types="standard.cell_frame"
- />
-
- <cpsskins:format
- name="style"
- />
-
- </cpsskins:presentation>
-
<!-- Slot -->
@@ -422,35 +353,6 @@
</class>
- <cpsskins:presentation
- for=".interfaces.ISlot">
-
- <cpsskins:display
- type="boxgroup"
- />
-
- <cpsskins:format
- name="order"
- />
-
- <cpsskins:format
- name="effect"
- types="scale"
- />
-
- <cpsskins:format
- name="widget"
- types="standard.frame_box
- standard.vertical_menu"
- />
-
- <cpsskins:format
- name="style"
- />
-
- </cpsskins:presentation>
-
-
<!-- Portlet -->
@@ -471,23 +373,4 @@
type="cpsskins.setup.interfaces.INameType"
/>
- <cpsskins:presentation
- for=".interfaces.IPortlet">
-
- <cpsskins:display
- type="box"
- />
-
- <cpsskins:format
- name="widget"
- types="standard.plain_html"
- />
-
- <cpsskins:format
- name="style"
- />
-
- </cpsskins:presentation>
-
-
</configure>
Modified: cpsskins/branches/paris-sprint-2006/setup/preset.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/preset.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/preset.py Thu Jun 15 23:23:04 2006
@@ -19,7 +19,7 @@
from persistent import Persistent
from zope.app.container.contained import Contained
-from zope.app.location.interfaces import ISublocations
+from zope.location.interfaces import ISublocations
from zope.component import adapts
from zope.interface import implements
from zope.location.location import locate
Modified: cpsskins/branches/paris-sprint-2006/standard/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/standard/configure.zcml Thu Jun 15
23:23:04 2006
@@ -55,4 +55,8 @@
<include package=".fields" />
+ <!-- Standard presentations -->
+
+ <include file="presentations.zcml" />
+
</configure>
Added: cpsskins/branches/paris-sprint-2006/standard/presentations.zcml
==============================================================================
--- (empty file)
+++ cpsskins/branches/paris-sprint-2006/standard/presentations.zcml Thu Jun
15 23:23:04 2006
@@ -0,0 +1,136 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ xmlns:cpsskins="http://namespaces.zope.org/cpsskins";
+ xmlns:i18n="http://namespaces.zope.org/i18n";
+ i18n_domain="cpsskins">
+
+ <!-- Pages -->
+
+ <cpsskins:presentation
+ for="cpsskins.elements.interfaces.IThemePage">
+
+ <cpsskins:display
+ type="area"
+ />
+
+ <cpsskins:format
+ name="layout"
+ types="page"
+ />
+
+ <cpsskins:format
+ name="widget"
+ types="standard.page_body"
+ />
+
+ <cpsskins:format
+ name="style"
+ />
+
+ </cpsskins:presentation>
+
+
+ <!-- Page blocks -->
+
+ <cpsskins:presentation
+ for="cpsskins.elements.interfaces.IPageBlock">
+
+ <cpsskins:display
+ type="area"
+ />
+
+ <cpsskins:format
+ name="layout"
+ types="container"
+ />
+
+ <cpsskins:format
+ name="widget"
+ types="standard.pageblock_frame"
+ />
+
+ <cpsskins:format
+ name="style"
+ />
+
+ </cpsskins:presentation>
+
+
+ <!-- Cells -->
+
+ <cpsskins:presentation
+ for="cpsskins.elements.interfaces.ICell">
+
+ <cpsskins:display
+ type="area"
+ />
+
+ <cpsskins:format
+ name="layout"
+ types="container"
+ />
+
+ <cpsskins:format
+ name="widget"
+ types="standard.cell_frame"
+ />
+
+ <cpsskins:format
+ name="style"
+ />
+
+ </cpsskins:presentation>
+
+
+ <!-- Slots -->
+
+ <cpsskins:presentation
+ for="cpsskins.elements.interfaces.ISlot">
+
+ <cpsskins:display
+ type="boxgroup"
+ />
+
+ <cpsskins:format
+ name="order"
+ />
+
+ <cpsskins:format
+ name="effect"
+ types="scale"
+ />
+
+ <cpsskins:format
+ name="widget"
+ types="standard.frame_box
+ standard.vertical_menu"
+ />
+
+ <cpsskins:format
+ name="style"
+ />
+
+ </cpsskins:presentation>
+
+
+ <!-- Portlets -->
+
+ <cpsskins:presentation
+ for="cpsskins.elements.interfaces.IPortlet">
+
+ <cpsskins:display
+ type="box"
+ />
+
+ <cpsskins:format
+ name="widget"
+ types="standard.plain_html"
+ />
+
+ <cpsskins:format
+ name="style"
+ />
+
+ </cpsskins:presentation>
+
+</configure>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
