Author: jmorliaguet
Date: Wed Jun 14 10:53:13 2006
New Revision: 3405
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/page_modes.pt
cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
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 Wed Jun
14 10:53:13 2006
@@ -874,7 +874,6 @@
startDrag: function(x, y) {
var dragging = this.def.dragging;
var shifting = this.def.shifting;
-
var draggable = this.target;
if (dragging.offset_x || dragging.offset_y ) {
@@ -885,33 +884,26 @@
this.y1 = y - this.y0;
}
- if (this.def.dragging.feedback) {
- var dim = draggable.getDimensions();
+ if (dragging.feedback) {
var feedback = CPSSkins.Canvas.createNode({tag: 'div'});
+ Position.clone(draggable, feedback);
feedback.setStyle({
- zIndex: parseInt(draggable.getStyle('z-index') || 0) +1,
- width: dim.width + 'px',
- height: dim.height + 'px'
+ zIndex: parseInt(draggable.getStyle('z-index') || 0) +1
});
- if (this.def.dragging.feedback.clone) {
+ if (dragging.feedback.clone) {
var clone = $(draggable.cloneNode(true));
clone.setStyle({
margin: '0',
- borderColor: this.def.dragging.feedback.border || '#000',
- backgroundColor: this.def.dragging.feedback.background || '#fff',
- borderStyle: 'dashed',
- borderWidth: '1px',
});
feedback.appendChild(clone);
- } else {
- feedback.setStyle({
- borderColor: this.def.dragging.feedback.border || '#000',
- backgroundColor: this.def.dragging.feedback.background || '#fc3',
- borderStyle: 'solid',
- borderWidth: '1px'
- })
}
- feedback.setOpacity(this.def.dragging.feedback.opacity);
+ feedback.setStyle({
+ borderColor: dragging.feedback.border || '#000',
+ backgroundColor: dragging.feedback.background || '#fc3',
+ borderStyle: 'solid',
+ borderWidth: '1px'
+ })
+ feedback.setOpacity(dragging.feedback.opacity);
document.getElementsByTagName('body')[0].appendChild(feedback);
this.moved = feedback;
} else {
@@ -920,7 +912,7 @@
}
}
this.dragged = draggable;
- this.dragged.setOpacity(this.def.dragging.opacity || 0.8);
+ this.dragged.setOpacity(dragging.opacity || 0.8);
this.moved.setStyle({position: 'absolute', cursor: 'move'});
this.moved.moveTo({x: x-this.x1, y: y-this.y1});
@@ -935,6 +927,7 @@
});
}
}
+
},
moveEvent: function(e) {
@@ -1001,6 +994,7 @@
dropEvent: function(e) {
Event.stopObserving(document, "mousemove", this.moveEvent);
Event.stopObserving(document, "mouseup", this.dropEvent);
+ var dragging = this.def.dragging;
if (!this.dragged) return;
@@ -1020,7 +1014,7 @@
}.bind(this));
}
- var zoomback = this.def.dragging.zoomback;
+ var zoomback = dragging.zoomback;
if (inTarget) {
zoomback = false;
}
@@ -1038,7 +1032,7 @@
}
}
- if (this.def.dragging.feedback) {
+ if (dragging.feedback) {
if (zoomback && moved) {
moved.moveTo({
x: this.x0,
@@ -1070,11 +1064,11 @@
}
}
- if (this.def.dragging.feedback && !zoomback && !zoomto && moved) {
+ if (dragging.feedback && !zoomback && !zoomto && moved) {
moved.parentNode.removeChild(moved);
}
- if (this.def.dragging.opacity && this.dragged) {
+ if (dragging.opacity && this.dragged) {
this.dragged.setOpacity(1);
}
@@ -1863,8 +1857,9 @@
CPSSkins.View.prototype = {
initialize: function(widget, def) {
- this.widget = widget;
this.def = def;
+ this.widget = widget;
+ this.widget.view_id = this.hash();
this.subviews = def.subviews || $A([]);
this._visible = false;
this._displayed = true;
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 Wed Jun
14 10:53:13 2006
@@ -63,23 +63,30 @@
left: 0;
width: 100%;
background-color: #ccc;
- border-top: 2px solid #666;
- height: 17px;
+ background: #aaa url(++resource++gray-gradient.png) bottom left repeat-x;
+ border-top: 1px solid #666;
+ height: 18px;
z-index: 20;
font: 13px arial;
- padding-left: 10px;
+ padding: 2px;
}
div.floatingFooter a {
- color: #006;
- padding-right: 4px;
+ color: #000;
+ background-color: #ccc;
+ border: 1px solid #666;
+ padding: 0px 5px;
+}
+
+div.floatingFooter a:hover {
+ background-color: #eee;
}
.toolbox {
border: 2px solid #333;
- margin: 0 5px 0 5px;
width: 200px;
- bottom: 23px;
+ bottom: 25px;
+ left: 5px;
position: fixed;
}
@@ -164,7 +171,7 @@
}
.actionPad a.selected, .actionPad a:hover {
- background-color: #f9ff50;
+ background-color: #ffc;
border-width: 1px;
border-style: solid;
border-color: #333 #ccc #ccc #333;
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt Wed Jun
14 10:53:13 2006
@@ -1,6 +1,9 @@
-
- <a
href="javascript:CPSSkins.getControllerById('panel-perspectives').switchTo('content-factory')">Add
a portlet</a>
-
- <span>Page mode</span>
+<div style="padding: 1px 8px">
+ <div style="float:right">
+ <span>Page mode:</span>
<a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('layout')">Layout</a>
<a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('wysiwyg')">WYSIWYG</a>
+ </div>
+
+ <a
href="javascript:CPSSkins.getControllerById('panel-perspectives').switchTo('content-factory')">Add
a portlet</a>
+</div>
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 Wed Jun
14 10:53:13 2006
@@ -588,6 +588,8 @@
'zoomback': {
'duration': 400,
},
+ 'opacity': 1,
+ 'hide_widget': 1,
},
'dropping': {
'target': 'portletTarget',
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
