From 3355d80dd2e49e73e27ba56eff72202e1e9e76c9 Mon Sep 17 00:00:00 2001
From: "tcharlss@hotmail.fr" <>
Date: Fri, 21 Dec 2012 17:51:41 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20d'un=20bug=20induit=20par=20le=20p?=
=?UTF-8?q?r=C3=A9c=C3=A9dent=20commit=20:=20-=20Ajout=20de=20crochets=20a?=
=?UTF-8?q?ux=20balises=20SPIP=20dans=20le=20code=20javascript,=20sans=20q?=
=?UTF-8?q?uoi=20elles=20ne=20passaient=20pas=20et=20le=20rechargement=20a?=
=?UTF-8?q?jaxReload=20plantait.=20-=20CSS=20:=20on=20change=20le=20ciblag?=
=?UTF-8?q?e=20des=20portfolios=20sur=20la=20classe=20.portfolios=20au=20l?=
=?UTF-8?q?ieu=20de=20#portfolios.=20De=20cette=20fa=C3=A7on=20on=20peut?=
=?UTF-8?q?=20donner=20un=20id=20unique=20=C3=A0=20chaque=20portfolio=20sa?=
=?UTF-8?q?ns=20perdre=20la=20mise=20en=20forme.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
paquet.xml | 2 +-
.../inclure/portfolio-documents.html | 14 ++--
prive/style_prive_plugin_medias.html | 70 ++++++++++---------
3 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/paquet.xml b/paquet.xml
index 4c8d4771..c127cdb1 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
<paquet
prefix="medias"
categorie="multimedia"
- version="2.8.4"
+ version="2.8.5"
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 a2e3e2e1..1fd97a38 100644
--- a/prive/squelettes/inclure/portfolio-documents.html
+++ b/prive/squelettes/inclure/portfolio-documents.html
@@ -8,7 +8,7 @@
[(#REM) pour permettre d'inclure ce squelette plusieurs fois dans une page, fournir un parametre id_unique dans l'appel]
#SET{nbdocs,0}
-<div id="portfolios#ENV{id_unique}">
+<div id="portfolios#ENV{id_unique}" class="portfolios">
[(#REM) D'abord les images illustration]
<B_illustrations>
<h3><span class="image_loading"></span><:medias:info_illustrations:></h3>
@@ -60,17 +60,17 @@ if (!$.isFunction(window.editbox_init)) {
if (window.jQuery) jQuery('#navigation .box.info').ajaxReload();]
function check_reload_page(){
var reload = false;
- if($('#illustrations#ENV{id_unique}').length && !$('#illustrations#ENV{id_unique} .item').length){
+ if($('#illustrations[(#ENV{id_unique})]').length && !$('#illustrations[(#ENV{id_unique})] .item').length){
$('#illustrations#ENV{id_unique}').remove();reload = true;
}
- if($('#portfolio#ENV{id_unique}').length && !$('#portfolio#ENV{id_unique} .item').length){
- $('#portfolio#ENV{id_unique}').remove();reload = true;
+ if($('#portfolio[(#ENV{id_unique})]').length && !$('#portfolio[(#ENV{id_unique})] .item').length){
+ $('#portfolio[(#ENV{id_unique})]').remove();reload = true;
}
- if($('#documents#ENV{id_unique}').length && !$('#documents#ENV{id_unique} .item').length){
- $('#documents#ENV{id_unique}').remove();reload = true;
+ if($('#documents[(#ENV{id_unique})]').length && !$('#documents[(#ENV{id_unique})] .item').length){
+ $('#documents[(#ENV{id_unique})]').remove();reload = true;
}
if (reload) {
- jQuery('#portfolios#ENV{id_unique}').ajaxReload();
+ jQuery('#portfolios[(#ENV{id_unique})]').ajaxReload();
jQuery('#navigation .box.info').ajaxReload();
}
}
diff --git a/prive/style_prive_plugin_medias.html b/prive/style_prive_plugin_medias.html
index 513e4021..1b4032b5 100644
--- a/prive/style_prive_plugin_medias.html
+++ b/prive/style_prive_plugin_medias.html
@@ -142,37 +142,39 @@ p.actions {clear:both;}
#documents_joints .item.hover .tourner,
#documents_joints .item.hover .mode {visibility:visible;opacity:1;-moz-opacity:1;}
-#portfolios {}
-#portfolios h3 {background-color:#GET{claire};padding:2px 10px;color:#000;margin-bottom:0;}
-#portfolios .liste_items {margin-top:0;}
-#portfolios .item {clear:both;padding-#GET{left}:82px;padding-#GET{right}:2px;}
-#portfolios .item .tourner {display:block;float:#GET{right};}
-#portfolios .item .tourner button {border:1px solid #999;padding:0;display:block;float:#GET{left};margin-#GET{left}:4px;}
-
-#portfolios .item .spip_logos {margin-#GET{left}:-80px;float:#GET{left};}
-.ie6 #portfolios .item .spip_logos {display:inline;position:relative;}
-#portfolios .item .titrem {margin:0 0 5px;font-size:1em;}
-#portfolios .item .titrem .fichier {font-weight:normal;font-size:0.9em;font-style:italic;}
-#portfolios .item .titrem .titre {display:block;font-size:1.1em;}
-#portfolios .item .infos {display:block;float:#GET{left};}
-#portfolios .item div.mode {display:block;float:#GET{right};clear:#GET{right};margin-top:-1.5em;position:relative;padding:0.2em 0.2em 0;padding-#GET{right}:0;}
-#portfolios .item .actions {display:block;float:#GET{right};clear:#GET{right};position:relative;}
-#portfolios .item div.mode,#portfolios .item .actions,
-#portfolios .item div.mode button,#portfolios .item .actions button {font-size:x-small;}
-
-#portfolios .item .actions > *,
-#portfolios .item .tourner,
-#portfolios .item .mode {opacity:0.1;-moz-opacity:0.1;}
-#portfolios .item .actions a.editbox {visibility:visible;opacity:1;-moz-opacity:1;font-weight:bold;}
-#portfolios .item:hover .actions > *,
-#portfolios .item:hover .tourner,
-#portfolios .item:hover .mode {visibility:visible;opacity:1;-moz-opacity:1;z-index:1000;background:[#(#GET{claire}|couleur_eclaircir|couleur_eclaircir)];}
-#portfolios .item.hover .actions > *,
-#portfolios .item.hover .tourner,
-#portfolios .item.hover .mode {visibility:visible;opacity:1;-moz-opacity:1;z-index:1000;}
-
-#portfolios .item .titre > .sanstitre {opacity:0.1;-moz-opacity:0.1;}
-
-#portfolios .tout_supprimer span {display:block;text-align:#GET{right};}
-
-.item.vu_oui {background:#f9f9f9;}
\ No newline at end of file
+.portfolios {}
+.portfolios h3 {background-color:#GET{claire};padding:2px 10px;color:#000;margin-bottom:0;}
+.portfolios .liste_items {margin-top:0;}
+.portfolios .item {clear:both;padding-#GET{left}:82px;padding-#GET{right}:2px;}
+.portfolios .item .tourner {display:block;float:#GET{right};}
+.portfolios .item .tourner button {border:1px solid #999;padding:0;display:block;float:#GET{left};margin-#GET{left}:4px;}
+
+.portfolios .item .spip_logos {margin-#GET{left}:-80px;float:#GET{left};}
+.ie6 .portfolios .item .spip_logos {display:inline;position:relative;}
+.portfolios .item .titrem {margin:0 0 5px;font-size:1em;}
+.portfolios .item .titrem .fichier {font-weight:normal;font-size:0.9em;font-style:italic;}
+.portfolios .item .titrem .titre {display:block;font-size:1.1em;}
+.portfolios .item .infos {display:block;float:#GET{left};}
+.portfolios .item div.mode {display:block;float:#GET{right};clear:#GET{right};margin-top:-1.5em;position:relative;padding:0.2em 0.2em 0;padding-#GET{right}:0;}
+.portfolios .item .actions {display:block;float:#GET{right};clear:#GET{right};position:relative;}
+.portfolios .item div.mode,
+.portfolios .item .actions,
+.portfolios .item div.mode button,
+.portfolios .item .actions button {font-size:x-small;}
+
+.portfolios .item .actions > *,
+.portfolios .item .tourner,
+.portfolios .item .mode {opacity:0.1;-moz-opacity:0.1;}
+.portfolios .item .actions a.editbox {visibility:visible;opacity:1;-moz-opacity:1;font-weight:bold;}
+.portfolios .item:hover .actions > *,
+.portfolios .item:hover .tourner,
+.portfolios .item:hover .mode {visibility:visible;opacity:1;-moz-opacity:1;z-index:1000;background:[#(#GET{claire}|couleur_eclaircir|couleur_eclaircir)];}
+.portfolios .item.hover .actions > *,
+.portfolios .item.hover .tourner,
+.portfolios .item.hover .mode {visibility:visible;opacity:1;-moz-opacity:1;z-index:1000;}
+
+.portfolios .item .titre > .sanstitre {opacity:0.1;-moz-opacity:0.1;}
+
+.portfolios .tout_supprimer span {display:block;text-align:#GET{right};}
+
+.item.vu_oui {background:#f9f9f9;}
--
GitLab