From 471e26a8c137b683623465e93846f393275d1c93 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 11 Jun 2007 13:12:51 +0000
Subject: [PATCH] des br/ en trop dans le pave de logo une reecriture en jquery
des boutons depliants pour essais : depliement auto au premier survol
---
dist/javascript/layer.js | 42 ++++++++++++++++++++++++++++++++--------
ecrire/inc/iconifier.php | 8 ++++----
ecrire/inc/layer.php | 4 ++--
3 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/dist/javascript/layer.js b/dist/javascript/layer.js
index 740fa8c099..27c7a63661 100644
--- a/dist/javascript/layer.js
+++ b/dist/javascript/layer.js
@@ -44,18 +44,44 @@ function hide_obj(obj) {
}
}
-function toggleBouton(bouton,cible){
- //alert(jQuery(bouton));
- if (jQuery(bouton).is('.deplie')){
- jQuery(bouton).addClass('replie').removeClass('deplie');
- jQuery(cible).slideUp('fast').addClass('blocreplie').removeClass('blocdeplie');
+// deplier un ou plusieurs blocs
+jQuery.fn.showother = function(cible) {
+ if (this.is('.replie')) {
+ this.addClass('deplie').removeClass('replie');
+ jQuery(cible).show()/*.slideDown('fast')*/.addClass('blocdeplie').removeClass('blocreplie');
}
- else if (jQuery(bouton).is('.replie')){
- jQuery(bouton).addClass('deplie').removeClass('replie');
- jQuery(cible).slideDown('fast').addClass('blocdeplie').removeClass('blocreplie');
+ return this;
+}
+
+// replier un ou plusieurs blocs
+jQuery.fn.hideother = function(cible) {
+ if (!this.is('.replie')){
+ this.addClass('replie').removeClass('deplie');
+ jQuery(cible).hide()/*.slideUp('fast')*/.removeClass('blocdeplie').addClass('blocreplie');
}
+ return this;
+}
+
+// pour le bouton qui deplie/replie un ou plusieurs blocs
+jQuery.fn.toggleother = function(cible) {
+ if (this.is('.deplie'))
+ return this.hideother(cible);
+ else
+ return this.showother(cible);
}
+// deplier un ou plusieurs blocs au premier hover
+jQuery.fn.showonhover = function(cible) {
+// decommenter pour ne rien faire au hover
+// return this;
+ if (!this.is('.dejahover'))
+ return this
+ .addClass('dejahover')
+ .showother(cible);
+}
+
+
+
//
// Fonctions pour mini_nav
//
diff --git a/ecrire/inc/iconifier.php b/ecrire/inc/iconifier.php
index b1ae8a2d59..595760b022 100644
--- a/ecrire/inc/iconifier.php
+++ b/ecrire/inc/iconifier.php
@@ -36,19 +36,19 @@ function inc_iconifier_dist($id_objet, $id, $script, $visible=false) {
$bouton = bouton_block_depliable("$texteon<br />$img",$visible,'on');
$masque = debut_block_depliable($visible,'on') . $clic . fin_block();
- $res = "<div style='text-align: center'>$masque</div><br /><br />";;
- $texteoff = _T('logo_survol');
+ $res = "<div style='text-align: center'>$masque</div>";;
+ $texteoff = _T('logo_survol');
if ($logo = $chercher_logo($id, $id_objet, 'off')) {
list($img, $clic) = decrire_logo($id_objet, 'off', $id, 170, 170, $logo, $texteoff, $script);
$masque = block_parfois_visible('off', "$texteoff<br />$img", $clic, 'margin-bottom: -2px');
- $res .= "<div style='text-align: center'>$masque</div>";
+ $res .= "<br /><br /><div style='text-align: center'>$masque</div>";
} else {
if ($GLOBALS['meta']['activer_logos_survol'] == 'oui') {
$masque = indiquer_logo($texteoff, $id_objet, 'off', $id, $script, $iframe);
- $res .= block_parfois_visible('off', "$texteoff", $masque);
+ $res .= "<br /><br />".block_parfois_visible('off', "$texteoff", $masque);
}
}
}
diff --git a/ecrire/inc/layer.php b/ecrire/inc/layer.php
index 45b1951a38..8bd497416f 100644
--- a/ecrire/inc/layer.php
+++ b/ecrire/inc/layer.php
@@ -82,8 +82,8 @@ function bouton_block_depliable($texte,$deplie,$ids=""){
.($bouton_id?"id='$bouton_id' ":"")
."class='titrem$class'"
. (($deplie===-1)?"":
- " onclick=\"toggleBouton(jQuery(this),jQuery('$cible'));\""
- ." onmouseover=\"jQuery(this).addClass('hover');\""
+ " onclick=\"jQuery(this).toggleother('$cible');\""
+ ." onmouseover=\"jQuery(this).addClass('hover').showonhover('$cible');\""
." onmouseout=\"jQuery(this).removeClass('hover');\""
)
.">$texte</div>"
--
GitLab