Author: jmorliaguet
Date: Sun May 21 00:56:06 2006
New Revision: 3177
Modified:
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/panels/element_editor.pt
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css
Log:
- cosmetic
- all widgets are available in the style editor
- settings can be edited again
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
Sun May 21 00:56:06 2006
@@ -1,4 +1,5 @@
-<div tal:define="widget_types view/getWidgetTypes;
+<div i18n:domain="cpsskins"
+ tal:define="widget_types view/getWidgetTypes;
style_id context/identifier">
<ins class="model" tal:content="view/getModelDef" />
@@ -17,7 +18,7 @@
<div class="inlineTabs" style="margin-bottom: 0.3em">
<a i18n:translate=""
tal:repeat="type widget_types"
- tal:content="string:widget.$type"
+ tal:content="string:widget.${type}"
tal:attributes="href
string:javascript:CPSSkins.getModelById('style-editor').updateData({widget:
'$type', selector: '', style_id: '$style_id'});" />
</div>
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 Sun May
21 00:56:06 2006
@@ -17,18 +17,15 @@
"""
__docformat__ = "reStructuredText"
-from zope.component import getUtility
from zope.app import zapi
from zope.app.cache.ram import RAMCache
from zope.app.session.interfaces import ISession
+from zope.component import getUtility, getUtilitiesFor
from cpsskins import configuration
from cpsskins import minjson as json
from cpsskins import utils
-from cpsskins.elements.interfaces import IFormattable
-from cpsskins.relations.interfaces import IRelatable
from cpsskins.setup.interfaces import IResourceManager
-from cpsskins.standard.formats.style import IStyle
from cpsskins.utils import getThemeManager
cache = RAMCache()
@@ -44,10 +41,7 @@
self.tmutil = getThemeManager(context)
def getWidgetTypes(self):
- display_id = self.request.form.get('display')
- display = self.tmutil.getElementById(display_id)
- widget = IFormattable(display).getFormat(u'widget')
- return widget.types
+ return [w[0] for w in getUtilitiesFor(configuration.IWidget)]
def renderWidgetPreview(self):
"""Render a style preview based on the specified widget.
@@ -123,7 +117,6 @@
resources = getUtility(IResourceManager)
style = resources.resolve(uri, context=self.context)
-
props = {}
for name in self.getFieldNames():
value = self.request.form.get(name)
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 Sun May
21 00:56:06 2006
@@ -49,8 +49,7 @@
</div>
<tal:block condition="python: mode == 'edit'">
- <div tal:condition="not:setting"
- class="form" tal:content="structure edited/@@edit.html" />
+ <div class="form" tal:content="structure edited/@@edit.html" />
</tal:block>
<div class="form" tal:condition="python: mode == 'preview'"
@@ -58,7 +57,7 @@
<div class="form" tal:condition="request/form/format|nothing">
<p tal:condition="setting">
- This format uses a site-wide setting which cannot be modified here.
+ This format uses a site-wide setting.
</p>
<div tal:condition="not:setting">
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
Sun May 21 00:56:06 2006
@@ -51,7 +51,10 @@
}
div.inlineTabs a {
- border-bottom: 1px solid #ccc;
- background-color: #eee;
+ margin-left: 0.2em;
+ background-color: #efc;
+ color: #060;
+ border: 1px solid #ccc;
+ padding: 0 0.4em
}
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
