From: Benoît Pin <pin@cri.ensmp.fr>
Date: Fri, 10 Oct 2014 15:22:02 +0000 (+0200)
Subject: Merge branch 'dd_ordering' into zope-2.13
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Portfolio.git/commitdiff_plain/2da869b2b46179d64c05eaac4081226fdbbbc9ff?hp=821f2dd54fd8a66a73d7a4c8b99331fbe7476d86

Merge branch 'dd_ordering' into zope-2.13
---

diff --git a/skins/cart_listing.js b/skins/cart_listing.js
index 593002a..cf160c3 100644
--- a/skins/cart_listing.js
+++ b/skins/cart_listing.js
@@ -9,39 +9,39 @@ var CartListing;
 (function(){
 var ENTERKEY = 13;
 
-CartListing = function(table) {
+CartListing = function(table) {
 	var thisCL = this;
 	this.table = table;
 	var form = table.parentNode;
-	while(form.tagName != 'FORM')
-		form = form.parentNode;
+	while(form.tagName !== 'FORM') {
+		form = form.parentNode;}
 	
 	this.fm = new FormManager(form);
 	
-	if (browser.isIE)
-		addListener(table, 'focusout', function(evt){thisCL.updateRow(evt);});
-	else
-		addListener(table, 'change', function(evt){thisCL.updateRow(evt);});
+	if (browser.isIE){
+		addListener(table, 'focusout', function(evt){thisCL.updateRow(evt);});}
+	else{
+		addListener(table, 'change', function(evt){thisCL.updateRow(evt);});}
 	
 	addListener(table, 'keypress', function(evt){thisCL.onKeypress(evt);});
-}
+};
 
 CartListing.prototype.updateRow = function(evt) {
 	var target = getTargetedObject(evt);
-	if (target.tagName != 'INPUT')
-		return;
+	if (target.tagName !== 'INPUT'){
+		return;}
 			
 	
 	var row = target.parentNode.parentNode;
-	var inputs = row.getElementsByTagName('input')
+	var inputs = row.getElementsByTagName('input');
 	var refreshBtn = inputs[1];
 	this.fm.submitButton = refreshBtn;
 	this.fm.submit(evt);
 };
 
 CartListing.prototype.onKeypress = function(evt){
-	if (evt.keyCode == ENTERKEY)
-		this.updateRow(evt);
+	if (evt.keyCode === ENTERKEY){
+		this.updateRow(evt);}
 };
 
-})();
\ No newline at end of file
+}());
diff --git a/skins/cart_widgets.js b/skins/cart_widgets.js
index 594fd22..9f59306 100644
--- a/skins/cart_widgets.js
+++ b/skins/cart_widgets.js
@@ -19,7 +19,7 @@ CartWidget = function(slide, url) {
 	req.send(null);
 	hideProgressImage();
 	
-	if (req.status != 200){
+	if (req.status !== 200){
 		alert(req.status);
 		return;
 	}
@@ -27,12 +27,12 @@ CartWidget = function(slide, url) {
 	var wdgtNode = this.wdgtNode = getCopyOfNode(doc);
 	slide.appendChild(wdgtNode);
 	
-	var descriptions = this.descriptions = new Array();
+	var descriptions = this.descriptions = [];
 	var divs = wdgtNode.getElementsByTagName('div');
-	var d;
-	for (var i=0; i<divs.length; i++) {
+	var d, i;
+	for (i=0; i<divs.length; i++) {
 		d = divs[i];
-		if (d.className =='ppt-description') {
+		if (d.className === 'ppt-description') {
 			descriptions[d.getAttribute('name')] = d;
 		}
 	}
@@ -44,31 +44,26 @@ CartWidget = function(slide, url) {
 	fm.onBeforeSubmit  = function(fm, evt){return thisCart.onBeforeSubmit(fm, evt);};
 	fm.onResponseLoad = function(req){return thisCart.loadResponse(req);};
 
-	with (descriptions[itemSelector.value].style) {
-		visibility = 'visible';
-		display='block';
-	}
+	descriptions[itemSelector.value].style.visibility = 'visible';
+	descriptions[itemSelector.value].style.display='block';
 	this.selectedItem = itemSelector.value;
 	
-	addListener(itemSelector, 'change', function(evt){thisCart.selectItem(evt)})
-}
+	addListener(itemSelector, 'change', function(evt){thisCart.selectItem(evt);});
+};
 
 CartWidget.prototype.selectItem = function(evt) {
-	with(this.descriptions[this.selectedItem].style) {
-		visibility = 'hidden';
-		display = 'none'
-	}
+	this.descriptions[this.selectedItem].style.visibility = 'hidden';
+	this.descriptions[this.selectedItem].style.display = 'none';
 	var name = this.itemSelector.value;
 	
-	with (this.descriptions[name].style) {
-		visibility = 'visible';
-		display='block';
-	}
+	this.descriptions[name].style.visibility = 'visible';
+	this.descriptions[name].style.display='block';
+
 	this.selectedItem = name;
 };
 
 CartWidget.prototype.onBeforeSubmit = function(fm, evt) {
-	if (fm.submitButton.name == 'cancel') {
+	if (fm.submitButton.name === 'cancel') {
 		this.onCancel();
 		return 'cancelSubmit';
 	}
@@ -87,7 +82,7 @@ CartWidget.prototype.loadResponse = function(req) {
 			confirm.innerHTML = text;
 			slide.appendChild(confirm);
 
-			var duration = parseInt(doc.getAttribute('duration')) * 1000;
+			var duration = parseInt(doc.getAttribute('duration'), 10) * 1000;
 			var thisCart = this;
 
 			setTimeout(function(){
@@ -112,4 +107,4 @@ CartWidget.prototype.onCancel = function() {
 
 CartWidget.prototype.onAfterConfirm = function(){};
 
-})();
\ No newline at end of file
+}());
\ No newline at end of file
diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index c6f583b..fa929b2 100644
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -211,9 +211,9 @@ FilmSlider.prototype.getBestFitSize = function(ratio) {
 };
 
 FilmSlider.prototype.adjustImage = function(img) {
-	var dispWidth = parseInt(this.stretchable.style.width);
+	var dispWidth = parseInt(this.stretchable.style.width, 10);
 	var imgWidth = img.naturalWidth;
-	var dispHeight = parseInt(this.stretchable.style.height);
+	var dispHeight = parseInt(this.stretchable.style.height, 10);
 	var imgHeight = img.naturalHeight;
 	var ratio;
 
diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 68d9f1d..f68f193 100644
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -9,7 +9,9 @@
     <div metal:define-macro="grid"
          tal:define="slide_size portal_object/slide_size;
                      mayBeDropable exists:dropable;
-                     dropable python:True if mayBeDropable and dropable else False"
+                     dropable python:True if mayBeDropable and dropable else False;
+                     mayBeOrderable exists:orderable;
+                     orderable python:True if mayBeOrderable and orderable else False"
          i18n:domain="portfolio">
       <div id="lightbox" tal:attributes="class python:'lightbox photo-drop-target' if dropable else 'lightbox'">
         <span metal:define-macro="thumbnails" tal:repeat="info infos" tal:omit-tag="">
@@ -19,7 +21,8 @@
                             selected info/selected|nothing"
                 tal:attributes="class info/className;
                                 name info/cmf_uid"
-                metal:define-macro="thumbnail">
+                metal:define-macro="thumbnail"
+                draggable="true">
             <a class="slide" tal:attributes="href info/href; title info/title">
               <img tal:attributes="src info/thumbUrl;
                                    alt info/title;
@@ -121,7 +124,8 @@
                 new Lightbox(lb,
                              document.getElementById('lightbox_toolbar'),
                              %(complete)s,
-                             '%(container_type)s');
+                             '%(container_type)s',
+                             %(orderable)s);
                 var uploadUrl = '%(putUrl)s';
                 var options = {'slideSize' : %(slideSize)d,
                                'thumbnailSize' : %(thumbnailSize)d};
@@ -131,7 +135,8 @@
                      'slideSize' : portal_object.slide_size,
                      'thumbnailSize' : portal_object.thumb_size,
                      'complete': 'true' if not batch.next else 'false',
-                     'container_type' : options.get('container_type', 'portfolio')}">
+                     'container_type' : options.get('container_type', 'portfolio'),
+                     'orderable' : 'true' if orderable else 'false'}">
       </script>
     </div>
     <div metal:define-macro="film_bar" tal:omit-tag="">
diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index bb27a67..ba3ecf1 100644
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,7 +11,7 @@ var Lightbox;
 
 var reSelected = /.*selected.*/;
 
-Lightbox = function(grid, toolbar, complete, container_type) {
+Lightbox = function(grid, toolbar, complete, container_type, orderable) {
 	var self = this;
 	this.grid = grid;
 	this._buildSlidesIndex(); // set this.slides and this.lastSlide;
@@ -24,7 +24,6 @@ Lightbox = function(grid, toolbar, complete, container_type) {
 		addListener(window, 'scroll', function(evt){self.windowScrollToolbarlHandler(evt);});
 	}
 	addListener(window, 'scroll', function(evt){self.windowScrollGridHandler(evt);});
-	// addListener(window, 'load', function(evt){ self.windowScrollGridHandler();});
 	registerStartupFunction(function(){ self.windowScrollGridHandler();});
 	this.lastCBChecked = undefined;
 	this.form = undefined;
@@ -46,6 +45,14 @@ Lightbox = function(grid, toolbar, complete, container_type) {
 		fm.onBeforeSubmit = function(fm_, evt) {return self.onBeforeSubmit(fm_, evt);};
 		fm.onResponseLoad = function(req) {return self.onResponseLoad(req);};
 	}
+
+	// drag and drop
+	this.disableDefaultDragging();
+	this._DDOrderingListeners = {'dragstart' : function(evt){self.onDragStart(evt);},
+								 'dragover' : function(evt){self.onDragOver(evt);},
+								 'dragend' : function(evt){self.onDragEnd(evt);}
+								 };
+	if(orderable) {this.enableDDOrdering();}
 };
 
 Lightbox.prototype._buildSlidesIndex = function() {
@@ -71,6 +78,7 @@ Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {
 		this.switchToolBarPositioning(false);
 	}
 };
+
 Lightbox.prototype.windowScrollGridHandler = function(evt) {
 	if (!this.complete &&
 		!this.fetchingDisabled &&
@@ -175,6 +183,8 @@ Lightbox.prototype.mouseClickHandler = function(evt) {
 Lightbox.prototype.onChangeHandler = function(evt) {
 	var target = getTargetedObject(evt);
 	if (target.name === 'sort_on') {
+		if (target.value === 'position') {this.enableDDOrdering();}
+		else {this.disableDDOrdering();}
 		this.fm.submitButton = {'name' : 'set_sorting', 'value' : 'ok'};
 		this.fm.submit(evt);
 	}
@@ -350,6 +360,7 @@ Lightbox.prototype._refreshGrid = function(req) {
 		node = doc.childNodes[i];
 		if (node.nodeType === 1) {
 			node = getCopyOfNode(node);
+			this.disableDefaultDragging(node);
 			this.grid.replaceChild(node, this.slides[j]);
 			this.slides[j] = node;
 			j++;
@@ -392,6 +403,7 @@ Lightbox.prototype._appendTail = function(req) {
 		node = doc.childNodes[i];
 		if (node.nodeType === 1) {
 			this.lastSlide = this.grid.appendChild(getCopyOfNode(node));
+			this.disableDefaultDragging(this.lastSlide);
 			this.slides.push(this.lastSlide);
 			if (this.cbIndex) {
 				c = this.lastSlide.getElementsByTagName('input')[0];
@@ -424,4 +436,160 @@ else {
 	};
 }
 
+if (browser.isGecko) {
+	Lightbox.prototype.disableDefaultDragging = function(element) {
+		if (!element) {
+			element = this.grid;
+		}
+		var i, j, name, elements;
+		var elementsNames = ['a', 'img'];
+		for (i=0 ; i < elementsNames.length ; i++) {
+			name = elementsNames[i];
+			elements = element.getElementsByTagName(name);
+			for (j=0 ; j < elements.length ; j++) {
+				elements[j].draggable=false;
+			}
+		}
+	};
+}
+else {
+	Lightbox.prototype.disableDefaultDragging = function() {};
+}
+
+Lightbox.prototype.getSelectedSlides = function() {
+	var i, e, slide;
+	var slides = [];
+	for (i=0 ; i<this.form.elements.length ; i++) {
+		e = this.form.elements[i];
+		if (e.type === 'checkbox' && e.checked) {
+			slide = e.parentNode.parentNode;
+			slides.push(slide);
+		}
+	}
+	return slides;
+};
+
+
+Lightbox.prototype.enableDDOrdering = function() {
+	addListener(this.grid, 'dragstart', this._DDOrderingListeners.dragstart);
+	addListener(this.grid, 'dragover', this._DDOrderingListeners.dragover);
+	addListener(this.grid, 'dragend', this._DDOrderingListeners.dragend);
+};
+
+Lightbox.prototype.disableDDOrdering = function() {
+	removeListener(this.grid, 'dragstart', this._DDOrderingListeners.dragstart);
+	removeListener(this.grid, 'dragover', this._DDOrderingListeners.dragover);
+	removeListener(this.grid, 'dragend', this._DDOrderingListeners.dragend);
+};
+
+Lightbox.prototype.onDragStart = function(evt) {
+	var target = getTargetedObject(evt);
+	this.dragged = target;
+	this.draggedSelection = this.getSelectedSlides();
+	if (this.draggedSelection.indexOf(target) === -1) {
+		this.draggedSelection.push(target);
+	}
+	evt.dataTransfer.setData('text', '');
+	var i, slide;
+	for(i=0 ; i<this.draggedSelection.length ; i++) {
+		slide = this.draggedSelection[i];
+		slide.style.opacity = 0;
+		slide.style.width = 0;
+	}
+};
+
+Lightbox.prototype.onDragOver = function(evt) {
+	if (!this.dragged) {
+		return;
+	}
+	var target = getTargetedObject(evt);
+	while(target && target.className !== 'slide') {
+		target = target.parentNode;
+	}
+	if (!target) {return;}
+	target = target.parentNode;
+	if (target !== this.dragged) {
+		target.classList.add('dragover');
+	}
+	if (this.lastDropTarget && this.lastDropTarget !== target) {
+		this.lastDropTarget.classList.remove('dragover');
+	}
+	this.lastDropTarget = target;
+};
+
+Lightbox.prototype.onDragEnd = function(evt) {
+	if (this.lastDropTarget) {
+		this.lastDropTarget.classList.remove('dragover');
+		var i, slide;
+		this.pendingMovedSlides = [];
+		for(i=this.draggedSelection.length -1 ; i>=0 ; i--) {
+			slide = this.draggedSelection[i].cloneNode(true);
+			this.pendingMovedSlides.push(slide);
+			this.grid.insertBefore(slide, this.lastDropTarget.nextSibling);
+			slide.style.opacity = 1;
+			slide.style.width = '';
+		}
+		this.moveSelectedPhotos();
+	}
+	// this.draggedSelection = this.lastDropTarget
+	this.dragged = undefined;
+};
+
+Lightbox.prototype.moveSelectedPhotos = function() {
+	var req = new XMLHttpRequest();
+	self = this;
+	req.onreadystatechange = function() {
+		switch (req.readyState) {
+			case 1 :
+				showProgressImage();
+				break;
+			case 4 :
+				hideProgressImage();
+				self._moveSelectedPhotos(req);
+				break;
+		}
+	};
+	
+	var url = absolute_url() + '/portfolio_move_photos';
+	req.open("POST", url, true);
+	req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+	var query = 'container_type=' + this.container_type;
+	var i;
+	for (i=0 ; i<this.draggedSelection.length ; i++) {
+		query += '&uids:list=' + this.draggedSelection[i].getAttribute('name');
+	}
+	query += '&afterUid=' + this.lastDropTarget.getAttribute('name');
+	req.send(query);
+};
+
+Lightbox.prototype._moveSelectedPhotos = function(req) {
+	var i, slide, cb;
+	if (req.status === 200) {
+		var doc = req.responseXML.documentElement;
+		if (doc.nodeName === 'ok') {
+			for(i=0 ; i<this.draggedSelection.length ; i++) {
+				slide = this.draggedSelection[i];
+				this.grid.removeChild(slide);
+				cb = this.pendingMovedSlides[i].getElementsByTagName('input')[0];
+				cb.checked = false;
+				cb.removeAttribute('checked');
+			}
+			this.pendingMovedSlides = undefined;
+			this.cbIndex = undefined;
+			return;
+		}
+	}
+	
+	for(i=0 ; i<this.pendingMovedSlides.length ; i++) {
+		slide = this.pendingMovedSlides[i];
+		this.grid.removeChild(slide);
+	}
+	
+	for(i=0 ; i<this.draggedSelection.length ; i++) {
+		slide = this.draggedSelection[i];
+		slide.style.opacity = 1;
+		slide.style.width = '';
+	}
+};
+
 }());
\ No newline at end of file
diff --git a/skins/portfolio_move_photos.py b/skins/portfolio_move_photos.py
new file mode 100644
index 0000000..afee01d
--- /dev/null
+++ b/skins/portfolio_move_photos.py
@@ -0,0 +1,22 @@
+##parameters=
+req = context.REQUEST
+form = req.form
+fg = form.get
+
+container_type = fg('container_type')
+if container_type == 'portfolio' :
+    from Products.CMFCore.utils import getUtilityByInterfaceName
+    uidh = getUtilityByInterfaceName('Products.CMFUid.interfaces.IUniqueIdHandler')
+    ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool')
+    dropId = uidh.getBrain(int(fg('afterUid'))).getId
+    uids = fg('uids', [])
+    ids = [uidh.getBrain(uid).getId for uid in uids]
+    context.REQUEST.RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8')
+    try :
+        context.moveObjectsAfter(ids, dropId)
+        return '<ok/>'
+    except NotImplementedError :
+        raise
+
+return printed
+
diff --git a/skins/portfolio_style.css.dtml b/skins/portfolio_style.css.dtml
index 13a6782..c7bae6c 100755
--- a/skins/portfolio_style.css.dtml
+++ b/skins/portfolio_style.css.dtml
@@ -520,6 +520,26 @@ th.num {
   color: &dtml-messageFontColor;;
 }
 
+/* drag and drop */
+#lightbox img,
+#lightbox a {
+	user-drag: none;
+	-moz-user-select: none;
+	-webkit-user-drag: none;
+}
+
+*[draggable=true] {
+	-moz-user-select:none;
+	-khtml-user-drag: element;
+	-webkit-user-drag: element;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+}
+
+.lightbox span.dragover {
+/*  width: <dtml-var expr="slide_size - 10">px;*/
+	border-right: 10px solid &dtml-outlineColor;;
+}
 /* 
 </dtml-with> 
 </dtml-with>
diff --git a/skins/portfolio_view.pt b/skins/portfolio_view.pt
index 06de5c3..a194d6f 100644
--- a/skins/portfolio_view.pt
+++ b/skins/portfolio_view.pt
@@ -28,7 +28,9 @@
 
     <div metal:fill-slot="main" tal:omit-tag=""
          tal:define="AddPortalContent modules/Products/CMFCore/permissions/AddPortalContent;
+                     ManageProperties modules/Products/CMFCore/permissions/ManageProperties;
                      dropable python:mtool.checkPermission(AddPortalContent, here);
+                     orderable python:mtool.checkPermission(ManageProperties, here) and here.getDefaultSorting()[0] == 'position';
                      Batch python:modules['Products.Plinn'].Batch;
                      pho_start python:request.get('pho_start', 0);
                      port_start python:request.get('port_start', 0);