From 7931592d241e29849684a41dd86d0a05c67f24f4 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 Oct 2008 08:29:09 +0000
Subject: [PATCH] report de [12873] [12874] [12875]
---
ecrire/inc/plugin.php | 3 ++-
ecrire/inc/presentation.php | 2 +-
prive/images/searching.gif | Bin 1141 -> 1849 bytes
prive/javascript/ajaxCallback.js | 7 +++++--
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php
index 1ec5e4ab82..fc40c0b5d7 100644
--- a/ecrire/inc/plugin.php
+++ b/ecrire/inc/plugin.php
@@ -478,7 +478,8 @@ function spip_plugin_install($action,$prefix,$version_cible){
$nom_meta_base_version = $prefix."_base_version";
switch ($action){
case 'test':
- return (isset($GLOBALS['meta'][$nom_meta_base_version]) AND ($GLOBALS['meta'][$nom_meta_base_version]>=$version_cible));
+ return (isset($GLOBALS['meta'][$nom_meta_base_version])
+ AND version_compare($GLOBALS['meta'][$nom_meta_base_version],$version_cible,'>='));
break;
case 'install':
if (function_exists($upgrade = $prefix."_upgrade"))
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 76aca6fa5e..ff3ae410c0 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -553,7 +553,7 @@ function debut_javascript()
? ''
: "jQuery.ajax({'url':'$testeur'});") .
(_OUTILS_DEVELOPPEURS ?"var _OUTILS_DEVELOPPEURS=true;":"") .
- "\nvar ajax_image_searching = \n'<div class=\'image_loading\'><img src=\"".url_absolue(chemin_image("searching.gif"))."\" alt=\"\" /></div>';" .
+ "\nvar ajax_image_searching = \n'<img src=\"".url_absolue(chemin_image("searching.gif"))."\" alt=\"\" />';" .
"\nvar stat = " . (($GLOBALS['meta']["activer_statistiques"] != 'non') ? 1 : 0) .
"\nvar largeur_icone = " .
intval(_LARGEUR_ICONES_BANDEAU) .
diff --git a/prive/images/searching.gif b/prive/images/searching.gif
index bf510daca026ca666c43682a7265f8bb8d7ea018..dc21df1837f54a65bbdf6a857f8358de880d63d9 100644
GIT binary patch
literal 1849
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
IKcc1jKhN|OI{*Lx
literal 1141
zcmb`_XHQ#a6u|N8J;2z6kg&moOcUZjN7A%3X#yl^o2E_Z0NRq4M@W1CBm^(u9^dP0
zN8k`fDHZ~&Rcyz_27?(k!h$jc2noazOMpP^y{9Pd%Zj|~`2fH3m(GcL6nX3R3jrp;
zrV-ZH*JrU<^78VMlanP9Npy7d(b3V~-rmH-#KFPA>gwvy(9qo6+~VTm%*@R0?(XL1
zre3el$;s*O@2{<`Ei5c-Yip~isYy*ujf;!h*w|QES?TEL7#kZ43ky3uJS-?E*xufr
zpPz4SZQbABUszaJT3RYDF4kx?6%`c}Mb*{Sm6es5Os1`^t(~2n`1ttr^mL=qI6FHV
z8ynlu(4bbUo0^(zHk(u`wOXx3MMa&Rod$!Uxw+YFHYX$`^z`%$3=CvsWR#Yc#>B+n
zIKI5RoS2xHpP%2@*f>5uzP7d&9v-e#Dn~{}T3T94N=l}ur$<Ler>3UX*Vij6D<>x>
z)6&vNlI-p6wcG7oU0wC{^(iSS!^6XagM&#)N$u_J)z#JA-QCB>$JqZm;$x>L5zn99
zzxOmEG(^gvo#5g<CXbIHEZDKgaVCuOARXbr1QNN*<lw15#7pFosmjJ(Zsr$~j3S1*
zg#0)Ze4XWiS3mQoACF8ko6MmIKuhgg8a%dR3bPJ^QyFbg<<&dR`*4IWBFpoAA;
zAb9mU=+W(K-jpB!?qBhubb7jht~Z*fub!46{x9FLF_YwH+-h_a)>r<mJJpVG*bE2)
zbWR2zvBBM8J6*d3{8z7epG17^Me&1G--;=%j`o(OWg3~fa=7Sg#&3M?U4`NUZ77Uq
zx1TCUI%GQV06EFv0(IU2b1(Bjq{{Zc_0y*zlqeGqeJnhYvA39(Wn}5f&C)Yw;QCpr
za{Rn(InH+EkKRqwfDOo51~HV|39X=c0Y{b1_6hh<NO64O{WuQwMytaa28P~9-E`IS
zn8?M`tg}>kiml*s$xfb5KXz1OCp3i!oU4%G-aa?7lx(M8F-|Ui&zGkz$)*26*JOS0
z9t50KU=ObgSxDgV7kn9jn=3qo@Z_Qu1YhLZaQVB-Wdw;w$z@`0kP-!AF8-=-1Z)+_
zR5J-$G3|Hq`u7lgj(GM%EQf*k?mD>p05_W4IdH|h3iu*<HD2&9&HB&#-F1}9h%*F*
z{NxJYzRb*$X6NFp-&h2u#`1_C>2Se`cz(x+rxBh16Cx$J1{rv8HM$%`LWNnDf!+BB
D{O-KY
diff --git a/prive/javascript/ajaxCallback.js b/prive/javascript/ajaxCallback.js
index a34c85b35b..2ae1c0e49d 100644
--- a/prive/javascript/ajaxCallback.js
+++ b/prive/javascript/ajaxCallback.js
@@ -60,8 +60,11 @@ if(!jQuery.load_handlers) {
// animation du bloc cible pour faire patienter
jQuery.fn.animeajax = function(end) {
this.children().css('opacity', 0.5);
- if (typeof ajax_image_searching != 'undefined')
- this.prepend(ajax_image_searching);
+ if (typeof ajax_image_searching != 'undefined'){
+ var i = (this).find('.image_loading');
+ if (i.length) i.html(ajax_image_searching);
+ else this.prepend('<span class="image_loading">'+ajax_image_searching+'</span>');
+ }
return this; // don't break the chain
}
--
GitLab