diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php index 67e62abba232535532c7c0af88109d1944c744e7..1aa12dd532e560c3579fbaa331f8e390d62f3b34 100644 --- a/ecrire/exec/recherche.php +++ b/ecrire/exec/recherche.php @@ -17,27 +17,30 @@ include_spip('inc/sites_voir'); function exec_recherche_dist() { - global $couleur_foncee, $recherche; + global $couleur_foncee, $recherche; - $recherche = addslashes(entites_html($recherche)); + $recherche = addslashes(entites_html($recherche)); - debut_page(_T('titre_page_recherche', array('recherche' => $recherche))); + debut_page(_T('titre_page_recherche', array('recherche' => $recherche))); - debut_gauche(); - - $recherche_aff = _T('info_rechercher'); - $onfocus = "onfocus=this.value='';"; - echo "<form method='get' style='margin: 0px;' action='" . generer_url_ecrire("recherche","") . "'>"; - echo "<input type='hidden' name='exec' value='recherche' />"; - echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r" '.$onfocus.'>'; - echo "</form>"; - - + debut_gauche(); + + if ($recherche) { + $recherche_aff = $recherche; + $onfocus = "this.value='$recherche';"; + } else { + $recherche_aff = _T('info_rechercher'); + $onfocus = "this.value='';"; + } + echo "<form method='get' style='margin: 0px;' action='" . generer_url_ecrire("recherche","") . "'>"; + echo "<input type='hidden' name='exec' value='recherche' />"; + echo '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="spip_recherche" accesskey="r" onfocus="'.$onfocus . '">'; + echo "</form>"; -debut_droite(); + debut_droite(); -if (strlen($recherche) > 0) { + if (strlen($recherche) > 0) { echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'><B>"._T('info_resultat_recherche')."</B><BR>"; echo "<FONT SIZE=5 COLOR='$couleur_foncee'><B>$recherche</B></FONT><p>"; diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index ca75de8438153bfd6dd2f05f2b2f9fd1e2f6f84e..9864629719119f15b5a14a09ef6d85d12917824a 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -2571,7 +2571,7 @@ if (true /*$gadgets*/) { echo "<div id='bandeaurecherche' class='bandeau_couleur_sous' style='width: 146px; $spip_lang_left: 60px;'>"; echo "<form method='get' style='margin: 0px; position: relative;' action='" . generer_url_ecrire("recherche") . "'>"; echo "<input type='hidden' name='exec' value='recherche' />"; - echo "<input type=\"search\" id=\"form_recherche\" style=\"width: 140px;\" size=\"10\" value=\""._T('info_rechercher')."\" name=\"recherche\" onkeypress=\"t=window.setTimeout('lancer_recherche(\'form_recherche\',\'resultats_recherche\')', 200);\" autocomplete=\"off\" class=\"formo\" accesskey=\"r\" ".$onfocus.">"; + echo "<input type=\"search\" id=\"form_recherche\" style=\"width: 140px;\" size=\"10\" value=\""._T('info_rechercher')."\" name=\"recherche\" onkeypress=\"t=window.setTimeout('lancer_recherche(\'form_recherche\',\'resultats_recherche\')', 200);\" autocomplete=\"off\" class=\"formo\" accesskey=\"r\">"; echo "</form>"; echo "</div>"; // FIN GADGET recherche