From c5016d334c35ac53e227c0daf77f00068c8ad4ea Mon Sep 17 00:00:00 2001
From: "tcharlss@hotmail.fr" <>
Date: Thu, 20 Dec 2012 16:26:57 +0000
Subject: [PATCH] =?UTF-8?q?Petites=20modifs=20au=20squelette=20des=20docum?=
 =?UTF-8?q?ents=20joints=20=C3=A0=20un=20objet,=20afin=20de=20permettre=20?=
 =?UTF-8?q?d'afficher=20plusieurs=20portfolios=20sur=20une=20m=C3=AAme=20p?=
 =?UTF-8?q?age=20sans=20provoquer=20d'erreur=20(le=20cas=20se=20pr=C3=A9se?=
 =?UTF-8?q?nte=20avec=20le=20plugin=20albums=20v2).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - Identifiant unique pour les blocs 'illustrations', 'documents' et 'portfolio'.
- On ne prend pas en compte la fonction editbox_init (contenue dans medias_edit.js) si elle est déjà chargée.
---
 paquet.xml                                    |  2 +-
 .../inclure/portfolio-documents.html          | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/paquet.xml b/paquet.xml
index e9dad09c..dfb538f0 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="medias"
 	categorie="multimedia"
-	version="2.8.2"
+	version="2.8.3"
 	etat="stable"
 	compatibilite="[3.0.0;3.1.*]"
 	logo="prive/themes/spip/images/portfolio-32.png"
diff --git a/prive/squelettes/inclure/portfolio-documents.html b/prive/squelettes/inclure/portfolio-documents.html
index b8e5369b..b6c3f12c 100644
--- a/prive/squelettes/inclure/portfolio-documents.html
+++ b/prive/squelettes/inclure/portfolio-documents.html
@@ -5,12 +5,20 @@
   Distribue sous licence GPL
 
 ]
+#SET{id_unique, #OBJET|et{#ID_OBJET}|?{
+	#VAL{_}|concat{#OBJET}|concat{#ID_OBJET},
+	#VAL{_}|concat{#EVAL{'rand();'}}
+	}
+}
+#SET{id_illustrations,	#VAL{illustrations}|concat{#GET{id_unique}}}
+#SET{id_portfolio,	#VAL{portfolio}|concat{#GET{id_unique}}}
+#SET{id_documents,	#VAL{documents}|concat{#GET{id_unique}}}
 #SET{nbdocs,0}
 <div id="portfolios">
 [(#REM) D'abord les images illustration]
 <B_illustrations>
 <h3><span class="image_loading"></span><:medias:info_illustrations:></h3>
-<div class="liste_items documents" id="illustrations">
+<div class="liste_items documents" id="[(#GET{id_illustrations})]">
 [<p class="pagination">(#PAGINATION)</p>]
 <BOUCLE_illustrations(DOCUMENTS documents_liens types_documents){inclus=image}{mode=image}{id_objet}{objet}{par num titre,date,id_document}{pagination 50}{statut?}>
 	#MODELE{document_desc,id_document,id_objet,objet}
@@ -24,7 +32,7 @@
 [(#REM) puis les images du portfolio]
 <B_portfolio>
 <h3><:medias:info_portfolio:></h3>
-<div class="liste_items documents" id="portfolio">
+<div class="liste_items documents" id="[(#GET{id_portfolio})]">
 [<p class="pagination">(#PAGINATION)</p>]
 <BOUCLE_portfolio(DOCUMENTS documents_liens types_documents){inclus=image}{mode=document}{id_objet}{objet}{par num titre,date,id_document}{pagination 50}{statut?}>
 	#MODELE{document_desc,id_document,id_objet,objet}
@@ -38,7 +46,7 @@
 [(#REM) puis les documents]
 <B_documents>
 <h3><:medias:info_documents:></h3>
-<div class="liste_items documents" id="documents">
+<div class="liste_items documents" id="[(#GET{id_documents})]">
 [<p class="pagination">(#PAGINATION)</p>]
 <BOUCLE_documents(DOCUMENTS documents_liens types_documents){inclus!=image}{mode!=vignette}{id_objet}{objet}{par num titre,date,id_document}{pagination 50}{statut?}>
 	#MODELE{document_desc,id_document,id_objet,objet}
@@ -51,19 +59,21 @@
 
 <script type="text/javascript">/*<![CDATA[*/
 var multifile='[(#CHEMIN{javascript/jquery.multifile.js}|texte_script)]';
-[(#INCLURE{javascript/medias_edit.js}|compacte{js})]
+if (!$.isFunction(window.editbox_init)) {
+    [(#INCLURE{javascript/medias_edit.js}|compacte{js})]
+}
 [(#OBJET|=={rubrique}|et{#EVAL{_AJAX}}|et{#GET{nbdocs}|=={1}}|oui)
 if (window.jQuery) jQuery('#navigation .box.info').ajaxReload();]
 function check_reload_page(){
 	var reload = false;
-	if($('#illustrations').length && !$('#illustrations .item').length){
-		$('#illustrations').remove();reload = true;
+	if($('[#(#GET{id_illustrations})]').length && !$('[#(#GET{id_illustrations})] .item').length){
+		$('[#(#GET{id_illustrations})]').remove();reload = true;
 	}
-	if($('#portfolio').length && !$('#portfolio .item').length){
-		$('#portfolio').remove();reload = true;
+	if($('[#(#GET{id_portfolio})]').length && !$('[#(#GET{id_portfolio})] .item').length){
+		$('[#(#GET{id_portfolio})]').remove();reload = true;
 	}
-	if($('#documents').length && !$('#documents .item').length){
-		$('#documents').remove();reload = true;
+	if($('[#(#GET{id_documents})]').length && !$('[#(#GET{id_documents})] .item').length){
+		$('[#(#GET{id_documents})]').remove();reload = true;
 	}
 	if (reload) {
 		jQuery('#portfolios').ajaxReload();
-- 
GitLab