From 3147f7c06a0b3ede2bc9e15dcce70e4358facc20 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 4 Sep 2006 16:13:14 +0000
Subject: [PATCH] =?UTF-8?q?Doublement=20d'un=20ID=20d=C3=A9j=C3=A0=20pr?=
 =?UTF-8?q?=C3=A9sent=20(bug=20d=C3=A9couvert=20par=20Renato).=20Et=20un?=
 =?UTF-8?q?=20petit=20code=20mort.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/img_pack/presentation.js |  2 +-
 ecrire/inc/mini_nav.php         | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ecrire/img_pack/presentation.js b/ecrire/img_pack/presentation.js
index 5514e9a7e5..d54efc8986 100644
--- a/ecrire/img_pack/presentation.js
+++ b/ecrire/img_pack/presentation.js
@@ -218,7 +218,7 @@ function lancer_recherche(champ, cible) {
 function lancer_recherche_rub(champ, rac, exclus) {
 	valeur = findObj(champ).value;
 	if (valeur.length > 0) {
-		charger_id_url('./?exec=rechercher&var_ajax=1&type='+valeur+'&exclus='+exclus+'&rac='+rac, rac+'_col_1');
+		charger_id_url('./?exec=rechercher&type='+valeur+'&exclus='+exclus+'&rac='+rac, rac+'_col_1');
 	}
 }
 
diff --git a/ecrire/inc/mini_nav.php b/ecrire/inc/mini_nav.php
index 0428cc6084..19928a8e1e 100644
--- a/ecrire/inc/mini_nav.php
+++ b/ecrire/inc/mini_nav.php
@@ -54,7 +54,9 @@ function mini_afficher_rubrique ($id_rubrique, $rac="", $list=array(), $col = 1,
 				$url = "\nhref='$rec&amp;id=$id'" ;
 			} else {  $url = $acces = ''; }
 
-			$ret .= "<a"
+			$ret .= "<a class='"
+			. (($id == $next) ? "highlight" : "pashighlight")
+			. "'"
 			. $url
 			. "\nonClick=\"changerhighlight(this);"
 			. "return aff_selection_provisoire($id,$args);"
@@ -64,29 +66,24 @@ function mini_afficher_rubrique ($id_rubrique, $rac="", $list=array(), $col = 1,
 			. "return aff_selection_titre(this."
 			. $acces
 			. "firstChild.firstChild.nodeValue,$id,$args);"
-			. "\" class='". (($id == $next) ? "highlight" : "pashighlight")."'>$titre</a>";
+			. "\">$titre</a>";
 		}
 	}
 
 	$nom_col = $rac . "_col_".($col+1);
 	$left = ($col*150);
 
-	return "<div id='"
-	. $rac
-	. "_col_"
-	. $col
-	."' class='arial1'>" 
-	. http_img_pack("searching.gif", "*", "style='visibility: hidden; position: absolute; $spip_lang_left: "
-		.($left-30)
-		."px; top: 2px; z-index: 2;' id='img_$nom_col'")
+	return http_img_pack("searching.gif", "*", "style='visibility: hidden; position: absolute; $spip_lang_left: "
+	. ($left-30)
+	. "px; top: 2px; z-index: 2;' id='img_$nom_col'")
 	. "<div style='width: 150px; height: 100%; overflow: auto; position: absolute; top: 0px; $spip_lang_left: "
 	.($left-150)
 	."px;'>"
 	. $ret
-	. "\n</div>"
+	. "\n</div>\n<div id='$nom_col'>"
 	. ($next
 	   ? mini_afficher_rubrique($id_rubrique, $rac, $list, $col+1, $exclu)
-	   : "\n<div id='$nom_col'></div>")
+	   : "")
 	. "\n</div>";
 }
 
@@ -109,7 +106,11 @@ function mini_afficher_hierarchie ($id_rubrique, $rac="", $rub_exclus=0) {
 	
 	$liste = "0,".$liste;
 		
-	return mini_afficher_rubrique($id_rubrique, $rac, explode(',',$liste), 1, $rub_exclus);
+	return  "<div id='"
+	. $rac
+	. "_col_1' class='arial1'>" 
+	. mini_afficher_rubrique($id_rubrique, $rac, explode(',',$liste), 1, $rub_exclus)
+	. "</div>";
 }
 
 // http://doc.spip.org/@mini_nav_principal
-- 
GitLab