[Z3lab-checkins] r3355 - cpsskins/branches/paris-sprint-2006/ui/screens/common
Author: jmorliaguet Date: Thu Jun 8 10:44:38 2006 New Revision: 3355 Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css Log: - make the floating footer transparent (i.e. not visible if empty) Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css == --- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css Thu Jun 8 10:44:38 2006 @@ -44,9 +44,7 @@ bottom: 0; left: 0; width: 100%; - background-color: #999; - border-top: 2px solid #666; - height: 25px; + height: 30px; z-index: 20; } -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3356 - cpsskins/branches/paris-sprint-2006/ui/screens/common
Author: jmorliaguet
Date: Thu Jun 8 10:46:56 2006
New Revision: 3356
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
Log:
- make the context menu appear on top
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css Thu Jun
8 10:46:56 2006
@@ -352,6 +352,10 @@
color: #600;
}
+.contextMenu {
+ z-index: 40;
+}
+
.contextMenu a.submenuitem {
background-image: url(++resource++li-16.png);
background-repeat: no-repeat;
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3357 - in cpsskins/branches/paris-sprint-2006/ui/screens: common pagedesigner/layout pagedesigner/wysiwyg
Author: jmorliaguet
Date: Thu Jun 8 10:59:54 2006
New Revision: 3357
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt
Log:
- cosmetic: show a pointer on editable elements
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css Thu Jun
8 10:59:54 2006
@@ -362,3 +362,6 @@
background-position: 95% center;
}
+.elementEditable {
+ cursor: pointer;
+}
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt
==
---
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt
Thu Jun 8 10:59:54 2006
@@ -2,7 +2,7 @@
tal:define=info options/info; model nocall:context/@@getModel
tal:content=python: model(info) /
-div class=elementMovable elementShiftable portletTarget
+div class=elementEditable elementMovable elementShiftable portletTarget
tal:define=
title context/title;
id context/identifier
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt
Thu Jun 8 10:59:54 2006
@@ -9,7 +9,7 @@
id context/identifier;
icon context/@@getIcon
- div class=elementMovable elementShiftable portletTarget slotFrame
+ div class=elementEditable elementMovable elementShiftable portletTarget
slotFrame
tal:attributes=id id
div class=title tal:content=slot_title|slot_name /
div class=bodyimg src= tal:attributes=src icon /
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt
==
---
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt
Thu Jun 8 10:59:54 2006
@@ -2,6 +2,6 @@
tal:define=info options/info; model nocall:context/@@getModel
tal:content=python: model(info) /
-div class=editable elementMovable elementShiftable portletTarget
+div class=elementEditable elementMovable elementShiftable portletTarget
tal:attributes=id context/identifier
tal:content=structure options/markup /
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt
Thu Jun 8 10:59:54 2006
@@ -8,7 +8,7 @@
id context/identifier;
icon context/@@getIcon
- div class=elementMovable elementShiftable portletTarget slotFrame
+ div class=elementEditable elementMovable elementShiftable portletTarget
slotFrame
tal:attributes=id id
div class=title tal:content=slot_title|slot_name /
div class=bodyimg src= tal:attributes=src icon /
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3358 - in cpsskins/branches/paris-sprint-2006: standard/screens/styleeditor ui/screens
Author: jmorliaguet
Date: Thu Jun 8 11:31:25 2006
New Revision: 3358
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
Log:
- consistency
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
==
---
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
Thu Jun 8 11:31:25 2006
@@ -15,7 +15,7 @@
/
browser:resource
- name=style_editor.js file=style_editor.js
+ name=style-editor.js file=style_editor.js
layer=cpsskins.browser.skin.cpsskins /
browser:pages
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 Thu Jun
8 11:31:25 2006
@@ -28,7 +28,7 @@
'data': {
'url': '@@element-editor.html',
'css': '++resource++element-editor.css',
-'script': '++resource++style_editor.js',
+'script': '++resource++style-editor.js',
'id': 0,
'tab': '',
'init': True,
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3359 - cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor
Author: jmorliaguet Date: Thu Jun 8 11:34:43 2006 New Revision: 3359 Modified: cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt Log: - added information about customizing filesystem presets Modified: cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt == --- cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt Thu Jun 8 11:34:43 2006 @@ -66,7 +66,9 @@ /tal:block tal:block condition=python: preset and preset.isGlobal() - emThis preset is stored on the file-system. It cannot be edited./em + emThis preset is stored on the file-system. It cannot be edited. + To customize it select '(no preset)' in the list of presets. + /em /tal:block fieldset class=panel tal:condition=python: tab == 'preview' or preset and preset.isGlobal() -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3361 - cpsskins/branches/paris-sprint-2006
Author: jmorliaguet Date: Thu Jun 8 20:32:56 2006 New Revision: 3361 Added: cpsskins/branches/paris-sprint-2006/clientstorage.py (contents, props changed) Modified: cpsskins/branches/paris-sprint-2006/utils.py Log: - added an API to simplify access the client-side session storage. Added: cpsskins/branches/paris-sprint-2006/clientstorage.py == --- (empty file) +++ cpsskins/branches/paris-sprint-2006/clientstorage.pyThu Jun 8 20:32:56 2006 @@ -0,0 +1,55 @@ +## +# +# Copyright (c) 2005-2006 Nuxeo and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +## + + +$Id$ + +__docformat__ = reStructuredText + +from urllib import quote, unquote + +from cpsskins import minjson as json +from cpsskins.utils import getRequest + +class ClientStorage(object): +A client-side storage (the information is stored in cookies) + +def __init__(self, id): +self.storage_id = u'cpsskins_local_storage_%s' % id +self.request = getRequest() + +def getData(self): +Get data from a local storage. + +value = self.request.cookies.get(self.storage_id) +if value is not None: +return json.read(unquote(value)) +return None + +def setData(self, data): +Set data in the local storage. + +value = quote(json.write(data)) +self.request.response.setCookie(self.storage_id, value, path='/') + +def __setitem__(self, k, v): +data = self.data +data[k] = v +self.data = data + +def __getitem__(self, k): +return self.data[k] + +data = property(getData, setData) + Modified: cpsskins/branches/paris-sprint-2006/utils.py == --- cpsskins/branches/paris-sprint-2006/utils.py(original) +++ cpsskins/branches/paris-sprint-2006/utils.pyThu Jun 8 20:32:56 2006 @@ -20,7 +20,9 @@ import re from zope.component import getSiteManager, getGlobalSiteManager +from zope.publisher.interfaces import IRequest from zope.traversing.api import getParent +from zope.security.management import getInteraction from cpsskins.thememanager import IThemeManagementFolder @@ -57,6 +59,13 @@ def getClientStorageId(id): return u'cpsskins_local_storage_%s' % id +def getRequest(): +interaction = getInteraction() +for p in interaction.participations: +if IRequest.providedBy(p): +return p +raise RuntimeError(No IRequest in interaction) + def addThemeSkeleton(context): # for testing purposes from cpsskins.elements.interfaces import IDisplayable, IFormattable -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3362 - cpsskins/branches/paris-sprint-2006
Author: jmorliaguet
Date: Thu Jun 8 21:12:00 2006
New Revision: 3362
Modified:
cpsskins/branches/paris-sprint-2006/clientstorage.py
Log:
- more robust code if the storage does not exist yet
Modified: cpsskins/branches/paris-sprint-2006/clientstorage.py
==
--- cpsskins/branches/paris-sprint-2006/clientstorage.py(original)
+++ cpsskins/branches/paris-sprint-2006/clientstorage.pyThu Jun 8
21:12:00 2006
@@ -28,6 +28,8 @@
def __init__(self, id):
self.storage_id = u'cpsskins_local_storage_%s' % id
self.request = getRequest()
+if self.data is None:
+self.data = {}
def getData(self):
Get data from a local storage.
@@ -49,7 +51,10 @@
self.data = data
def __getitem__(self, k):
-return self.data[k]
+data = self.data
+if data is None:
+return None
+return data.get(k)
data = property(getData, setData)
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3363 - in cpsskins/branches/paris-sprint-2006: standard/screens/styleeditor ui/screens/elementeditor
Author: jmorliaguet
Date: Thu Jun 8 21:13:59 2006
New Revision: 3363
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/views.py
Log:
- using the new clientstorage
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
==
---
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
Thu Jun 8 21:13:59 2006
@@ -51,10 +51,11 @@
/browser:pages
browser:page
-for=*
-name=style-editor-form.html
-permission=zope.ManageContent
-template=style_editor_form.ctal
+ for=*
+ name=style-editor-form.html
+ permission=zope.ManageContent
+ class=.views.StyleEditor
+ template=style_editor_form.ctal
/
/configure
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
==
---
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
Thu Jun 8 21:13:59 2006
@@ -1,7 +1,7 @@
div i18n:domain=cpsskins
- tal:define=data view/getStyleEditorData;
+ tal:define=style_data view/style_data;
style_id context/identifier;
- widget_type data/widget|nothing
+ widget_type style_data/widget|nothing
ins class=model tal:content=view/getFormDataModelDef /
ins class=model tal:content=view/getStyleEditorDataModelDef /
@@ -19,12 +19,26 @@
}}
/ins
+ fieldset class=panel
+legend class=panelTitleWidgets/legend
+ul class=inlineButtons
+ tal:block tal:repeat=type view/getWidgetTypes
+li tal:attributes=class python: widget_type == type and 'selected'
or nothing
+ a i18n:translate= tal:content=string:widget.${type}
+ tal:attributes=href
string:@@setStyleEditorData?widget=$typestyle_id=$style_id //li
+ /tal:block
+/ul
+div style=clear:both/div
+ /fieldset
+
table style=width: 100%
tr
td style=width: 50%; vertical-align: top
-fieldset id=previewArea class=panel style=cursor: pointer
+fieldset id=previewArea class=panel style=cursor: pointer
+ tal:define=preview view/renderWidgetPreview
+ tal:condition=preview
legend class=panelTitlePreview/legend
- tal:block content=structure view/renderWidgetPreview /
+ tal:block content=structure preview /
/fieldset
div class=floatingHint style=display: none
id=labelInfonbsp;/div
@@ -38,16 +52,4 @@
/tr
/table
- fieldset class=panel
-legend class=panelTitleWidgets/legend
-ul class=inlineButtons
- tal:block tal:repeat=type view/getWidgetTypes
-li tal:attributes=class python: widget_type == type and 'selected'
or nothing
- a i18n:translate= tal:content=string:widget.${type}
- tal:attributes=href
string:@@setStyleEditorData?widget=$typestyle_id=$style_id //li
- /tal:block
-/ul
-div style=clear:both/div
- /fieldset
-
/div
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
Thu Jun 8 21:13:59 2006
@@ -17,7 +17,6 @@
__docformat__ = reStructuredText
-from urllib import quote, unquote
from zope.app.cache.ram import RAMCache
from zope.component import getUtility, getMultiAdapter
from zope.traversing.api import getPath
@@ -26,9 +25,10 @@
from cpsskins import minjson as json
from cpsskins import utils
from cpsskins.browser.negotiation.interfaces import INegotiation
+from cpsskins.clientstorage import ClientStorage
from cpsskins.elements.interfaces import IDisplayable, IFormattable
from cpsskins.setup.interfaces import IResourceManager
-from cpsskins.utils import getThemeManager, getClientStorageId
+from cpsskins.utils import getThemeManager
cache = RAMCache()
@@ -39,7 +39,8 @@
self.context = context
self.request = request
self.tmutil = getThemeManager(context)
-self.storage_id = getClientStorageId(u'style-editor-data')
+self.element_data = ClientStorage(u'element-editor')
+self.style_data = ClientStorage(u'style-editor-data')
def getWidgetTypes(self):
[Z3lab-checkins] r3364 - cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor
Author: jmorliaguet
Date: Thu Jun 8 22:52:00 2006
New Revision: 3364
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
Log:
- cleanup
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
==
---
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
Thu Jun 8 22:52:00 2006
@@ -33,6 +33,13 @@
attribute=setFormData
/
+ /browser:pages
+
+ browser:pages
+ for=cpsskins.standard.formats.style.IStyle
+ class=.views.StyleEditor
+ permission=zope.ManageContent
+
browser:page
name=getStyleData
attribute=getStyleData
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
Thu Jun 8 22:52:00 2006
@@ -27,7 +27,6 @@
from cpsskins.browser.negotiation.interfaces import INegotiation
from cpsskins.clientstorage import ClientStorage
from cpsskins.elements.interfaces import IDisplayable, IFormattable
-from cpsskins.setup.interfaces import IResourceManager
from cpsskins.utils import getThemeManager
cache = RAMCache()
@@ -50,7 +49,7 @@
perspective = negotiation.getPerspective()
displayable = IDisplayable(element)
display = displayable.getEffectiveDisplay(perspective)
-widget = IFormattable(display).getFormat(u'widget')
+widget = IFormattable(display).getFormat('widget')
return widget.types
def renderWidgetPreview(self):
@@ -127,21 +126,20 @@
def setFormData(self):
data = self.data
-selector = data.get(u'selector')
+style_data = self.style_data
+selector = data.get('selector')
if selector is None:
raise ValueError(The CSS selector is not set.)
-style_id = data.get(u'style_id')
+style_id = style_data['style_id']
if not style_id:
raise ValueError(The style id is not set.)
style = self.tmutil.getElementById(style_id)
-
props = {}
for name in self.getFieldNames():
value = self.request.form.get(name)
if value is None:
continue
props[name] = value
-
style[selector] = props
def getFieldNames(self):
@@ -158,18 +156,12 @@
def getStyleData(self):
data = self.data
-widget = self.style_data[u'widget']
-style_id = self.style_data[u'style_id']
-selector = data.get(u'selector', u'')
-resources = getUtility(IResourceManager)
-
+selector = data.get('selector', u'')
data = {
-'widget': widget,
-'style_id': style_id,
'selector': selector,
'fields': [],
}
-
+style_id = self.style_data['style_id']
if style_id and selector:
style = self.tmutil.getElementById(style_id)
fields = []
@@ -184,9 +176,7 @@
'disabled': False,
'status': u'',
})
-
data['fields'] = fields
-
self.request.response.setHeader('content-type', 'text/x-json')
return json.write(data)
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3365 - cpsskins/branches/paris-sprint-2006
Author: jmorliaguet Date: Thu Jun 8 23:27:29 2006 New Revision: 3365 Modified: cpsskins/branches/paris-sprint-2006/clientstorage.py Log: - added keys() for convenience Modified: cpsskins/branches/paris-sprint-2006/clientstorage.py == --- cpsskins/branches/paris-sprint-2006/clientstorage.py(original) +++ cpsskins/branches/paris-sprint-2006/clientstorage.pyThu Jun 8 23:27:29 2006 @@ -56,5 +56,10 @@ return None return data.get(k) +def keys(self): +data = self.data +if data is None: +return [] +return data.keys() data = property(getData, setData) -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3366 - cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor
Author: jmorliaguet
Date: Thu Jun 8 23:27:57 2006
New Revision: 3366
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
Log:
- UI updates
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
==
---
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
Thu Jun 8 23:27:57 2006
@@ -29,8 +29,8 @@
/
browser:page
-name=setFormData
-attribute=setFormData
+name=setStyleEditorData
+attribute=setStyleEditorData
/
/browser:pages
@@ -51,8 +51,8 @@
/
browser:page
-name=setStyleEditorData
-attribute=setStyleEditorData
+name=setFormData
+attribute=setFormData
/
/browser:pages
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
==
---
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/style_editor.pt
Thu Jun 8 23:27:57 2006
@@ -1,7 +1,10 @@
div i18n:domain=cpsskins
- tal:define=style_data view/style_data;
+ tal:define=element_data view/element_data;
+ init element_data/init|nothing;
+ style_data view/style_data;
style_id context/identifier;
- widget_type style_data/widget|nothing
+ widget_type style_data/widget|nothing;
+ widget_types view/getWidgetTypes
ins class=model tal:content=view/getFormDataModelDef /
ins class=model tal:content=view/getStyleEditorDataModelDef /
@@ -22,8 +25,8 @@
fieldset class=panel
legend class=panelTitleWidgets/legend
ul class=inlineButtons
- tal:block tal:repeat=type view/getWidgetTypes
-li tal:attributes=class python: widget_type == type and 'selected'
or nothing
+ tal:block tal:repeat=type widget_types
+li tal:attributes=class python: (not init and widget_type == type)
and 'selected' or nothing
a i18n:translate= tal:content=string:widget.${type}
tal:attributes=href
string:@@setStyleEditorData?widget=$typestyle_id=$style_id //li
/tal:block
@@ -31,7 +34,7 @@
div style=clear:both/div
/fieldset
- table style=width: 100%
+ table style=width: 100% tal:condition=python: not init and widget_type
in widget_types
tr
td style=width: 50%; vertical-align: top
fieldset id=previewArea class=panel style=cursor: pointer
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
Thu Jun 8 23:27:57 2006
@@ -65,6 +65,10 @@
markup = utils.insertCSSClass(markup, u'style' + unicode(style_id))
return markup
+def setStyleEditorData(self, widget=u'', style_id=u''):
+self.style_data.setData({'widget': widget, 'style_id': style_id})
+self.element_data['init'] = False
+
def getFormDataModelDef(self):
path = getPath(self.context)
return json.write({
@@ -146,9 +150,6 @@
return (u'font', u'color', u'background-color', 'background-image',
u'padding', u'margin', u'border', u'text-transform')
-def setStyleEditorData(self, widget=u'', style_id=u''):
-self.style_data.setData({'widget': widget, 'style_id': style_id})
-
def setStyleData(self, data):
self.data = json.read(data)
self.request.response.setHeader('content-type', 'text/x-json')
@@ -156,12 +157,12 @@
def getStyleData(self):
data = self.data
+style_id = self.style_data['style_id']
selector = data.get('selector', u'')
data = {
'selector': selector,
'fields': [],
}
-style_id = self.style_data['style_id']
if style_id and selector:
style = self.tmutil.getElementById(style_id)
fields = []
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3367 - in cpsskins/branches/paris-sprint-2006: standard/screens/styleeditor ui/screens/common ui/screens/elementeditor
Author: jmorliaguet
Date: Thu Jun 8 23:43:46 2006
New Revision: 3367
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
Log:
- UI / fixes
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
==
---
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/configure.zcml
Thu Jun 8 23:43:46 2006
@@ -33,6 +33,11 @@
attribute=setStyleEditorData
/
+browser:page
+name=setFormData
+attribute=setFormData
+/
+
/browser:pages
browser:pages
@@ -50,11 +55,6 @@
attribute=setStyleData
/
-browser:page
-name=setFormData
-attribute=setFormData
-/
-
/browser:pages
browser:page
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js Thu Jun
8 23:43:46 2006
@@ -43,7 +43,8 @@
function editElement(info) {
var data = info.model.getData();
var perspectives = CPSSkins.getControllerById('main-editor-perspectives');
- CPSSkins.getModelById('element-editor').updateData({id: data.id, init:
true});
+ CPSSkins.getModelById('element-editor').updateData(
+{id: data.id, tab: 'element', init: true});
perspectives.switchTo('element-editor');
}
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
==
---
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
Thu Jun 8 23:43:46 2006
@@ -85,7 +85,7 @@
form enctype=multipart/form-data method=post
tal:attributes=action
string:${display/@@absolute_url}/@@createPreset
label for=nameChoose a name
- input id=name style=padding: 1px type=text name=name /
+ input id=name size=30 type=text name=name /
/label
input type=hidden name=uri tal:attributes=value info/uri /
input type=hidden name=use value=1 /
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3368 - cpsskins/branches/paris-sprint-2006/setup
Author: jmorliaguet Date: Thu Jun 8 23:50:54 2006 New Revision: 3368 Modified: cpsskins/branches/paris-sprint-2006/setup/preset.py Log: - call the resource as 'data' to avoid a possible clash with the 'resource' attribute in case someone calls the preset 'resource' 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 8 23:50:54 2006 @@ -34,7 +34,7 @@ self.resource = resource # add a reference from the resource to the preset self.resource.__parent__ = self -self.resource.__name__ = name +self.resource.__name__ = u'data' def __repr__(self): return u'Preset: %s' % IIdentifiable(self).getURI() -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
