From: Benoît Pin <benoit.pin@gmail.com>
Date: Sat, 5 Jul 2014 21:50:09 +0000 (+0200)
Subject: Implémentation de la suppression des photos dans l'onglet de visualisation.
X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/commitdiff_plain/cae5c6e0cfbb0fcb3181a95f83c839e8a30f146e?ds=sidebyside

Implémentation de la suppression des photos dans l'onglet de visualisation.
---

diff --git a/graphics/image_toolbar.psd b/graphics/image_toolbar.psd
index 632a805..3bf3816 100644
Binary files a/graphics/image_toolbar.psd and b/graphics/image_toolbar.psd differ
diff --git a/locales/en/LC_MESSAGES/portfolio.po b/locales/en/LC_MESSAGES/portfolio.po
index a7e0595..1109c6f 100644
--- a/locales/en/LC_MESSAGES/portfolio.po
+++ b/locales/en/LC_MESSAGES/portfolio.po
@@ -48,8 +48,8 @@ msgstr ""
 msgid "This %s is already in the selection."
 msgstr ""
 
-#: o/skins/get_slide_buyable_items.pt:21 o/skins/photo_layout_macros.pt:47
-#: o/skins/photo_layout_macros.pt:49 o/skins/photo_view.pt:91
+#: o/skins/get_slide_buyable_items.pt:21 o/skins/photo_layout_macros.pt:52
+#: o/skins/photo_layout_macros.pt:55 o/skins/photo_view.pt:91
 #: o/skins/photo_view.pt:94
 msgid "Add to cart"
 msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
 msgid "refresh amount"
 msgstr ""
 
-#: o/skins/my_cart_template.pt:59
+#: o/skins/my_cart_template.pt:59 o/skins/portfolio_view.pt:71
 msgid "delete"
 msgstr ""
 
@@ -175,24 +175,24 @@ msgstr ""
 msgid "Dimensions"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:32 o/skins/photo_layout_macros.pt:34
+#: o/skins/photo_layout_macros.pt:33 o/skins/photo_layout_macros.pt:36
 msgid "Add to selection"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:39 o/skins/photo_layout_macros.pt:41
+#: o/skins/photo_layout_macros.pt:42 o/skins/photo_layout_macros.pt:45
 msgid "Remove to selection"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:54 o/skins/photo_layout_macros.pt:56
+#: o/skins/photo_layout_macros.pt:61 o/skins/photo_layout_macros.pt:64
 #: o/skins/portfolio_presentation_template.pt:47
 msgid "Delete"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:65 o/skins/photo_layout_macros.pt:68
+#: o/skins/photo_layout_macros.pt:79 o/skins/photo_layout_macros.pt:82
 msgid "Hide for anonymous"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:76 o/skins/photo_layout_macros.pt:79
+#: o/skins/photo_layout_macros.pt:92 o/skins/photo_layout_macros.pt:95
 msgid "Show for anonymous"
 msgstr ""
 
@@ -240,18 +240,30 @@ msgstr ""
 msgid "Edit metadata"
 msgstr ""
 
-#: o/skins/photo_view.pt:116 o/skins/photo_view_ajax_template.pt:18
+#: o/skins/photo_view.pt:118
 msgid "Keywords"
 msgstr ""
 
-#: o/skins/photo_view.pt:123 o/skins/photo_view_ajax_template.pt:26
+#: o/skins/photo_view.pt:125
 msgid "reference:"
 msgstr ""
 
-#: o/skins/photo_view.pt:129 o/skins/photo_view_ajax_template.pt:33
+#: o/skins/photo_view.pt:131
 msgid "download picture"
 msgstr ""
 
+#: o/skins/portfolio_edit_form.py:13
+msgid "Photo deleted."
+msgstr ""
+
+#: o/skins/portfolio_edit_form.py:15
+msgid "Deleted photos."
+msgstr ""
+
+#: o/skins/portfolio_edit_form.py:18
+msgid "Nothing to delete."
+msgstr ""
+
 #: o/skins/portfolio_presentation_template.pt:22
 msgid "Delete presentation"
 msgstr ""
diff --git a/locales/fr/LC_MESSAGES/portfolio.mo b/locales/fr/LC_MESSAGES/portfolio.mo
index 2be79dd..eca4edf 100644
Binary files a/locales/fr/LC_MESSAGES/portfolio.mo and b/locales/fr/LC_MESSAGES/portfolio.mo differ
diff --git a/locales/fr/LC_MESSAGES/portfolio.po b/locales/fr/LC_MESSAGES/portfolio.po
index a1e9fa2..64cda42 100644
--- a/locales/fr/LC_MESSAGES/portfolio.po
+++ b/locales/fr/LC_MESSAGES/portfolio.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Sun Jun 29 07:16:48 2014\n"
-"PO-Revision-Date: 2014-06-29 07:19+0200\n"
+"POT-Creation-Date: Sat Jul  5 14:18:53 2014\n"
+"PO-Revision-Date: 2014-07-05 14:19+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
@@ -71,8 +71,8 @@ msgid "This %s is already in the selection."
 msgstr "Cette %s est déjà dans la sélection."
 
 # from portfolio-manual
-#: o/skins/get_slide_buyable_items.pt:21 o/skins/photo_layout_macros.pt:47
-#: o/skins/photo_layout_macros.pt:49 o/skins/photo_view.pt:91
+#: o/skins/get_slide_buyable_items.pt:21 o/skins/photo_layout_macros.pt:52
+#: o/skins/photo_layout_macros.pt:55 o/skins/photo_view.pt:91
 #: o/skins/photo_view.pt:94
 msgid "Add to cart"
 msgstr "Ajouter au panier"
@@ -148,7 +148,7 @@ msgstr "Prix (TTC)"
 msgid "refresh amount"
 msgstr "actualiser le montant"
 
-#: o/skins/my_cart_template.pt:59
+#: o/skins/my_cart_template.pt:59 o/skins/portfolio_view.pt:71
 msgid "delete"
 msgstr "supprimer"
 
@@ -201,25 +201,25 @@ msgid "Dimensions"
 msgstr "Dimensions"
 
 # from portfolio-manual
-#: o/skins/photo_layout_macros.pt:32 o/skins/photo_layout_macros.pt:34
+#: o/skins/photo_layout_macros.pt:33 o/skins/photo_layout_macros.pt:36
 msgid "Add to selection"
 msgstr "Ajouter à la sélection"
 
 # from portfolio-manual
-#: o/skins/photo_layout_macros.pt:39 o/skins/photo_layout_macros.pt:41
+#: o/skins/photo_layout_macros.pt:42 o/skins/photo_layout_macros.pt:45
 msgid "Remove to selection"
 msgstr "Retirer de la sélection"
 
-#: o/skins/photo_layout_macros.pt:54 o/skins/photo_layout_macros.pt:56
+#: o/skins/photo_layout_macros.pt:61 o/skins/photo_layout_macros.pt:64
 #: o/skins/portfolio_presentation_template.pt:47
 msgid "Delete"
 msgstr "Supprimer"
 
-#: o/skins/photo_layout_macros.pt:65 o/skins/photo_layout_macros.pt:68
+#: o/skins/photo_layout_macros.pt:79 o/skins/photo_layout_macros.pt:82
 msgid "Hide for anonymous"
 msgstr "Masquer pour les anonymes"
 
-#: o/skins/photo_layout_macros.pt:76 o/skins/photo_layout_macros.pt:79
+#: o/skins/photo_layout_macros.pt:92 o/skins/photo_layout_macros.pt:95
 msgid "Show for anonymous"
 msgstr "Montrer aux anonymes"
 
@@ -267,18 +267,30 @@ msgstr "Plein écran (f)"
 msgid "Edit metadata"
 msgstr "Modifier les métadonnées"
 
-#: o/skins/photo_view.pt:116 o/skins/photo_view_ajax_template.pt:18
+#: o/skins/photo_view.pt:118
 msgid "Keywords"
 msgstr "Mots-clefs"
 
-#: o/skins/photo_view.pt:123 o/skins/photo_view_ajax_template.pt:26
+#: o/skins/photo_view.pt:125
 msgid "reference:"
 msgstr "référence :"
 
-#: o/skins/photo_view.pt:129 o/skins/photo_view_ajax_template.pt:33
+#: o/skins/photo_view.pt:131
 msgid "download picture"
 msgstr "télécharger l'image"
 
+#: o/skins/portfolio_edit_form.py:13
+msgid "Photo deleted."
+msgstr "Photo supprimée."
+
+#: o/skins/portfolio_edit_form.py:15
+msgid "Deleted photos."
+msgstr "Photos supprimées."
+
+#: o/skins/portfolio_edit_form.py:18
+msgid "Nothing to delete."
+msgstr "Rien à supprimer."
+
 #: o/skins/portfolio_presentation_template.pt:22
 msgid "Delete presentation"
 msgstr "Supprimer la présentation"
diff --git a/locales/portfolio.pot b/locales/portfolio.pot
index f1a927d..5213937 100644
--- a/locales/portfolio.pot
+++ b/locales/portfolio.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.0\n"
-"POT-Creation-Date: Sun Jun 29 07:19:35 2014\n"
+"POT-Creation-Date: Sat Jul  5 14:18:53 2014\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -79,8 +79,8 @@ msgid "This %s is already in the selection."
 msgstr ""
 
 #: o/skins/get_slide_buyable_items.pt:21
-#: o/skins/photo_layout_macros.pt:47
-#: o/skins/photo_layout_macros.pt:49
+#: o/skins/photo_layout_macros.pt:52
+#: o/skins/photo_layout_macros.pt:55
 #: o/skins/photo_view.pt:91
 #: o/skins/photo_view.pt:94
 msgid "Add to cart"
@@ -160,6 +160,8 @@ msgstr ""
 
 #: o/skins/my_cart_template.pt:59
 #: o/skins/my_cart_template.pt:59
+#: o/skins/portfolio_view.pt:71
+#: o/skins/portfolio_view.pt:71
 msgid "delete"
 msgstr ""
 
@@ -213,29 +215,29 @@ msgstr ""
 msgid "Dimensions"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:32
-#: o/skins/photo_layout_macros.pt:34
+#: o/skins/photo_layout_macros.pt:33
+#: o/skins/photo_layout_macros.pt:36
 msgid "Add to selection"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:39
-#: o/skins/photo_layout_macros.pt:41
+#: o/skins/photo_layout_macros.pt:42
+#: o/skins/photo_layout_macros.pt:45
 msgid "Remove to selection"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:54
-#: o/skins/photo_layout_macros.pt:56
+#: o/skins/photo_layout_macros.pt:61
+#: o/skins/photo_layout_macros.pt:64
 #: o/skins/portfolio_presentation_template.pt:47
 msgid "Delete"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:65
-#: o/skins/photo_layout_macros.pt:68
+#: o/skins/photo_layout_macros.pt:79
+#: o/skins/photo_layout_macros.pt:82
 msgid "Hide for anonymous"
 msgstr ""
 
-#: o/skins/photo_layout_macros.pt:76
-#: o/skins/photo_layout_macros.pt:79
+#: o/skins/photo_layout_macros.pt:92
+#: o/skins/photo_layout_macros.pt:95
 msgid "Show for anonymous"
 msgstr ""
 
@@ -290,21 +292,30 @@ msgstr ""
 msgid "Edit metadata"
 msgstr ""
 
-#: o/skins/photo_view.pt:116
-#: o/skins/photo_view_ajax_template.pt:18
+#: o/skins/photo_view.pt:118
 msgid "Keywords"
 msgstr ""
 
-#: o/skins/photo_view.pt:123
-#: o/skins/photo_view_ajax_template.pt:26
+#: o/skins/photo_view.pt:125
 msgid "reference:"
 msgstr ""
 
-#: o/skins/photo_view.pt:129
-#: o/skins/photo_view_ajax_template.pt:33
+#: o/skins/photo_view.pt:131
 msgid "download picture"
 msgstr ""
 
+#: o/skins/portfolio_edit_form.py:13
+msgid "Photo deleted."
+msgstr ""
+
+#: o/skins/portfolio_edit_form.py:15
+msgid "Deleted photos."
+msgstr ""
+
+#: o/skins/portfolio_edit_form.py:18
+msgid "Nothing to delete."
+msgstr ""
+
 #: o/skins/portfolio_presentation_template.pt:22
 msgid "Delete presentation"
 msgstr ""
diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 6fe4a89..1ca17fa 100644
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -67,7 +67,8 @@
               </a>
             </span>
             <span class="button cb">
-              <input type="checkbox" />
+              <input type="checkbox" name="uids:list"
+                     tal:attributes="value info/cmf_uid"/>
             </span>
             <tal:block tal:condition="features/hideAnonymous|nothing">
               <span class="button slide-hide"
diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index f7afe84..7361a4f 100644
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -14,11 +14,24 @@ var reSelected = /.*selected.*/;
 Lightbox = function(grid) {
 	this.grid = grid;
 	this.lastCBChecked = undefined;
+	this.form = undefined;
+	var parent = this.grid.parentNode;
+	while(parent) {
+		parent = parent.parentNode;
+		if (parent.tagName === 'FORM') {
+			this.form = parent;
+			break;
+		}
+		else if (parent.tagName === 'BODY') {
+			break;
+		}
+	}
 	thisLightbox = this;
 	addListener(this.grid, 'click', function(evt){thisLightbox.mouseClickHandler(evt);});
-	if (!browser.isGecko){
-		addListener(this.grid, 'mouseover', function(evt){thisLightbox.mouseOverHandler(evt);});
-		addListener(this.grid, 'mouseout', function(evt){thisLightbox.mouseOutHandler(evt);});
+	if (this.form) {
+		var fm = new FormManager(this.form);
+		fm.onBeforeSubmit = function(fm_, evt) {return thisLightbox.onBeforeSubmit(fm_, evt);};
+		fm.onResponseLoad = function(req) {return thisLightbox.onResponseLoad(req);};
 	}
 };
 
@@ -112,26 +125,77 @@ Lightbox.prototype.mouseClickHandler = function(evt) {
 	}
 };
 
-Lightbox.prototype.mouseOverHandler = function(evt) {
-	var target = getTargetedObject(evt);
-	if (target.tagName==='AREA') {
-		var slide = target.parentNode.parentNode;
-		if(reSelected.test(slide.className)) {
-			slide.className = 'slide_over_selected';}
-		else {
-			slide.className = 'slide_over';}
+Lightbox.prototype.onBeforeSubmit = function(fm, evt) {
+	switch(fm.submitButton.name) {
+		case 'delete' :
+			this.hideSelection();
+			break;
 	}
 };
 
-Lightbox.prototype.mouseOutHandler = function(evt) {
-	var target = getTargetedObject(evt);
-	if (target.tagName==='AREA') {
-		var slide = target.parentNode.parentNode;
-		if(reSelected.test(slide.className)) {
-			slide.className = 'selected';}
-		else {
-			slide.className = undefined;}
+Lightbox.prototype.onResponseLoad = function(req) {
+	switch(req.responseXML.documentElement.nodeName) {
+		case 'deleted' :
+			this.deleteSelection();
+			break;
+		case 'error' :
+			this.showSelection();
+			break;
+	}
+};
+
+Lightbox.prototype.hideSelection = function() {
+	var i, e, slide;
+	for (i=0 ; i<this.form.elements.length ; i++) {
+		e = this.form.elements[i];
+		if (e.type === 'checkbox' && e.checked) {
+			slide = e.parentNode.parentNode;
+			slide.classList.add('zero_opacity');
+		}
+	}
+};
+
+Lightbox.prototype.showSelection = function() {
+	var i, e, slide;
+	for (i=0 ; i<this.form.elements.length ; i++) {
+		e = this.form.elements[i];
+		if (e.type === 'checkbox' && e.checked) {
+			slide = e.parentNode.parentNode;
+			slide.classList.remove('zero_opacity');
+		}
+	}
+};
+
+Lightbox.prototype.deleteSelection = function() {
+	var i, e, slide;
+	for (i=0 ; i<this.form.elements.length ; i++) {
+		e = this.form.elements[i];
+		if (e.type === 'checkbox' && e.checked) {
+			slide = e.parentNode.parentNode;
+			slide.classList.add('zero_width');
+		}
+	}
+	var self = this;
+	// if you change this, delay you should also change this css rule :
+	// .lightbox span { transition: width 1s
+	setTimeout(function(){self._removeSelection();}, 1000);
+};
+
+Lightbox.prototype._removeSelection = function() {
+	console.info('_removeSelection');
+	var i, e, slide;
+	var toRemove = [];
+	for (i=0 ; i<this.form.elements.length ; i++) {
+		e = this.form.elements[i];
+		if (e.type === 'checkbox' && e.checked) {
+			toRemove.push(e.parentNode.parentNode);
+		}
+	}
+	for (i=0 ; i<toRemove.length ; i++) {
+		slide = toRemove[i];
+		slide.parentNode.removeChild(slide);
 	}
+	this.cbIndex = undefined;
 };
 
 Lightbox.prototype.getCBIndex = function(cb) {
diff --git a/skins/portfolio_edit_form.py b/skins/portfolio_edit_form.py
new file mode 100644
index 0000000..cb9e93b
--- /dev/null
+++ b/skins/portfolio_edit_form.py
@@ -0,0 +1,30 @@
+##parameters=
+from Products.CMFCore.utils import getUtilityByInterfaceName
+from Products.Portfolio.utils import translate
+_ = lambda msg : translate(msg, context)
+
+uidh = getUtilityByInterfaceName('Products.CMFUid.interfaces.IUniqueIdHandler')
+
+form = context.REQUEST.form
+fg = form.get
+if fg('ajax') :
+    context.REQUEST.RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8')
+
+if fg('delete.x') or form.has_key('delete') :
+    ids = [uidh.getBrain(uid).getId for uid in fg('uids', [])]
+    if ids :
+        if len(ids) == 1 :
+            msg = _('Photo deleted.')
+        else :
+            msg = _('Deleted photos.')
+        context.manage_delObjects(ids)
+    else :
+        msg = _('Nothing to delete.')
+    
+    if not fg('ajax') :
+        context.setStatus(True, msg)
+        return context.setRedirect(context, 'object/view')
+
+    else :
+        return '<deleted>%s</deleted>' % msg
+return '<error/>'
\ No newline at end of file
diff --git a/skins/portfolio_style.css.dtml b/skins/portfolio_style.css.dtml
index 997b17b..23a3674 100755
--- a/skins/portfolio_style.css.dtml
+++ b/skins/portfolio_style.css.dtml
@@ -174,10 +174,11 @@ div.lightbox {
 }
 
 .lightbox span {
-    width: &dtml-slide_size;px;
-    height: &dtml-slide_size;px;
-    display:block;
-    float:left;
+  width: &dtml-slide_size;px;
+  height: &dtml-slide_size;px;
+  display:block;
+  float:left;
+  transition: width 1s, opacity 0.5s;
 }
 
 .lightbox a.slide {
@@ -280,12 +281,21 @@ div.lightbox {
 .lightbox .cb {
 	margin-left: <dtml-var expr="slide_size - 22">px;
 	margin-top: 5px;
+	width:auto;
+	height:auto;
 }
 
 .lightbox .cb input[checked] {
 	visibility: visible;
 }
 
+.lightbox .zero_opacity {
+	opacity:0;
+}
+
+.lightbox .zero_width {
+	width:0;
+}
 
 .lightbox .slide-hide,
 .lightbox .slide-show {
diff --git a/skins/portfolio_view.pt b/skins/portfolio_view.pt
index 3028e15..5535fa8 100644
--- a/skins/portfolio_view.pt
+++ b/skins/portfolio_view.pt
@@ -66,9 +66,19 @@
                      infos batchInfos/infos;
                      features batchInfos/features"
          tal:omit-tag="">
-      <div metal:use-macro="here/photo_layout_macros/macros/grid">
-        affichage grille
-      </div>
+      <form tal:attributes="action string:${here/absolute_url}/portfolio_edit_form" method="post">
+        <div id="image_toolbar" class="image_toolbar">
+          <input type="image" width="17" height="27" alt="delete" title="delete"
+                 name="delete"
+                 tal:attributes="src string:$portal_url/trash_btn.gif"
+                 i18n:attributes="alt;title"/>
+          <br/>
+        </div>
+
+        <div metal:use-macro="here/photo_layout_macros/macros/grid">
+          affichage grille
+        </div>
+      </form>
     </div>
     <br clear="all"/>
     </div>
diff --git a/skins/trash_btn.gif b/skins/trash_btn.gif
new file mode 100644
index 0000000..2ad52dc
Binary files /dev/null and b/skins/trash_btn.gif differ