Author: jmorliaguet
Date: Sat May 20 16:30:05 2006
New Revision: 3174
Modified:
cpsskins/branches/paris-sprint-2006/ui/editing/views.py
cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt
Log:
- UI updates
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 Sat May 20
16:30:05 2006
@@ -171,8 +171,8 @@
if is_setting:
setting = format
- formats.append({'name': format_name, 'id': f.identifier,
- 'uri': uri})
+ formats.append({'name': format_name, 'id': f.identifier or 0,
+ 'uri': uri, 'is_setting': is_setting})
viewer = getMultiAdapter((context, request), IViewer)
preview = viewer()
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 Sat May
20 16:30:05 2006
@@ -49,17 +49,17 @@
</div>
<tal:block condition="python: mode == 'edit'">
- <div class="form" tal:content="structure edited/@@edit.html" />
+ <div tal:condition="not:setting"
+ class="form" tal:content="structure edited/@@edit.html" />
</tal:block>
<div class="form" tal:condition="python: mode == 'preview'"
tal:content="structure info/preview" />
- <div class="form" tal:condition="request/form/format|nothing">
- <div tal:condition="setting">
- Warning: this is a site setting.
- Changes made to it may affect several site elements.
- </div>
+ <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.
+ </p>
<div tal:condition="not:setting">
<div>Create a setting</div>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
