Author: jmorliaguet
Date: Fri May 12 14:18:56 2006
New Revision: 3107

Modified:
   cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
   cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js
   cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
   
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css

Log:

- UI updates



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 Fri May 
12 14:18:56 2006
@@ -44,9 +44,9 @@
         """Render a style preview based on the specified widget.
         """
         data = self.data
-        widget_type = data.get(u'widget')
+        widget_type = data.get(u'widget', u'')
         style_id = data.get(u'style_id')
-        if widget_type is None:
+        if not widget_type:
             return u''
         widget = getUtility(configuration.IWidget, widget_type)
         markup = widget.view(None, None).renderPreview()
@@ -125,7 +125,8 @@
         return self.getStyleData()
 
     def getFieldNames(self):
-        return u'color', u'background-color', u'padding', u'border'
+        return (u'font', u'color', u'background-color', u'padding', u'margin',
+                u'border', u'text-transform')
 
     def getStyleData(self):
         data = self.data

Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js       
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js       Fri May 
12 14:18:56 2006
@@ -33,6 +33,8 @@
   var id = info.target.getAttribute('targetid');
   CPSSkins.getModelById('element-editor').updateData({'form': {'id': id, 
'format': ''} });
   
CPSSkins.getControllerById('main-editor-perspectives').switchTo('element-editor')
+  var style_editor_model = CPSSkins.getModelById('style-editor');
+  if (style_editor_model) style_editor_model.updateData({'widget': ''});
 }
 
 function duplicateElement(info) {

Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py     
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py     Fri May 
12 14:18:56 2006
@@ -6,10 +6,7 @@
 MODELS = {
     'stylesheet': {
         'id': 'stylesheet',
-        'data': {
-            'url': '',
-            'css': './renderCSS',
-        }
+        'data': {}
     },
 
     'action-pad': {

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css 
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css 
    Fri May 12 14:18:56 2006
@@ -49,7 +49,7 @@
 }
 
 div.inlineTabs a {
-  border: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
   background-color: #eee;
-  margin: 0.5em 0;
 }
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to