[Z3lab-checkins] r3258 - in cpsskins/branches/paris-sprint-2006/ui/screens: . pagedesigner sitemanager
Author: jmorliaguet
Date: Sun May 28 13:30:27 2006
New Revision: 3258
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/io.pt
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/settings.pt
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt
Log:
- optimizations: we insert the MVC definitions directly in the source.
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/editor.ptSun May 28
13:30:27 2006
@@ -1,6 +1,9 @@
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en
+html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en
+ tal:define=model nocall:context/@@getModel;
+ view nocall:context/@@getView;
+ controller nocall:context/@@getController
head
link rel=Stylesheet type=text/css href=++resource++authoring.css /
link rel=Stylesheet type=text/css href=++resource++cpsskins.css /
@@ -14,69 +17,72 @@
script type=text/javascript src=++resource++cpsskins.js/script
script type=text/javascript src=++resource++authoring.js/script
-ins class=model cite=@@getModel?id=stylesheet/ins
-ins class=view cite=@@getView?id=stylesheet/ins
-
+ins class=model tal:content=python: model('stylesheet') /
+ins class=view tal:content=python: view('stylesheet') /
/head
- body
+ body
div class=floatingHeader
- ins class=model cite=@@getModel?id=action-pad/ins
- ins class=view cite=@@getView?id=action-pad/ins
- ins class=model cite=@@getModel?id=perspective-selector/ins
- ins class=view cite=@@getView?id=perspective-selector/ins
+ ins class=model tal:content=python: model('action-pad') /
+ ins class=view tal:content=python: view('action-pad') /
+ ins class=model tal:content=python: model('perspective-selector') /
+ ins class=view tal:content=python: view('perspective-selector') /
/div
!-- Edit area for rendered content --
div id=editArea
- ins class=controller
cite=@@getController?id=main-editor-perspectives/ins
- ins class=controller
cite=@@getController?id=main-editor-actions/ins
- ins class=controller cite=@@getController?id=disable-links/ins
+ ins class=controller
+ tal:content=python: controller('main-editor-perspectives') /
+ ins class=controller
+ tal:content=python: controller('main-editor-actions') /
+ ins class=controller
+ tal:content=python: controller('disable-links') /
!-- top tabs --
- ins class=model cite=@@getModel?id=theme-tabs/ins
- ins class=view cite=@@getView?id=theme-tabs/ins
- ins class=model cite=@@getModel?id=page-tabs/ins
- ins class=view cite=@@getView?id=page-tabs/ins
-
- ins class=model cite=@@getModel?id=location-selector/ins
- ins class=view cite=@@getView?id=location-selector/ins
-
- ins class=model cite=@@getModel?id=page-mode-selector/ins
- ins class=view cite=@@getView?id=page-mode-selector/ins
- ins class=controller
cite=@@getController?id=page-mode-perspectives/ins
+ ins class=model tal:content=python: model('theme-tabs') /
+ ins class=view tal:content=python: view('theme-tabs') /
+ ins class=model tal:content=python: model('page-tabs') /
+ ins class=view tal:content=python: view('page-tabs') /
+
+ ins class=model tal:content=python: model('location-selector') /
+ ins class=view tal:content=python: view('location-selector') /
+
+ ins class=model tal:content=python: model('page-mode-selector') /
+ ins class=view tal:content=python: view('page-mode-selector') /
+ ins class=controller
+ tal:content=python: controller('page-mode-perspectives') /
!-- rendered pages --
div id=canvasArea
-ins class=model cite=@@getModel?id=page-designer/ins
-ins class=view cite=@@getView?id=page-designer/ins
-ins class=model cite=@@getModel?id=content-author/ins
-ins class=view cite=@@getView?id=content-author/ins
-ins class=controller cite=@@getController?id=element-mover/ins
+ins class=model tal:content=python: model('page-designer') /
+ins class=view tal:content=python: view('page-designer') /
+ins class=model tal:content=python: model('content-author') /
+ins class=view tal:content=python: view('content-author') /
+ins class=controller tal:content=python:
controller('element-mover') /
/div
!-- Contextual menu --
- ins class=view
[Z3lab-checkins] r3259 - cpsskins/branches/paris-sprint-2006/ui/screens/common
Author: jmorliaguet
Date: Sun May 28 13:31:03 2006
New Revision: 3259
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
Log:
- fixes
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 Sun May
28 13:31:03 2006
@@ -17,11 +17,12 @@
function insertPortlet(info) {
var url = '@@insertElement';
var id = info.target.getAttribute('id');
- var model = CPSSkins.getModelById('m' + id);
+ var data = CPSSkins.getModelById('m' + id).getData();
+ var order = data.container ? 0 : data.order;
var args = {
id: id,
type_name: info.source.getAttribute('type_name'),
-order: model.order
+order: order
}
var options = {
parameters: $H(args).toQueryString(),
@@ -33,11 +34,11 @@
function moveElement(info) {
var url = '@@moveElement';
var id = info.target.getAttribute('id');
- var model = CPSSkins.getModelById('m' + id);
+ var data = CPSSkins.getModelById('m' + id).getData();
var args = {
src_id: info.source.getAttribute('id'),
dest_id: id,
-order: model.order
+order: data.order
}
var options = {
parameters: $H(args).toQueryString(),
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py Sun May
28 13:31:03 2006
@@ -88,7 +88,7 @@
def getModel(self):
context = self.context
request = self.request
-id = self.context.identifier
+id = context.identifier
authoring = getMultiAdapter((context, request), IAuthoring,
name='authoring')
return json.write({
@@ -97,6 +97,7 @@
'id': id,
'editable': True,
'order': authoring.getElementOrder(id),
+'container': IInnerNode.providedBy(context),
}
})
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3260 - cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot
Author: jmorliaguet Date: Sun May 28 13:55:28 2006 New Revision: 3260 Modified: cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py Log: - fixed import Modified: cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py == --- cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py (original) +++ cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py Sun May 28 13:55:28 2006 @@ -17,7 +17,7 @@ __docformat__ = reStructuredText -from zope.component import getMultiAdapter +from zope.component import queryMultiAdapter from zope.interface import implements from zope.i18nmessageid import MessageFactory from zope.publisher.browser import applySkin -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3261 - in cpsskins/branches/paris-sprint-2006: lib/cpsskins/src ui/screens
Author: jmorliaguet
Date: Sun May 28 19:36:28 2006
New Revision: 3261
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js
cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
Log:
- UI improvements (drag-and-drop)
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.jsSun May
28 19:36:28 2006
@@ -908,7 +908,13 @@
});
if (this.def.dragging.feedback.clone) {
var clone = $(draggable.cloneNode(true));
-clone.setStyle({margin: '0'});
+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({
@@ -929,11 +935,9 @@
this.dragged = draggable;
this.dragged.setOpacity(this.def.dragging.opacity || 0.8);
-this.moved.setStyle({position: 'absolute'});
+this.moved.setStyle({position: 'absolute', cursor: 'move'});
this.moved.moveTo({x: x-this.x1, y: y-this.y1});
-this.moved.setStyle({cursor: 'move'});
-
if (this.def.dropping) {
var highlight = this.def.dropping.highlight;
if (highlight this._dropzones) {
@@ -967,7 +971,7 @@
moved.moveTo({x: x-this.x1, y: y-this.y1, fit: true});
var now = new Date().getTime();
-if (now this._last_updated + 100) return;
+if (now this._last_updated + 50) return;
this._last_updated = now;
var shifting = this.def.shifting;
@@ -1083,8 +1087,11 @@
moved.parentNode.removeChild(moved);
}
+if (this.def.dragging.opacity this.dragged) {
+ this.dragged.setOpacity(1);
+}
+
if (moved) moved.setStyle({cursor: ''});
-if (dragged) dragged.setOpacity(1);
this.dragged = null;
}
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 Sun May
28 19:36:28 2006
@@ -559,7 +559,10 @@
'offset_x': -5,
'offset_y': -5,
'feedback': {
-'opacity': 0.7,
+'opacity': 1,
+'clone': False,
+'background': '#fc0',
+'border': '#000',
},
'zoomback': {
'duration': 300,
@@ -580,9 +583,11 @@
'type': 'drag-and-drop',
'dragging': {
'source': 'elementMovable',
+'opacity': 0.2,
'feedback': {
-'opacity': 0.7,
+'opacity': 0.93,
'clone': True,
+'border': '#000',
},
},
'shifting': {
@@ -591,6 +596,9 @@
},
'dropping': {
'action': 'move element',
+'zoomto': {
+'duration': 200,
+}
},
},
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3262 - in cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner: layout wysiwyg
Author: jmorliaguet Date: Sun May 28 19:43:55 2006 New Revision: 3262 Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt Log: - made slots movable Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt == --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt Sun May 28 19:43:55 2006 @@ -7,7 +7,8 @@ id context/identifier; icon context/@@getIcon - div class=slotFrame tal:attributes=id id + div class=elementMovable elementShiftable portletTarget slotFrame + tal:attributes=id id div class=title tal:content=slot_title|slot_name / div class=bodyimg src= tal:attributes=src icon / tal:block content=slot_name / Modified: cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt == --- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt Sun May 28 19:43:55 2006 @@ -6,7 +6,7 @@ id context/identifier; icon context/@@getIcon - div class=slotFrame + div class=elementMovable elementShiftable portletTarget slotFrame tal:attributes=id id div class=title tal:content=slot_title|slot_name / div class=bodyimg src= tal:attributes=src icon / -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3263 - cpsskins/branches/paris-sprint-2006/lib/cpsskins/src
Author: jmorliaguet
Date: Sun May 28 19:47:59 2006
New Revision: 3263
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js
Log:
- finetuning
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.jsSun May
28 19:47:59 2006
@@ -971,7 +971,7 @@
moved.moveTo({x: x-this.x1, y: y-this.y1, fit: true});
var now = new Date().getTime();
-if (now this._last_updated + 50) return;
+if (now this._last_updated + 200) return;
this._last_updated = now;
var shifting = this.def.shifting;
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r3265 - in cpsskins/branches/paris-sprint-2006: lib/cpsskins/src ui/screens/common ui/screens/sitemanager
Author: jmorliaguet
Date: Sun May 28 23:19:28 2006
New Revision: 3265
Modified:
cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.css
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css
Log:
- cosmetic
Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.css
==
--- cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.css
(original)
+++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.css Sun May
28 23:19:28 2006
@@ -69,7 +69,7 @@
}
.contextMenu a:hover {
- background-color: #3465a4;
+ background-color: #b8b4c5;
color: #fff;
}
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 Sun May
28 23:19:28 2006
@@ -290,10 +290,11 @@
}
a.back {
- font-size: 1.2em;
+ font-size: 1.1em;
color: #006;
}
a.back:hover {
- background-color: #ffc;
+ background-color: #b8b4c5;
+ color: #fff;
}
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css
Sun May 28 23:19:28 2006
@@ -35,11 +35,6 @@
margin-bottom: 0.2em;
}
-.back {
- border: 1px solid #030;
- background-color: #efc
-}
-
.description {
color: #333;
padding-right: 1.5em;
@@ -56,7 +51,8 @@
}
.sections a:hover {
- background-color: #ffc;
+ background-color: #b8b4c5;
+ color: #fff;
}
a, a:visited, a:hover {
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
