Author: jmorliaguet
Date: Sun May 14 00:46:10 2006
New Revision: 3128
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
cpsskins/branches/paris-sprint-2006/ui/editing/views.py
cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt
Log:
- simplifications
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 14 00:46:10 2006
@@ -1,9 +1,10 @@
-<div i18n:domain="cpsskins"
- tal:define="displays context/findDisplays;
- display python: displays[0];
- id context/identifier;
- widget display/formattable:widget;
- widget_types widget/types">
+<tal:block define="displays context/findDisplays"
+ condition="displays">
+
+<div tal:define="display python: displays[0];
+ id context/identifier;
+ widget display/formattable:widget;
+ widget_types widget/types">
<ins class="model" tal:content="view/getModelDef" />
@@ -39,5 +40,6 @@
</td>
</tr>
</table>
-
</div>
+
+</tal:block>
Modified: cpsskins/branches/paris-sprint-2006/ui/editing/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/editing/views.py (original)
+++ cpsskins/branches/paris-sprint-2006/ui/editing/views.py Sun May 14
00:46:10 2006
@@ -32,7 +32,7 @@
from cpsskins.relations.interfaces import IRelationTool
from cpsskins.relations.relations import DyadicRelation
from cpsskins.setup.interfaces import IResourceManager, IResource, ISetting
-from cpsskins.setup.interfaces import IType
+from cpsskins.setup.interfaces import IType, IIdentifiable
from cpsskins.storage.interfaces import IStorage
from cpsskins.utils import getThemeManager
@@ -133,8 +133,6 @@
format_name = form.get('format')
element_id = form.get('id')
- edited_id = format_name or element_id
-
negotiation = getMultiAdapter((context, request),
INegotiation, 'negotiation')
perspective = negotiation.getPerspective()
@@ -143,6 +141,7 @@
formattable = IFormattable(display)
# Edited element
+ edited = context
element_info = {
'name': IType(context).getTypeName(),
'id': context.identifier,
@@ -156,35 +155,17 @@
is_setting = ISetting.providedBy(f)
if is_setting:
f = IResource(f).getResource()
+ else:
+ id = f.identifier
+
name = IType(f).getTypeName()
selected = name == format_name
if selected:
- format = f
+ edited = f
if is_setting:
format_is_setting = True
- formats_info.append({
- 'name': name,
- 'id': f.identifier,
- })
-
- # Actions
- actions_info = []
- if format_name and not format_is_setting:
- actions_info.extend([{
- 'title': u'Create setting',
- 'url': '%s/@@create-setting.html?format=%s' % (
- self.getAbsoluteURL(format), format_name),
- 'icon': u'create-setting-16.png',
- },
- {
- 'title': u'Use setting',
- 'url': '%s/@@use-setting.html?format=%s' % (
- self.getAbsoluteURL(display), format_name),
- 'icon': u'use-setting-16.png',
- }])
-
- # Main area
+ formats_info.append({'name': name, 'id': id})
viewer = getMultiAdapter((context, request), IViewer)
preview = viewer()
@@ -196,8 +177,7 @@
'format_name': format_name,
'element': element_info,
'formats': formats_info,
- 'actions' : actions_info,
- 'edited': tmutil.getElementById(edited_id),
+ 'edited': edited,
'preview': preview,
}
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
14 00:46:10 2006
@@ -30,7 +30,7 @@
<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}'}})"
+ href
string:javascript:CPSSkins.getModelById('element-editor').updateData({'script':
'/++skin++cpsskins/@@/++resource++style_editor.js', 'form': {'id': '$id',
'format': '${format/name}'}})"
tal:content="format/name" />
<a i18n:translate=""
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
