Author: jmorliaguet Date: Wed May 10 16:36:38 2006 New Revision: 3096 Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js 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 cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
Log: - attempt to update CSS on-the-fly. Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js ============================================================================== --- cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js (original) +++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js Wed May 10 16:36:38 2006 @@ -2124,10 +2124,6 @@ }, render: function(data) { - var url = data[this.url_field] - if (!url) { - return; - } var script = data.script; if (script) { this.script_id = this.def.model; @@ -2141,6 +2137,7 @@ } var view = this; + var url = data[this.url_field] if (url) { var widget = this.widget; var model = this.model; 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 Wed May 10 16:36:38 2006 @@ -1,13 +1,19 @@ CPSSkins.addActions({ - 'selectTag': function(info) { + 'selectTag': function(info) { var target = info.target; target.style.backgroundColor = '#ffc'; var selector = getSelectorInContext(target, $('previewArea')); var style_id = CPSSkins.getModelById('element-editor').getData().form.format; CPSSkins.getModelById('style-editor').updateData({'selector': selector, 'style_id': style_id}); + }, + + 'updateCSS': function(info) { + var css = './renderCSS?nocache=' + new Date().getTime(); + CPSSkins.getModelById('css').setData({'css': css}); } + }); function getSelectorInContext(element, context) { 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 Wed May 10 16:36:38 2006 @@ -8,11 +8,14 @@ <ins class="model" tal:content="python: view.getModelDef()" /> <ins class="controller"> - {"id": "style-editor-preview", + {"id": "style-editor-actions", "type": "behaviour", "rules": { "#previewArea": { "click": "selectTag" + }, + "input": { + "change": "updateCSS" } }} </ins> 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 Wed May 10 16:36:38 2006 @@ -79,7 +79,7 @@ 'url': 'preview_url', }, 'model': 'style-editor', - 'controllers': ['style-editor-preview', 'main-editor-perspectives'], + 'controllers': ['style-editor-actions', 'main-editor-perspectives'], 'perspectives': ['element-editor'], }) @@ -92,7 +92,7 @@ path, }, 'model': 'style-editor', - 'controllers': ['style-editor-preview', 'main-editor-perspectives'], + 'controllers': ['style-editor-actions', 'main-editor-perspectives'], 'perspectives': ['element-editor'], }) 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 Wed May 10 16:36:38 2006 @@ -4,6 +4,14 @@ _ = MessageFactory('cpsskins') MODELS = { + 'css': { + 'id': 'css', + 'data': { + 'url': '', + 'css': './renderCSS', + } + }, + 'action-pad': { 'id': 'action-pad', 'data': { @@ -149,6 +157,16 @@ } VIEWS = { + 'css': { + 'id': 'css', + 'widget': { + 'type': 'panel', + }, + 'model': 'css', + 'perspectives': ['page-designer', 'layout-designer', 'content-author', + 'element-editor'], + 'controllers': ['main-editor-perspectives'], + }, # Top area 'action-pad': { Modified: cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt Wed May 10 16:36:38 2006 @@ -15,6 +15,10 @@ <script type="text/javascript" src="++resource++authoring.js"></script> </head> <body> + + <ins class="model" cite="@@getModel?id=css"></ins> + <ins class="view" cite="@@getView?id=css"></ins> + <div class="floatingHeader"> <ins class="model" cite="@@getModel?id=action-pad"></ins> <ins class="view" cite="@@getView?id=action-pad"></ins> -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins