Author: jmorliaguet
Date: Mon May 15 22:54:50 2006
New Revision: 3143
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.js
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
Log:
- the style id was not always set correctly when editing elements.
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.js
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.js
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.js
Mon May 15 22:54:50 2006
@@ -4,7 +4,8 @@
var target = info.target;
var data = CPSSkins.getModelById('element-editor').getData();
var uri = data.form.uri;
- var style_id = data.form.format;
+ var style_data = CPSSkins.getModelById('style-editor').getData();
+ var style_id = style_data.style_id;
var selector = getSelectorInContext(target, $('previewArea'), style_id);
CPSSkins.getModelById('style-editor').updateData({selector: selector, uri:
uri});
},
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
Mon May 15 22:54:50 2006
@@ -1,4 +1,5 @@
-<div tal:define="widget_types view/getWidgetTypes">
+<div tal:define="widget_types view/getWidgetTypes;
+ style_id context/identifier">
<ins class="model" tal:content="view/getModelDef" />
@@ -17,7 +18,7 @@
<a i18n:translate=""
tal:repeat="type widget_types"
tal:content="string:widget.$type"
- tal:attributes="href
string:javascript:CPSSkins.getModelById('style-editor').updateData({widget:
'$type', selector: ''});" />
+ tal:attributes="href
string:javascript:CPSSkins.getModelById('style-editor').updateData({widget:
'$type', selector: '', style_id: '$style_id'});" />
</div>
<table width="100%">
Modified: cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py Mon May
15 22:54:50 2006
@@ -54,14 +54,14 @@
"""
data = self.data
widget_type = data.get(u'widget', u'')
+ style_id = data.get(u'style_id')
if not widget_type:
return u''
widget = getUtility(configuration.IWidget, widget_type)
markup = widget.view(None, None).renderPreview()
markup = utils.insertCSSClass(markup, utils.camelize(widget_type))
- style_id = unicode(IRelatable(self.context))
- markup = utils.insertCSSClass(markup, u'style' + style_id)
+ markup = utils.insertCSSClass(markup, u'style' + unicode(style_id))
return markup
def getModelDef(self):
@@ -81,6 +81,7 @@
'widget': '',
'selector': '',
'fields': [],
+ 'style_id': '',
'uri': '',
},
})
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
