Author: jmorliaguet
Date: Mon May 29 23:49:28 2006
New Revision: 3270
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/presets_section.pt
Log:
- saving work
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 Mon May
29 23:49:28 2006
@@ -5,15 +5,6 @@
'preset-editor');
}
-function createPreset(section, uri) {
- CPSSkins.getModelById('presets-section').setData(
- {form: {section: section, uri: uri, create: 1}});
- CPSSkins.getControllerById('main-editor-perspectives').switchTo(
- 'site-manager');
- CPSSkins.getControllerById('site-manager-perspectives').switchTo(
- 'presets');
-}
-
function insertPortlet(info) {
var url = '@@insertElement';
var id = info.target.getAttribute('id');
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py Mon May
29 23:49:28 2006
@@ -29,7 +29,8 @@
'form': {
'id': '',
'format': '',
- 'data': {}
+ 'data': {},
+ 'mode': '',
},
}
},
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
Mon May 29 23:49:28 2006
@@ -45,11 +45,11 @@
<div class="form">
<ul style="float:right; font-style: normal" tal:define="tab
request/form/tab|nothing"
- tal:condition="tab" class="inlineTabs">
- <li><a tal:condition="not:preset"
- tal:attributes="href string:javascript:createPreset('$tab',
'${info/uri}')">create a preset</a>
- </li>
+ tal:condition="tab" class="inlineTabs">
+ <li tal:condition="python: not preset and mode != 'manage-presets'">
+ <a tal:attributes="href
string:javascript:CPSSkins.getModelById('element-editor').updateData({form:
{id: $id, tab: '${display/type:name}', mode: 'manage-presets'} })">create a
preset</a></li>
</ul>
+
<tal:block condition="python: mode == 'edit' and preset is None"
content="structure edited/@@edit.html" />
@@ -58,22 +58,22 @@
<tal:block content="structure info/preview" />
</fieldset>
-
- </div>
- <!--
- <div tal:condition="not:preset">
- <div>Create a preset</div>
- <form enctype="multipart/form-data" method="post"
- tal:attributes="action string:${edited/@@absolute_url}/@@createPreset">
- <p>
- <label for="title">Title</label>
- <input id="title" type="text" name="title" />
- <input type="submit" name="UPDATE_SUBMIT"
- i18n:translate="create-button" value="Create" />
- </p>
- </form>
+ <div tal:condition="python: not preset and mode == 'manage-presets'">
+ <fieldset class="panel">
+ <legend>Create a preset</legend>
+ <form enctype="multipart/form-data" method="post"
+ tal:attributes="action
string:${edited/@@absolute_url}/@@createPreset">
+ <p>
+ <label for="title">Title</label>
+ <input id="title" type="text" name="title" />
+ <input type="submit" name="UPDATE_SUBMIT"
+ i18n:translate="create-button" value="Create" />
+ </p>
+ </form>
+ </fieldset>
</div>
+ <!--
<tal:block condition="python: edited_type in preset_info">
<ul>
<li tal:repeat="preset preset_info/?edited_type">
@@ -82,7 +82,8 @@
</li>
</ul>
</tal:block>
-
-->
+ </div>
+
</tal:block>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/presets_section.pt
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/presets_section.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/presets_section.pt
Mon May 29 23:49:28 2006
@@ -1,35 +1,27 @@
<div class="sections" i18n:domain="cpsskins"
tal:define="section request/form/section|nothing">
- <form tal:condition="section" action="@@createPreset">
- <ul style="height: 120px; overflow: auto;" class="items"
- tal:define="preset_info context/@@getPresetsInfo;
- infos preset_info/?section|nothing">
- <li tal:condition="request/form/create|nothing">
- <input type="text" class="text" name="title" />
- <input type="hidden" name="uri"
- tal:attributes="value request/form/uri" />
- <input type="submit" class="submit" value="create" />
- </li>
- <li tal:repeat="info infos">
- <span tal:content="info/preset/title" />
- <tal:block define="name info/name;
- uri info/uri;
- readonly info/readonly;
- custom info/custom">
- <a tal:attributes="href string:@@customizePreset?uri=$uri"
- tal:condition="python: not custom and readonly">[customize]</a>
- <a tal:attributes="href string:@@removePreset?uri=$uri"
- tal:condition="python: not custom and not readonly">[remove]</a>
- <a tal:attributes="href string:@@decustomizePreset?uri=$uri"
- tal:condition="custom">[remove customization]</a>
- <a href="javascript:void(0)"
- tal:attributes="onclick string:editPreset('$uri')"
- tal:condition="not:readonly">[edit]</a>
- </tal:block>
- </li>
- <li tal:condition="not:infos"><em>no presets</em></li>
- </ul>
- </form>
+ <ul style="height: 120px; overflow: auto;" class="items"
+ tal:define="preset_info context/@@getPresetsInfo;
+ infos preset_info/?section|nothing">
+ <li tal:repeat="info infos">
+ <span tal:content="info/preset/title" />
+ <tal:block define="name info/name;
+ uri info/uri;
+ readonly info/readonly;
+ custom info/custom">
+ <a tal:attributes="href string:@@customizePreset?uri=$uri"
+ tal:condition="python: not custom and readonly">[customize]</a>
+ <a tal:attributes="href string:@@removePreset?uri=$uri"
+ tal:condition="python: not custom and not readonly">[remove]</a>
+ <a tal:attributes="href string:@@decustomizePreset?uri=$uri"
+ tal:condition="custom">[remove customization]</a>
+ <a href="javascript:void(0)"
+ tal:attributes="onclick string:editPreset('$uri')"
+ tal:condition="not:readonly">[edit]</a>
+ </tal:block>
+ </li>
+ <li tal:condition="not:infos"><em>no presets</em></li>
+ </ul>
<div tal:condition="not:section">
</div>
</div>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
