Author: jmorliaguet
Date: Tue May 30 17:32:43 2006
New Revision: 3278

Modified:
   cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
   
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css
   
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element_editor.pt

Log:

- saving work



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  
Tue May 30 17:32:43 2006
@@ -21,6 +21,7 @@
       <a i18n:translate="" tal:content="string:widget.${type}"
          tal:attributes="href 
string:javascript:CPSSkins.getModelById('style-editor').updateData({widget: 
'$type', selector: '', style_id: '$style_id'});" /></li>
   </ul>
+  <div style="clear:both"></div>
 
   <table style="width: 100%">
     <tr>

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css Tue May 
30 17:32:43 2006
@@ -226,12 +226,22 @@
   margin: 0em;
 }
 
+.inlineTabs span {
+  display: block;
+  float: left;
+  margin: 2px;
+  padding: 2px;
+}
+
 .inlineTabs li {
   white-space: nowrap;
   display: inline;
   text-decoration: none;
   padding: 2px 0px 2px 14px;
   background: #fff url(/++skin++cpsskins/@@/rl-tab.png) top left no-repeat;
+  display: block;
+  float: left;
+  margin: 2px;
 }
 
 .inlineTabs a {

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 
    Tue May 30 17:32:43 2006
@@ -44,10 +44,10 @@
 }
 
 fieldset.panel {
-  padding: 1.5em;
+  padding: 1em;
   border: 1px solid #999;
   background-color: #fff;
-  margin: 1em;
+  margin: 0.5em;
 }
 
 fieldset.panel legend.panelTitle {

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  
    Tue May 30 17:32:43 2006
@@ -60,11 +60,29 @@
     </fieldset>
 
     <div tal:condition="python: mode == 'manage-presets' or preset">
-      <table style="width: 100%">
+
+      <table style="width: 100%" cellpadding="0" cellspacing="0">
         <tr>
           <td style="vertical-align: top; width: 50%">
-            <fieldset class="panel" tal:condition="python: edited_type in 
preset_info">
-              <legend class="panelTitle">Use a preset</legend>
+            <fieldset class="panel" tal:condition="preset">
+              <legend class="panelTitle">Stop using a preset</legend>
+            </fieldset>
+            <fieldset class="panel" tal:condition="not:preset">
+              <legend class="panelTitle">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="hidden" name="uri" tal:attributes="value 
info/uri" />
+                  <input type="submit" name="UPDATE_SUBMIT"
+                         i18n:translate="create-button" value="Create" />
+                </p>
+              </form>
+            </fieldset>
+            <fieldset class="panel"
+                      tal:condition="python: edited_type in preset_info">
+              <legend class="panelTitle">Use an existing preset</legend>
               <ul class="inlineTabs">
                 <li tal:repeat="preset preset_info/?edited_type">
                   <a href="" tal:content="preset/name"
@@ -74,26 +92,17 @@
           </td>
           <td style="vertical-align: top; width: 50%">
             <fieldset class="panel">
-              <legend class="panelTitle">Preview</legend>
+              <legend class="panelTitle">
+               Preview
+               <tal:block condition="preset"
+                          content="string:'${preset/name}'" />
+              </legend>
               <tal:block content="structure info/preview" />
             </fieldset>
           </td>
         </tr>
       </table>
 
-      <fieldset class="panel" tal:condition="not:preset">
-        <legend class="panelTitle">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="hidden" name="uri" tal:attributes="value info/uri" />
-            <input type="submit" name="UPDATE_SUBMIT"
-             i18n:translate="create-button" value="Create" />
-          </p>
-        </form>
-      </fieldset>
     </div>
 
   </div>
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to