remise a jour du formulaire de recherche de l'espace prive

.gitattributes

@@ -848,6 +848,7 @@ prive/themes/spip/images/puce-supprimer-8.png -text
 prive/themes/spip/images/racine-16.png -text
 prive/themes/spip/images/racine-24.png -text
 prive/themes/spip/images/reaction-48.png -text
+prive/themes/spip/images/rechercher-20.png -text
 prive/themes/spip/images/referer-16.png -text
 prive/themes/spip/images/referer-24.png -text
 prive/themes/spip/images/reseau-16.png -text

ecrire/inc/presentation_mini.php

@@ -334,7 +334,7 @@ function formulaire_recherche($page, $complement=""){
 	} else $onfocus = '';
 
 	$form = '<input type="text" size="10" value="'.$recherche_aff.'" name="recherche" class="recherche" accesskey="r"' . $onfocus . ' />';
-	$form .= "<input type='image' src='" . chemin_image('loupe.png') . "' name='submit' class='submit' alt='"._T('info_rechercher')."' />";
+	$form .= "<input type='image' src='" . chemin_image('rechercher-20.png') . "' name='submit' class='submit' alt='"._T('info_rechercher')."' />";
 	return "<div class='spip_recherche'>".generer_form_ecrire($page, $form . $complement, " method='get'")."</div>";
 }
 

prive/formulaires/recherche_ecrire.html

 <div class="formulaire_spip formulaire_recherche">
-<form action="[(#ENV{action})]" method="get"><div>
-	[(#ENV{action}|form_hidden)]
+<form action="[(#ENV{action})]" method="post"><div>
+	#ACTION_FORMULAIRE
 	[<input type="hidden" name="lang" value="(#ENV{lang})" />]
-	<label for="recherche"><:info_rechercher_02:></label>
-	<input type="text" class="text" size="10" name="recherche" id="recherche"[ value="(#ENV{recherche})"] accesskey="4" />
-	<input type='image' src='[(#CHEMIN_IMAGE{loupe.png})]' name='submit' class="image" alt='<:info_rechercher|attribut_html:>' />
-	[(#ENV{recherche}|oui)<a href='#ENV{action}' title='<:annuler_recherche|attribut_html:>'>[(#CHEMIN{img_pack/annuler-recherche.png}|balise_img|inserer_attribut{alt,<:annuler_recherche:>})]</a>]
+	<label for="#ENV{id,recherche}"><:info_rechercher_02:></label>
+	<input type="text"
+				 class="text[(#ENV{recherche}|oui) cancelable]"
+				 size="10"
+				 name="recherche"
+				 id="#ENV{id,recherche}"[ value="(#ENV{recherche}|sinon{<:info_rechercher:>})"]
+	[(#ENV{recherche}|non) onfocus="if(!$(this).attr('data-done')){$(this).val('');$(this).attr('data-done','1');}"]
+	/><input type='image'
+					 src='[(#CHEMIN_IMAGE{rechercher-20.png})]'
+					 name='submit'
+					 class="image"
+					 alt='<:info_rechercher|attribut_html:>' />[<a
+	(#ENV{recherche}|oui)
+		class="cancel"
+		href="#ENV{action}"
+		onclick="$(this).siblings('input.text').val('').siblings('input.image').click();return false;"
+		title='<:annuler_recherche|attribut_html:>'>[(#CHEMIN_IMAGE{fermer-16.png}|balise_img|inserer_attribut{alt,<:annuler_recherche:>})]</a>]
 </div></form>
 </div>

prive/style_prive.html

@@ -436,14 +436,16 @@ div.brouteur_rubrique_on div a { color: #000; }
 #wysiwyg a:hover { /*color: #f57900;*/ text-decoration: underline; }
 
 /* version old style */
-.spip_recherche { width: 240px; float: [(#GET{right})]; border:0;background:none;}
-.spip_recherche .recherche { padding: 3px; width: 200px; font-size: 10px; border: 1px solid #fff; background-color: #GET{foncee}; color: #fff; margin: 0 3px 6px 0; }
-.spip_recherche .submit {vertical-align:middle;}
+.spip_recherche { float: [(#GET{right})]; border:0;background:none;}
+.spip_recherche .recherche { float:[(#GET{left})];padding:3px;padding-#GET{right}:30px;width: 186px;font-size: 10px; border: 1px solid #fff; background-color: #GET{foncee}; color: #fff; margin: 0 0 6px; }
+.spip_recherche .submit {float: [(#GET{left})];margin-#GET{left}:-24px;margin-top:1px;}
 /* version moderne */
-.formulaire_spip.formulaire_recherche { width: 240px; float: [(#GET{right})]; border:0;background:none;}
-.formulaire_spip.formulaire_recherche .text{ padding: 3px; width: 200px; font-size: 10px; border: 1px solid #fff; background-color: #GET{foncee}; color: #fff; margin: 0 3px 6px 0; }
+.formulaire_spip.formulaire_recherche { float: [(#GET{right})]; border:0;background:none;}
+.formulaire_spip.formulaire_recherche .text{ float:[(#GET{left})];padding:3px;padding-#GET{right}:30px;width: 220px;font-size: 10px; border: 1px solid #fff; background-color: #GET{foncee}; color: #fff; margin: 0 0 6px; }
+.formulaire_spip.formulaire_recherche .text.cancelable {padding-#GET{left}:20px}
+.formulaire_spip.formulaire_recherche .cancel {float: [(#GET{left})];margin-#GET{left}:-218px;margin-top:3px;}
 .formulaire_spip.formulaire_recherche label {display:none;}
-.formulaire_spip.formulaire_recherche .submit,.formulaire_spip.formulaire_recherche .image {vertical-align:middle;}
+.formulaire_spip.formulaire_recherche .submit,.formulaire_spip.formulaire_recherche .image {float: [(#GET{left})];margin-#GET{left}:-24px;margin-top:1px;}
 
 .boutonlien { font-weight: bold; font-size: 9px; }
 a.boutonlien:hover { color: #454545; text-decoration: none; }