Formulaires : des <labels> mieux placés

formulaires/formulaire_ecrire_auteur.html

@@ -20,20 +20,15 @@
 ]
 
 [(#REM) Formulaire normal   ]
-<p><label><:form_pet_votre_email:><br />
-<input type="text" class="forml" name="email_message_auteur#ENV{id}"
-	value="#ENV{mail}" size="30" />
-</label></p>
-<p><label><:form_prop_sujet:><br />
-<input type="text" class="forml" name="sujet_message_auteur#ENV{id}"
-	value="#ENV{sujet}" size="30" />
-</label></p>
+<p><label><:form_pet_votre_email:></label>
+<input type="text" class="forml" name="email_message_auteur#ENV{id}" value="#ENV{mail}" size="30" /></p>
+<p><label><:form_prop_sujet:></label>
+<input type="text" class="forml" name="sujet_message_auteur#ENV{id}" value="#ENV{sujet}" size="30" /></p>
 <p>
 <textarea name="texte_message_auteur#ENV{id}" rows='10' class='forml' cols='40'>#ENV{texte}</textarea>
 </p>
 <div style="text-align:#LANG_RIGHT;">
-	<input type="submit"  class="spip_bouton" name="valide"
-		 value="#ENV{bouton}" />
+<input type="submit"  class="spip_bouton" name="valide" value="#ENV{bouton}" />
 </div>
 
 </form>
\ No newline at end of file

formulaires/formulaire_forum.html

@@ -29,9 +29,7 @@
 (#ENV**{afficher_texte}|choixsiegal{'non', '',' '})
 		<fieldset class="spip_encadrer">
 		<legend><strong><:forum_titre:></strong></legend>
-		<label><input type="text" name="titre" 
-			[value="(#ENV{titre})" ]class="forml" size="40" />
-		</label>
+		<p><label><:forum_titre:></label><input type="text" name="titre" [value="(#ENV{titre})" ]class="forml" size="40" /></p>
 		</fieldset>
 		<br />
 		<fieldset class="spip_encadrer">
@@ -43,29 +41,22 @@
 		<fieldset class="spip_encadrer">
 			<legend><:forum_lien_hyper:></legend>
 			<p><:forum_page_url:></p>
-			<p><label><:forum_titre:>
-				<input type="text" name="nom_site_forum" class="forml" size="40"
-					value="[(#ENV{nom_site_forum})]" />
-			</label></p>
-			<p><label><:forum_url:>
-			<input type="text" name="url_site" class="forml" size="40"
-				value="[(#ENV{url_site})]" />
-			</label></p>
+			<p><label><:forum_titre:></label>
+				<input type="text" name="nom_site_forum" class="forml" size="40" value="[(#ENV{nom_site_forum})]" /></p>
+			<p><label><:forum_url:></label>
+			<input type="text" name="url_site" class="forml" size="40" value="[(#ENV{url_site})]" /></p>
 		</fieldset>
 		<br />
 		<fieldset class="spip_encadrer">
 			<legend><:forum_qui_etes_vous:></legend>
-			<p><label><:forum_votre_nom:>
-				<input type="text" name="auteur" value="[(#ENV{auteur})]"
-					class="forml" size="40"[
-					readonly='(#ENV{readonly})'] />
-			</label></p>
-			<p><label><:forum_votre_email:>
+			<p><label><:forum_votre_nom:></label>
+				<input type="text" name="auteur" value="[(#ENV{auteur})]" class="forml" size="40"[
+					readonly='(#ENV{readonly})'] /></p>
+			<p><label><:forum_votre_email:></label>
 				<input type="text" name="email_auteur"
 				value="[(#ENV{email_auteur})]"
 				class="forml" size="40" [
-				readonly='(#ENV{readonly})'] />
-			</label></p>
+				readonly='(#ENV{readonly})'] /></p>
 		</fieldset>
 
 		<div align="#LANG_RIGHT">

formulaires/formulaire_inscription.html

@@ -12,14 +12,10 @@
 <form	id="inscription" method='post' action="[(#ENV{self})]">
 	<fieldset class='spip_sanscadre'>
 		<legend><:form_forum_identifiants:></legend>
-		<label>
-		  <:form_pet_votre_nom:>
-		  <input type="text" class="forml" name="nom_inscription" value="" size="30" />
-		</label>
-		<label>
-		  <:form_pet_votre_email:>
-		  <input type="text" class="forml" name="mail_inscription" value="" size="30" />
-		</label>
+		<p><label><:form_pet_votre_nom:></label>
+		  <input type="text" class="forml" name="nom_inscription" value="" size="30" /></p>
+		<p><label><:form_pet_votre_email:></label>
+		  <input type="text" class="forml" name="mail_inscription" value="" size="30" /></p>
 	</fieldset>
 	<div align="right">
 		<input type="submit" class="spip_bouton" value="<:bouton_valider:>" />

formulaires/formulaire_login.html

@@ -19,9 +19,9 @@
 		<div class="spip_encadrer" style="[(#URL_SITE_SPIP|style_align)]">[
 			<div class="reponse_formulaire">(#ENV*{erreur})<br /><br /></div>
 ][
-			<label for='var_login'><strong><:login_login2:></strong><br />(#ENV{login}|?{'',' '})
+			<label for='var_login'><strong><:login_login2:></strong></label><br />(#ENV{login}|?{'',' '})
 			<input type="text" id='var_login' name="var_login" class="forml" value="" size="40" />
-			</label>
+			
 ][
 <div>
 [<div style="float: #LANG_RIGHT; padding-#LANG_LEFT: 10px;">(#LOGO_AUTEUR||reduire_image{100,80}|inserer_attribut{alt,#ENV{login_alt}})</div>]
@@ -37,16 +37,14 @@ document.write("<:login_login:>&nbsp;<strong>[(#ENV{login_alt})]<" + "/strong><b
 		<:login_non_securise:>
 		<a href="[(#ENV{action})]"><:login_recharger:></a>.
 	</p>
-	<label><strong><:login_login2:></strong><br />
+	<label><strong><:login_login2:></strong></label><br />
 	<input type='text' name='session_login' class='forml' [value="(#ENV{login})" ]size='40' />
-	</label>
 </noscript>
 
 </div>
 <p>
-		<label><strong><:login_pass2:></strong>&nbsp;
+		<label><strong><:login_pass2:></strong></label>&nbsp;
 		<input type="password" name="session_password"[ id="var_login_(#ENV{login})"] class="forml" style="width: 140px;" value="" size="20" />
-		</label>	
 		<br />&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox"
 			 name="session_remember"
 			 id="session[_(#ENV{login})]"

formulaires/formulaire_oubli.html

@@ -7,15 +7,13 @@
 	<fieldset class='spip_sanscadre'>
 	<legend><:pass_nouveau_pass:></legend>[
 	<input type='hidden' name="p" value="(#ENV{p})" />
-	<label>
-	    <:pass_choix_pass:>
+	<label><:pass_choix_pass:></label>
 	    <input type="password" name="oubli" />
-	</label>][
+	][
 	(#ENV{p}|?{'',' '})
-	<label>
-	  <:pass_indiquez_cidessous:>
+	<label><:pass_indiquez_cidessous:></label>
 	  <input type="text" name="oubli" />
-	</label>]
+	]
 	<input type="submit" class="fondl" value="<:pass_ok:>" />
       </fieldset>
 </form>

formulaires/formulaire_signature.html

@@ -4,32 +4,22 @@
 [(#ENV*{texte}|propre)]
 <fieldset style='font-size: 110%; font-weight: bold;'>
 	<legend><:form_forum_identifiants:></legend>
-	<label>
-		<:form_pet_votre_nom:>
-		<input type="text" class="forml" name="nom_email"
-		value="" size="20" />
-	</label><br />
-	<label>
-		<:form_pet_votre_email:><br />
-		<input type="text" class="forml" name="adresse_email"
-		value="" size="20" />
-	</label>
+	<p><label><:form_pet_votre_nom:></label>
+		<input type="text" class="forml" name="nom_email" value="" size="20" /></p>
+	<br />
+	<p><label><:form_pet_votre_email:></label><br />
+		<input type="text" class="forml" name="adresse_email" value="" size="20" /></p>
 </fieldset>
 <br />
 <p>
 [(#ENV{site_obli})<:form_pet_votre_site:><br />]
 <fieldset style='font-size: 110%; font-weight: bold;'>
 	<legend><:forum_lien_hyper:></legend>
-	<label>
-	<:form_pet_nom_site2:><br />
-	<input type="text" class="forml" name="signature_nom_site"
-	value="" size="20" />
-	</label>
-	<label>
-		<:form_pet_adresse_site:><br />
-		<input type="text" class="forml" name="signature_url_site"
-		value="http://" size="20" />
-	</label>
+	<p><label><:form_pet_nom_site2:></label><br />
+	<input type="text" class="forml" name="signature_nom_site" value="" size="20" /></p>
+	<p><label><:form_pet_adresse_site:></label><br />
+		<input type="text" class="forml" name="signature_url_site" value="http://" size="20" /></p>
+	
 </fieldset>
 
 [
@@ -37,16 +27,12 @@
 	<br />
 	<fieldset style='font-weight: bold'>
 		<legend><:form_pet_message_commentaire:></legend>
-		<label>
-		<:info_texte_message:><br />
-			<textarea name="message" rows="3"
-			class="forml" cols="20"></textarea>
-		</label>
+		<p><label><:info_texte_message:></label><br />
+		<textarea name="message" rows="3" class="forml" cols="20"></textarea></p>
 	</fieldset>
 ]
 
 <br />
-	<div align="right"><input type="submit" class="spip_bouton"
-	value="<:bouton_valider:>" /></div>
+	<div align="right"><input type="submit" class="spip_bouton" value="<:bouton_valider:>" /></div>
 </div>
-</form>
+</form>
\ No newline at end of file

formulaires/formulaire_site.html

@@ -2,22 +2,13 @@
       <br />
       <fieldset	class='spip_encadrer' style='color: black; font-size: 90%'>
 	<legend><:info_site:></legend>
-	<label>
-	  <:form_prop_nom_site:>
+	<p><label><:form_prop_nom_site:></label><br />
+	  <input type="text" class="forml" name="nom_site" value="" size="30" /></p><br />
+	<p><label><:form_prop_url_site:></label><br />
+	  <input type="text" class="forml" name="url_site" value="" size="30" /></p>
 	<br />
-	  <input type="text" class="forml" name="nom_site" value="" size="30" />
-	</label>
-	<br />
-	<label>
-	  <:form_prop_url_site:>
-	<br />
-	  <input type="text" class="forml" name="url_site" value="" size="30" />
-	</label>
-	<br />
-	<label><:form_prop_description:>
-	<br />
-	  <textarea name='description_site' rows='5' class='forml' cols='40'></textarea>
-	</label>
+	<p><label><:form_prop_description:></label><br />
+	  <textarea name='description_site' rows='5' class='forml' cols='40'></textarea></p>
 	<div align="left"><input type="submit" class="spip_bouton" value="<:bouton_valider:>" /></div>
       </fieldset>
-</form>
+</form>
\ No newline at end of file