Author: jmorliaguet
Date: Mon Jul 3 14:48:42 2006
New Revision: 3605
Modified:
cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt
cpsskins/branches/paris-sprint-2006/standard/filters/layout/__init__.py
cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/presentations.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/engine.zcml
Log:
- made pageblocks positionable (left, center, right)
- cells, slots and portlets are alignable
Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt Mon Jul
3 14:48:42 2006
@@ -92,6 +92,8 @@
>>> request = TestRequest(environ={'REQUEST_URI':
u'/++skin++cpsskins/123'})
>>> negotiation = getMultiAdapter((root, request), INegotiation,
... name='negotiation')
+ >>> print negotiation.strategy
+
>>> page = negotiation.getPage()
>>> page.theme, page
(Theme('Theme 1'), ThemePage('A page'))
@@ -108,8 +110,6 @@
>>> page.theme, page
(Theme('Theme 2'), ThemePage('A page'))
- >>> del request.form[u'page']
-
The theme's name can also be specified in a cookie:
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/layout/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/layout/__init__.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/layout/__init__.py
Mon Jul 3 14:48:42 2006
@@ -140,12 +140,21 @@
v = removeSecurityProxy(v)
if k == 'width':
style_attr += 'width:%s;' % v
+ elif k == 'height':
+ style_attr += 'height:%s;' % v
elif k == 'align':
style_attr += 'text-align:%s;' % v
elif k == 'padding':
style_attr += 'padding:%s;' % v
elif k == 'margin':
style_attr += 'margin:%s;' % v
+ elif k == 'position':
+ if v == u'center':
+ style_attr += 'margin-left: auto; margin-right: auto;'
+ elif v == u'right':
+ style_attr += 'margin-left: auto; margin-right: 0;'
+ elif v == u'left':
+ style_attr += 'margin-left: 0; margin-right: auto;'
return style_attr
def _getAllowedTags(self):
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/layout.py Mon Jul
3 14:48:42 2006
@@ -83,6 +83,8 @@
_layout_types = {
'container': (u'width', u'height'),
'contained': (u'margin', u'padding'),
+ 'alignable': (u'align',),
+ 'positionable': (u'position',),
}
implements(ILayout, ITraversable)
@@ -119,9 +121,13 @@
return k in self.keys()
def keys(self):
- if not self.types:
+ types = self.types
+ if not types:
return []
- return self._layout_types[self.types[0]]
+ keys = []
+ for type in types:
+ keys.extend(self._layout_types[type])
+ return keys
def items(self):
return self.data.items()
@@ -138,6 +144,8 @@
layout_types = [
(_(u'Container'), u'container'),
(_(u'Contained'), u'contained'),
+ (_(u'Alignable'), u'alignable'),
+ (_(u'Positionable'), u'positionable'),
]
return SimpleVocabulary.fromItems(layout_types)
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/configure.zcml
Mon Jul 3 14:48:42 2006
@@ -21,7 +21,7 @@
<format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<format
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/configure.zcml
Mon Jul 3 14:48:42 2006
@@ -23,7 +23,7 @@
<format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<format
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/custom/configure.zcml
Mon Jul 3 14:48:42 2006
@@ -24,7 +24,7 @@
<format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<format
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/dummy/configure.zcml
Mon Jul 3 14:48:42 2006
@@ -23,7 +23,7 @@
<format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<format
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/image/configure.zcml
Mon Jul 3 14:48:42 2006
@@ -23,7 +23,7 @@
<format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<format
Modified:
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/configure.zcml
Mon Jul 3 14:48:42 2006
@@ -24,7 +24,7 @@
<format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<format
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 Mon Jul
3 14:48:42 2006
@@ -33,7 +33,7 @@
<cpsskins:format
name="layout"
- types="container"
+ types="container positionable"
/>
<cpsskins:format
@@ -55,7 +55,7 @@
<cpsskins:format
name="layout"
- types="container"
+ types="container alignable"
/>
<cpsskins:format
@@ -77,7 +77,7 @@
<cpsskins:format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<cpsskins:format
@@ -109,7 +109,7 @@
<cpsskins:format
name="layout"
- types="contained"
+ types="contained alignable"
/>
<cpsskins:format
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml
Mon Jul 3 14:48:42 2006
@@ -45,6 +45,10 @@
/>
<filter
+ name="layout"
+ />
+
+ <filter
name="style"
/>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
Mon Jul 3 14:48:42 2006
@@ -6,8 +6,7 @@
layout_id layout/identifier;
width layout/width">
- <table cellpadding="0" cellspacing="0" class="pageBlockEdit"
- tal:attributes="width width">
+ <table cellpadding="0" cellspacing="0" class="pageBlockEdit">
<tr>
<td>
<ins class="model"
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/engine.zcml
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/engine.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/engine.zcml
Mon Jul 3 14:48:42 2006
@@ -37,6 +37,10 @@
/>
<filter
+ name="layout"
+ />
+
+ <filter
name="style"
/>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
