Author: jmorliaguet
Date: Wed May 31 16:46:55 2006
New Revision: 3280
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/edit.pt
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
Log:
- cosmetic / added a stopUsingPreset method
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js Wed May
31 16:46:55 2006
@@ -92,7 +92,7 @@
'activate area': function(e) {
var target = e.currentTarget;
target._before_activate = target.getStyle('background-color');
- target.setStyle({'background-color': '#ffc'})
+ target.setStyle({'background-color': '#fff066'})
},
'deactivate area': function(e) {
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/edit.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/edit.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/edit.pt
Wed May 31 16:46:55 2006
@@ -1,6 +1,6 @@
<fieldset class="panel">
- <legend class="panelTitle">Edit form</legend>
+ <legend class="panelTitle">Edit settings</legend>
<form action="." tal:attributes="action
string:${context/@@absolute_url}/@@submitFormData">
<table>
<tr tal:repeat="formdata context/@@getFormData">
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
Wed May 31 16:46:55 2006
@@ -65,7 +65,16 @@
<tr>
<td style="vertical-align: top; width: 50%">
<fieldset class="panel" tal:condition="preset">
- <legend class="panelTitle">Stop using a preset</legend>
+ <legend class="panelTitle">Unselect the preset</legend>
+ <p>The '<cite tal:content="preset/name" />' preset is currently
+ being used.</p>
+ <form enctype="multipart/form-data" method="post"
+ tal:attributes="action
string:${display/@@absolute_url}/@@stopUsingPreset">
+ <p>
+ <input type="submit" name="UPDATE_SUBMIT"
+ value="Unselect" />
+ </p>
+ </form>
</fieldset>
<fieldset class="panel" tal:condition="not:preset">
<legend class="panelTitle">Create a preset</legend>
@@ -82,11 +91,11 @@
</fieldset>
<fieldset class="panel"
tal:condition="python: edited_type in preset_info">
- <legend class="panelTitle">Use an existing preset</legend>
+ <legend class="panelTitle">Select a preset</legend>
<ul class="inlineTabs">
<li tal:repeat="preset preset_info/?edited_type">
<a href="" tal:content="preset/name"
- tal:attributes="href
string:${display/@@absolute_url}/@@usePresetAsFormat?uri=${preset/uri}" /></li>
+ tal:attributes="href
string:${display/@@absolute_url}/@@usePreset?uri=${preset/uri}" /></li>
</ul>
</fieldset>
</td>
@@ -97,6 +106,9 @@
<tal:block condition="preset"
content="string:'${preset/name}'" />
</legend>
+ <ul style="float:right" class="inlineTabs"
tal:condition="preset">
+ <li><a tal:attributes="href
string:${preset/@@absolute_url}/@@edit.html">modify settings</a></li>
+ </ul>
<tal:block content="structure info/preview" />
</fieldset>
</td>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/configure.zcml
Wed May 31 16:46:55 2006
@@ -68,8 +68,13 @@
/>
<page
- name="usePresetAsFormat"
- attribute="usePresetAsFormat"
+ name="usePreset"
+ attribute="usePreset"
+ />
+
+ <page
+ name="stopUsingPreset"
+ attribute="stopUsingPreset"
/>
<page
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py Wed May
31 16:46:55 2006
@@ -113,8 +113,8 @@
resources.register(title=title, resource=resource, context=context)
- def usePresetAsFormat(self, uri=u''):
- """Use a preset specified by its URI as a format
+ def usePreset(self, uri=u''):
+ """Use a preset specified by its URI
The context is the display
@@ -146,6 +146,17 @@
predicate=predicate)
reltool.add(relation)
+ def stopUsingPreset(self):
+ context = self.context
+ if not uri:
+ raise KeyError("Must specify a preset's URI.")
+
+ if not IDisplay.providedBy(context):
+ raise TypeError("The context must be a display.")
+
+ reltool = IRelationTool(context)
+ # TODO
+
### Sites #########################################################
def importSite(self, file=None):
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
