diff --git a/formulaires/formulaire_ecrire_auteur.html b/formulaires/formulaire_ecrire_auteur.html index f6827143c038aa9e0c382140463d45ddb17e4783..c980833004301ca7bf78ed251d595fd30aa9a311 100644 --- a/formulaires/formulaire_ecrire_auteur.html +++ b/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 diff --git a/formulaires/formulaire_forum.html b/formulaires/formulaire_forum.html index 7dc19e4a18b67af3db649f1b88eeefcd2e2033b1..8afecc6aec0aad64b56569656de0a5fc2007921b 100644 --- a/formulaires/formulaire_forum.html +++ b/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"> diff --git a/formulaires/formulaire_inscription.html b/formulaires/formulaire_inscription.html index 2f126cdef42e1dea7020c53a4e3a88f2f03b2405..eff62cd2eb9e31342a773723edc8de85dbe00f45 100644 --- a/formulaires/formulaire_inscription.html +++ b/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:>" /> diff --git a/formulaires/formulaire_login.html b/formulaires/formulaire_login.html index edf6ef31957033e96bad0ab8e9abff6b0586a4ac..e7468b4de4ccd4c873253508c30087a349ed27fa 100644 --- a/formulaires/formulaire_login.html +++ b/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:> <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> + <label><strong><:login_pass2:></strong></label> <input type="password" name="session_password"[ id="var_login_(#ENV{login})"] class="forml" style="width: 140px;" value="" size="20" /> - </label> <br /> <input type="checkbox" name="session_remember" id="session[_(#ENV{login})]" diff --git a/formulaires/formulaire_oubli.html b/formulaires/formulaire_oubli.html index 1c42b5a5352f9f09cc932161ebe223d5f06a75c1..19d318910659def3abbca2fb3f28a8fbaf2439b5 100644 --- a/formulaires/formulaire_oubli.html +++ b/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> diff --git a/formulaires/formulaire_signature.html b/formulaires/formulaire_signature.html index 7cf741f421951a9acd2dd9d12a7f317ef3ecb641..bfad11ca14cfe4a97b8727674c2df02735541596 100644 --- a/formulaires/formulaire_signature.html +++ b/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 diff --git a/formulaires/formulaire_site.html b/formulaires/formulaire_site.html index 1669c6820a12ac6de372a23e633d520e29998cf2..621cbef0ad754b92af1428b4a0f0e0d604229f86 100644 --- a/formulaires/formulaire_site.html +++ b/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