Author: jmorliaguet
Date: Sat May 27 12:57:53 2006
New Revision: 3242

Added:
   cpsskins/branches/paris-sprint-2006/ui/screens/common/icons/edit-12.png   
(contents, props changed)
Modified:
   cpsskins/branches/paris-sprint-2006/ui/screens/common/icons/configure.zcml
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt
   
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml
   
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
   
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt

Log:

- cells / pageblocks can be edited in layout mode

- cells can be edited in wysiwyg mode



Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/common/icons/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/icons/configure.zcml  
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/icons/configure.zcml  
Sat May 27 12:57:53 2006
@@ -3,6 +3,10 @@
     xmlns:zope="http://namespaces.zope.org/zope";>
 
   <resource
+      name="edit-12.png" file="edit-12.png"
+      layer="cpsskins.browser.skin.cpsskins" />
+
+  <resource
       name="copy-16.png" file="copy-16.png"
       layer="cpsskins.browser.skin.cpsskins" />
 

Added: cpsskins/branches/paris-sprint-2006/ui/screens/common/icons/edit-12.png
==============================================================================
Binary file. No diff available.

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt  
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt  
Sat May 27 12:57:53 2006
@@ -1,4 +1,4 @@
-<td class="editable draggable" destination="cell" style="vertical-align:top"
+<td style="vertical-align:top"
   tal:define="
     info options/info;
     display info/display;
@@ -9,7 +9,6 @@
     width layout/width"
   tal:attributes="
     id cell_id;
-    targetid cell_id;
     width width;">
 
   <div class="cellEditHeader">
@@ -30,16 +29,14 @@
     tal:attributes="value python: width and width or '?'" />
   </form>
 
-<!-- for testing: move to a view -->
-<ins class="model">
-{"id": "m1",
- "data": {
-   "editable":true
-}}
-</ins>
-
-  <div class="container portletTarget" focus="1" destination="cellcontained"
-       tal:attributes="targetid cell_id"
+  <div class="portletTarget"
        tal:content="structure options/markup" />
 
+  <div style="text-align: center">
+    <ins class="model" tal:content="context/@@getModel" />
+    <img tal:attributes="id cell_id" width="12" height="12"
+         title="edit this cell" style="padding: 8px"
+         src="/++skin++cpsskins/@@/edit-12.png" />
+  </div>
+
 </td>

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml  
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/engine.zcml  
    Sat May 27 12:57:53 2006
@@ -40,6 +40,10 @@
         name="pageblock editor (layout mode)"
     />
 
+    <filter
+        name="style"
+    />
+
   </renderer>
 
   <renderer
@@ -50,6 +54,10 @@
         name="cell editor (layout mode)"
     />
 
+    <filter
+        name="style"
+    />
+
   </renderer>
 
   <renderer

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
  (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
  Sat May 27 12:57:53 2006
@@ -83,9 +83,11 @@
 }
 
 .sizer input {
-  border: none;
-  background-color: white;
+  border: 1px solid #999;
+  font-size: 0.9em;
   text-align: center;
+  padding: 0 2px;
+  background-color: white;
 }
 
 .cellEditHeader {

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt 
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt 
    Sat May 27 12:57:53 2006
@@ -1,7 +1,6 @@
 <tal:block
   define="
     info options/info;
-    globals info/globals;
     display info/display;
     title context/title;
     layout display/formattable:layout;
@@ -10,10 +9,7 @@
     width layout/width">
 
   <table cellpadding="0" cellspacing="0" class="pageBlockEdit"
-   tal:attributes="
-     width width;
-     id pageblock_id;
-     targetid pageblock_id">
+   tal:attributes="width width">
     <tr>
       <td>
         <form class="pageBlockEditHeader" action="@@editElement">
@@ -27,18 +23,26 @@
                    src="/++skin++cpsskins/@@/movedown-12.png" />
             </a>
           </span>
+
           <input type="hidden" name="id" tal:attributes="value pageblock_id" />
           <input type="hidden" name="name" value="title" />
-          <input class="editable" name="value" type="text" size="15"
+          <input name="value" type="text" size="15"
           tal:attributes="value title" />
         </form>
 
+        <div style="text-align: center">
+          <ins class="model" tal:content="context/@@getModel" />
+          <img tal:attributes="id pageblock_id" width="12" height="12"
+               title="edit this page block" style="padding-top: 3px"
+               src="/++skin++cpsskins/@@/edit-12.png" />
+        </div>
+
         <form class="sizer" action="@@editElement">
           <b class="left"></b>
           <b class="right"></b>
           <input type="hidden" name="id" tal:attributes="value layout_id" />
           <input type="hidden" name="name" value="width" />
-          <input class="input editable" name="value" type="text" size="4"
+          <input name="value" type="text" size="4"
            tal:attributes="value python: width and width or '?'" />
         </form>
       </td>

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt 
Sat May 27 12:57:53 2006
@@ -1,24 +1,25 @@
-<td style="border: 1px dashed #eee; vertical-align: top" class="editable"
+<td style="border: 1px dashed #eee; vertical-align: top"
   tal:define="
     info options/info;
     globals nocall:info/globals;
     display info/display;
-    perspective globals/perspective;
-    formats display/formattable:getFormatNames;
     title context/title;
     id context/identifier;
     layout display/formattable:layout;
     layout_id layout/identifier;
     width layout/width"
   tal:attributes="
-    editable python:1;
-    formattable python: formats and 1 or 0;
-    formats python: ' '.join(formats);
     id id;
     width width;">
 
-  <div class="container portletTarget" focus="1"
-       tal:attributes="targetid id"
+  <div class="container portletTarget"
        tal:content="structure options/markup" />
 
+  <div style="text-align: center">
+    <ins class="model" tal:content="context/@@getModel" />
+    <img tal:attributes="id id" width="12" height="12"
+         title="edit this cell" style="padding: 8px"
+         src="/++skin++cpsskins/@@/edit-12.png" />
+  </div>
+
 </td>
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to