diff --git a/dist/modeles/lesauteurs.html b/dist/modeles/lesauteurs.html index bc0d99a3db5d8b776c35248a5498a9b863682e41..316eb642d736b4d5e84cea03e0509fd0a6f51a64 100644 --- a/dist/modeles/lesauteurs.html +++ b/dist/modeles/lesauteurs.html @@ -1,3 +1,2 @@ <BOUCLE_auteurs(AUTEURS) {id_article} {par nom} {", "}>[ -<a href="#URL_AUTEUR">(#NOM)</a> -]</BOUCLE_auteurs> \ No newline at end of file +<a href="#URL_AUTEUR">(#NOM)</a>]</BOUCLE_auteurs> \ No newline at end of file diff --git a/ecrire/img_pack/layer.js b/ecrire/img_pack/layer.js index 33494d251923163a30e65eeaf8e7e61f2dd67022..54f044e02c4c5b25434d80ff6e64506bf96fbb8a 100644 --- a/ecrire/img_pack/layer.js +++ b/ecrire/img_pack/layer.js @@ -1,4 +1,8 @@ var memo_obj = new Array(); +var url_chargee = new Array(); +var xmlhttp = new Array(); +var image_search = new Array(); + function findObj_test_forcer(n, forcer) { var p,i,x; @@ -8,7 +12,7 @@ function findObj_test_forcer(n, forcer) { return memo_obj[n]; } - d = document; + var d = document; if((p = n.indexOf("?"))>0 && parent.frames.length) { d = parent.frames[n.substring(p+1)].document; n = n.substring(0,p); @@ -36,14 +40,15 @@ function findObj_forcer(n) { } function hide_obj(obj) { - element = findObj(obj); - if(element) { + var element; + if (element = findObj(obj)){ if (element.style.visibility != "hidden") element.style.visibility = "hidden"; } } function swap_couche(couche, rtl, dir, no_swap) { - triangle = findObj('triangle' + couche); + var layer; + var triangle = findObj('triangle' + couche); if (!(layer = findObj('Layer' + couche))) return; if (layer.style.display == "none"){ if (!no_swap && triangle) triangle.src = dir + 'deplierbas.gif'; @@ -54,13 +59,15 @@ function swap_couche(couche, rtl, dir, no_swap) { } } function ouvrir_couche(couche, rtl,dir) { - triangle = findObj('triangle' + couche); + var layer; + var triangle = findObj('triangle' + couche); if (!(layer = findObj('Layer' + couche))) return; if (triangle) triangle.src = dir + 'deplierbas.gif'; layer.style.display = 'block'; } function fermer_couche(couche, rtl, dir) { - triangle = findObj('triangle' + couche); + var layer; + var triangle = findObj('triangle' + couche); if (!(layer = findObj('Layer' + couche))) return; if (triangle) triangle.src = dir + 'deplierhaut' + rtl + '.gif'; layer.style.display = 'none'; @@ -82,7 +89,7 @@ function manipuler_couches(action,rtl,first,last, dir) { // function slide_horizontal (couche, slide, align, depart, etape ) { - obj = findObj_forcer(couche); + var obj = findObj_forcer(couche); if (!obj) return; if (!etape) { if (align == 'left') depart = obj.scrollLeft; @@ -99,10 +106,9 @@ function slide_horizontal (couche, slide, align, depart, etape ) { } function changerhighlight (couche) { - - kids = couche.parentNode.childNodes; + var kids = couche.parentNode.childNodes; for (var i = 0; i < kids.length; i++) { - kids[i].className = "pashighlight"; + kids[i].className = "pashighlight"; } couche.className = "highlight"; } @@ -119,10 +125,6 @@ function aff_selection (type, rac, id) { // Cette fonction charge du contenu - dynamiquement - dans un // Ajax -var url_chargee = new Array(); -var xmlhttp = new Array(); -var image_search = new Array(); - function createXmlHttp() { if(window.XMLHttpRequest) return new XMLHttpRequest(); @@ -241,7 +243,7 @@ function charger_id_url(myUrl, myField, jjscript) } } - +// ne sert que pour selecteur_rubrique_ajax() dans inc/chercher_rubrique.php function charger_id_url_si_vide (myUrl, myField, jjscript) { var Field = findObj_forcer(myField); // selects the given element if (!Field) return; diff --git a/ecrire/img_pack/presentation.js b/ecrire/img_pack/presentation.js index 98fc1c8455533a13d4ff35ce8c42847bc6c76b53..5514e9a7e584b49b01c15785232a00a2d961151c 100644 --- a/ecrire/img_pack/presentation.js +++ b/ecrire/img_pack/presentation.js @@ -16,7 +16,7 @@ function changestyle(id_couche, element, style) { hide_obj("bandeauagenda"); hide_obj("bandeaumessagerie"); hide_obj("bandeausynchro"); - hide_obj("nav-recherche"); + //hide_obj("nav-recherche"); hide_obj("bandeaurecherche"); hide_obj("bandeauinfoperso"); hide_obj("bandeaudisplay"); diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index 2bea0e60a454a89c6c45e52d16498ef803fbe5c2..881d1941c9d88adcb8350b00ea0cc61d7d041cc3 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -2175,7 +2175,7 @@ if (true /*$bandeau_colore*/) { echo "<td valign='middle' class='bandeau_couleur' style='text-align: $spip_lang_left;'>"; - echo "<a href='" . generer_url_ecrire("articles_tous") . "' class='icone26' onmouseover=\"changestyle('bandeautoutsite','visibility','visible'); charger_id_url_si_vide('" . generer_url_ecrire('rubriquer',"&var_ajax=1&id=$id_rubrique") . "','nav-recherche');\">", + echo "<a href='" . generer_url_ecrire("articles_tous") . "' class='icone26' onmouseover=\"changestyle('bandeautoutsite','visibility','visible');\">", http_img_pack("tout-site.png", "", "width='26' height='20'") . "</a>"; if ($id_rubrique > 0) echo "<a href='" . generer_url_ecrire("brouteur","id_rubrique=$id_rubrique") . "' class='icone26' onmouseover=\"changestyle('bandeaunavrapide','visibility','visible');\">" . http_img_pack("naviguer-site.png", "", "width='26' height='20'") ."</a>";