Author: jmorliaguet
Date: Sat May 27 15:03:02 2006
New Revision: 3244

Modified:
   cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js
   cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
   cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt
   
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:

- cosmetic /UI



Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js
==============================================================================
--- cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js    
(original)
+++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js    Sat May 
27 15:03:02 2006
@@ -2385,6 +2385,12 @@
   /* Event handlers */
   showEvent: function(e) {
     if (this.wait) return;
+    this.mouseX = Event.pointerX(e);
+    this.mouseY = Event.pointerY(e);
+
+    if (Math.abs(this.mouseX - this.startX) > 2 ||
+        Math.abs(this.mouseY != this.startY) > 2) return;
+
     var element = Event.element(e);
     var selected = CPSSkins.Identifiable.getIdentifiable(element);
     if (!selected) return;
@@ -2392,10 +2398,6 @@
       this.wait = true;
       return;
     }
-
-    this.mouseX = Event.pointerX(e);
-    this.mouseY = Event.pointerY(e);
-
     var widget = this.widget;
 
     this.selected = selected;
@@ -2413,6 +2415,9 @@
     this._displayed = false;
     this.defocus();
     this.hide();
+
+    this.startX = Event.pointerX(e);
+    this.startY = Event.pointerY(e);
   },
 
   callEvent: function(e) {

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 Sat May 
27 15:03:02 2006
@@ -276,3 +276,15 @@
   height: expression('40px'); /* for IE 'height' is 'min-height' */
 }
 
+img.hover {
+  margin: 3px;
+  border-width: 1px;
+  border-color: transparent;
+  border-style: solid;
+}
+
+img.hover:hover {
+  border: 1px solid #fc0;
+  background-color: #ffc;
+  cursor: pointer;
+}

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  Sat May 
27 15:03:02 2006
@@ -17,7 +17,7 @@
 function insertPortlet(info) {
   var url = '@@insertElement'
   var args = {
-    id: info.target.getAttribute('targetid'),
+    id: info.target.getAttribute('id'),
     type_name: info.source.getAttribute('type_name'),
     order: 0
   }
@@ -61,10 +61,10 @@
   var args = {
     id: info.target.getAttribute('id')
   }
-  var controller = info.context;
   var options = {
     parameters: $H(args).toQueryString(),
     onComplete: function(req) {
+      var controller = info.context;
       controller.refreshViews();
     }
   }
@@ -76,10 +76,10 @@
   var args = {
     id: info.target.getAttribute('id')
   }
-  var controller = info.context;
   var options = {
     parameters: $H(args).toQueryString(),
     onComplete: function(req) {
+      var controller = info.context;
       controller.refreshViews();
     }
   }

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 15:03:02 2006
@@ -34,8 +34,9 @@
 
   <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"
+    <img class="hover"
+         tal:attributes="id cell_id" width="12" height="12"
+         title="edit this cell" style="padding: 3px"
          src="/++skin++cpsskins/@@/edit-12.png" />
   </div>
 

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 15:03:02 2006
@@ -83,7 +83,7 @@
 }
 
 .sizer input {
-  border: 1px solid #999;
+  border: 1px solid #aaa;
   font-size: 0.9em;
   text-align: center;
   padding: 0 2px;

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 15:03:02 2006
@@ -32,8 +32,9 @@
 
         <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"
+          <img class="hover"
+               tal:attributes="id pageblock_id" width="12" height="12"
+               title="edit this page block" style="padding: 3px"
                src="/++skin++cpsskins/@@/edit-12.png" />
         </div>
 

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 15:03:02 2006
@@ -1,4 +1,4 @@
-<td style="border: 1px dashed #eee; vertical-align: top"
+<td style="vertical-align: top"
   tal:define="
     info options/info;
     globals nocall:info/globals;
@@ -17,8 +17,8 @@
 
   <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"
+    <img class="hover" tal:attributes="id id" width="12" height="12"
+         title="edit this cell" style="padding: 3px"
          src="/++skin++cpsskins/@@/edit-12.png" />
   </div>
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to