diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php index 1ec5e4ab82e44d922ad5c1ee8f1cd981a032bfee..fc40c0b5d729f32a5fa422d14f8c24a8cd41c124 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 76aca6fa5e408b7df64446a1dd63773efcfee1e2..ff3ae410c0d8a6ff0f9aee879e27899e01ee5f03 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 Binary files a/prive/images/searching.gif and b/prive/images/searching.gif differ diff --git a/prive/javascript/ajaxCallback.js b/prive/javascript/ajaxCallback.js index a34c85b35b60cc6fefa99f76cdf383f9e1eb97d4..2ae1c0e49d5bc69b4f61b5ddb32cba2dc76b15f6 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 }