Author: jmorliaguet
Date: Fri May 12 12:07:27 2006
New Revision: 3105
Removed:
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.css
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
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/style_editor_form.ctal
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/panels/element_editor.pt
cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
Log:
- cosmetic / UI changes
- TODO: reload the stylesheet when the styles are modified
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/configure.zcml
Fri May 12 12:07:27 2006
@@ -24,10 +24,6 @@
/>
<browser:resource
- name="style_editor.css" file="style_editor.css"
- layer="cpsskins.browser.skin.cpsskins" />
-
- <browser:resource
name="style_editor.js" file="style_editor.js"
layer="cpsskins.browser.skin.cpsskins" />
@@ -37,8 +33,8 @@
permission="zope.ManageContent">
<browser:page
- name="renderStylePreview"
- attribute="renderStylePreview"
+ name="renderWidgetPreview"
+ attribute="renderWidgetPreview"
/>
<browser:page
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
Fri May 12 12:07:27 2006
@@ -3,21 +3,16 @@
'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;
+ var selector = getSelectorInContext(target, $('previewArea'), style_id);
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) {
- var i, node, tag, name, selector;
+function getSelectorInContext(element, context, style_id) {
+ var i, node, tag, name, selector, classnames;
node = element;
// If no context is passed, use the document itself.
@@ -29,7 +24,8 @@
tag = node.tagName;
if (!tag) break;
tag = tag.toLowerCase();
- name = node.className;
+ classnames = node.className.replace(' style' + style_id, '').split(' ');
+ name = classnames.join('.');
selector = name ? tag + '.' + name : tag;
// ignore tags that have the "ignore" attribute set
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
Fri May 12 12:07:27 2006
@@ -27,13 +27,12 @@
<table width="100%">
<tr>
<td width="50%" valign="top">
- <h3>Preview</h3>
<div id="previewArea">
<ins class="view" tal:content="python: view.getPreviewDef()" />
</div>
</td>
- <td width="50%" valign="top">
- <h3>Style properties</h3>
+ <td width="5%"></td>
+ <td width="45%" valign="top">
<ins class="view" tal:content="python: view.getFormDef()" />
</td>
</tr>
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor_form.ctal
==============================================================================
---
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor_form.ctal
(original)
+++
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor_form.ctal
Fri May 12 12:07:27 2006
@@ -1,14 +1,21 @@
<form ctal:condition="selector"
action="@@setFormData" method="post" onsubmit="return false">
- <div ctal:content="selector">SELECTOR</div>
+ <p ctal:content="selector">SELECTOR</p>
- <p ctal:repeat="f fields">
- <label ctal:content="f/label">LABEL</label>
- <input type="text" ctal:attributes="value f/value; name f/name" />
- <span class="status" ctal:condition="f/status"
- ctal:content="f/status">STATUS</span>
- </p>
+ <table>
+ <tr ctal:repeat="f fields">
+ <td>
+ <label ctal:content="f/label">LABEL</label>
+ </td>
+ <td>
+ <input type="text" ctal:attributes="value f/value; name f/name" />
+ <span class="status" ctal:condition="f/status"
+ ctal:content="f/status">STATUS</span>
+ </td>
+ </tr>
+
+ </table>
<p>
<input type="submit" value="Save" />
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 12:07:27 2006
@@ -40,15 +40,19 @@
self.session = ISession(request)['cpsskins']
self.tmutil = getThemeManager(context)
- def renderStylePreview(self):
+ def renderWidgetPreview(self):
"""Render a style preview based on the specified widget.
"""
- widget_type = self.data.get(u'widget')
+ data = self.data
+ widget_type = data.get(u'widget')
+ style_id = data.get(u'style_id')
if widget_type is None:
return u''
widget = getUtility(configuration.IWidget, widget_type)
markup = widget.view(None, None).renderPreview()
- return utils.insertCSSClass(markup, utils.camelize(widget_type))
+ markup = utils.insertCSSClass(markup, utils.camelize(widget_type))
+ markup = utils.insertCSSClass(markup, u'style' + style_id)
+ return markup
def getModelDef(self):
path = zapi.getPath(self.context)
@@ -62,7 +66,7 @@
}
},
'data': {
- 'preview_url': '/++skin++cpsskins/%s/@@renderStylePreview' % \
+ 'preview_url': '/++skin++cpsskins/%s/@@renderWidgetPreview' % \
path,
'widget': '',
'selector': '',
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 12:07:27 2006
@@ -4,8 +4,8 @@
_ = MessageFactory('cpsskins')
MODELS = {
- 'css': {
- 'id': 'css',
+ 'stylesheet': {
+ 'id': 'stylesheet',
'data': {
'url': '',
'css': './renderCSS',
@@ -157,12 +157,12 @@
}
VIEWS = {
- 'css': {
- 'id': 'css',
+ 'stylesheet': {
+ 'id': 'stylesheet',
'widget': {
'type': 'panel',
},
- 'model': 'css',
+ 'model': 'stylesheet',
'perspectives': ['page-designer', 'layout-designer', 'content-author',
'element-editor'],
'controllers': ['main-editor-perspectives'],
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt Fri May
12 12:07:27 2006
@@ -27,14 +27,15 @@
tal:content="info/element/name" />
<a i18n:translate=""
- tal:attributes="
- href
string:javascript:CPSSkins.getModelById('element-editor').updateData({'form':
{'id': '$id', 'format': '', 'mode': 'preview'}})">Preview</a>
-
- <a i18n:translate=""
tal:repeat="format info/formats"
tal:attributes="
href
string:javascript:CPSSkins.getModelById('element-editor').updateData({'script':
'/++skin++cpsskins/@@/++resource++style_editor.js', 'form': {'id': '$id',
'format': '${format/id}'}})"
tal:content="format/name" />
+
+ <a i18n:translate=""
+ tal:attributes="
+ href
string:javascript:CPSSkins.getModelById('element-editor').updateData({'form':
{'id': '$id', 'format': '', 'mode': 'preview'}})">Preview</a>
+
</div>
<div class="form" tal:condition="python: mode == 'edit'"
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 Fri May 12
12:07:27 2006
@@ -13,11 +13,12 @@
<script type="text/javascript" src="++resource++ctal.js"></script>
<script type="text/javascript" src="++resource++cpsskins.js"></script>
<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>
+ <ins class="model" cite="@@getModel?id=stylesheet"></ins>
+ <ins class="view" cite="@@getView?id=stylesheet"></ins>
<div class="floatingHeader">
<ins class="model" cite="@@getModel?id=action-pad"></ins>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
