From a7d2c47ee4d5753581d3d80bcc50d352086f4fa7 Mon Sep 17 00:00:00 2001
From: tetue <tetue@rezo.net>
Date: Sat, 26 Jul 2008 11:51:03 +0000
Subject: [PATCH] Formulaires : structure HTML (homogeneisation)
---
dist/formulaires/ecrire_auteur.html | 3 +-
dist/formulaires/forum.html | 7 +--
dist/formulaires/inscription.html | 6 ++-
dist/formulaires/mot_de_passe.html | 34 ++++++------
dist/formulaires/oubli.html | 5 +-
dist/formulaires/signature.html | 6 ++-
dist/formulaires/site.html | 6 ++-
prive/formulaires/login.html | 80 +++++++++++++++--------------
prive/login.html | 11 ++--
9 files changed, 84 insertions(+), 74 deletions(-)
diff --git a/dist/formulaires/ecrire_auteur.html b/dist/formulaires/ecrire_auteur.html
index 3907252c03..a42a43922f 100644
--- a/dist/formulaires/ecrire_auteur.html
+++ b/dist/formulaires/ecrire_auteur.html
@@ -4,8 +4,7 @@
[<p class="reponse_formulaire reponse_formulaire_erreur">(#ENV*{message_erreur})</p>]
[(#ENV{editable})
<form method='post' action='#ENV{action}#formulaire_ecrire_auteur#ENV{id}' enctype='multipart/form-data'>
- [(#REM) declarer les hidden qui declencheront le service du formulaire
- parametre : url d'action ]
+ [(#REM) declarer les hidden qui declencheront le service du formulaire parametre : url d'action ]
#ACTION_FORMULAIRE{#ENV{action}}
[(#REM) Previsualisation... ]
[(#ENV*{erreurs}|table_valeur{previsu}|oui)
diff --git a/dist/formulaires/forum.html b/dist/formulaires/forum.html
index 8e6aa69e21..e76e141386 100644
--- a/dist/formulaires/forum.html
+++ b/dist/formulaires/forum.html
@@ -114,9 +114,10 @@
<INCLURE{fond=formulaires/inc-login_forum}{env} />
[(#REM) Piege a robots spammeurs ]
- <p style="display: none;"><label for="nobot"><:antispam_champ_vide:></label>
- <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" /></p>
-
+ <p style="display: none;">
+ <label for="nobot"><:antispam_champ_vide:></label>
+ <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" />
+ </p>
<p class="boutons"><input type="submit" class="submit" value="<:forum_voir_avant:>" /></p>
]
</div>
diff --git a/dist/formulaires/inscription.html b/dist/formulaires/inscription.html
index 3cfc845c89..ede845fa75 100644
--- a/dist/formulaires/inscription.html
+++ b/dist/formulaires/inscription.html
@@ -25,8 +25,10 @@
</ul>
</fieldset>
[(#REM) Piege a robots spammeurs ]
- <p style="display: none;"><label for="nobot"><:antispam_champ_vide:></label>
- <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" /></p>
+ <p style="display: none;">
+ <label for="nobot"><:antispam_champ_vide:></label>
+ <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" />
+ </p>
<p class="boutons"><input type="submit" class="submit" value="<:bouton_valider:>" /></p>
</form>
[<script type="text/javascript"><!--
diff --git a/dist/formulaires/mot_de_passe.html b/dist/formulaires/mot_de_passe.html
index d89b9c432c..bca8ad73ea 100644
--- a/dist/formulaires/mot_de_passe.html
+++ b/dist/formulaires/mot_de_passe.html
@@ -1,26 +1,26 @@
-<div class="formulaire_spip formulaire_mot_de_passe">[
-(#ENV*{message_erreur})
-][
-(#ENV*{message_ok})
-][
-(#ENV*{editable}|?{' '})
-
+<div class="formulaire_spip formulaire_mot_de_passe">
+[<p class="reponse_formulaire reponse_formulaire_erreur">(#ENV*{message_erreur})</p>]
+[<p class="reponse_formulaire reponse_formulaire_ok">(#ENV*{message_ok})</p>]
+[(#ENV*{editable}|?{' '})
<form id="oubli_form" action="[(#ENV{action})]" method="post">
[(#REM) activer le traitement auto et dispatch sur charger/verifier/traiter]
#ACTION_FORMULAIRE{#ENV{action}}
<fieldset>
- <legend><:pass_nouveau_pass:></legend><ul>
- <li class="saisie_oubli obligatoire[ (#ENV*{erreurs}|table_valeur{oubli}|oui)erreur]">
- <label for="oubli"><:pass_choix_pass:></label>
- [<span class='erreur'>(#ENV**{erreurs}|table_valeur{oubli})</span>]
- <input type='password' name='oubli' id='oubli' value="#ENV**{oubli}" />
- </li>
- </ul></fieldset>
+ <legend><:pass_nouveau_pass:></legend>
+ <ul>
+ <li class="saisie_oubli obligatoire[ (#ENV*{erreurs}|table_valeur{oubli}|oui)erreur]">
+ <label for="oubli"><:pass_choix_pass:></label>
+ [<span class='erreur'>(#ENV**{erreurs}|table_valeur{oubli})</span>]
+ <input type='password' name='oubli' id='oubli' value="#ENV**{oubli}" />
+ </li>
+ </ul>
+ </fieldset>
[(#REM) Piege a robots spammeurs ]
- <p style="display: none;"><label for="nobot"><:antispam_champ_vide:></label>
- <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" /></p>
+ <p style="display: none;">
+ <label for="nobot"><:antispam_champ_vide:></label>
+ <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" />
+ </p>
<p class="boutons"><input type="submit" class="submit" value="<:pass_ok:>" /></p>
- </fieldset>
</form>
<script type='text/javascript'>/*<!#EVAL{chr(91)}CDATA#EVAL{chr(91)}*/
document.getElementById('oubli').focus()
diff --git a/dist/formulaires/oubli.html b/dist/formulaires/oubli.html
index 725d761ea1..c965b97a47 100644
--- a/dist/formulaires/oubli.html
+++ b/dist/formulaires/oubli.html
@@ -16,7 +16,10 @@
</ul>
</fieldset>
[(#REM) Piege a robots spammeurs ]
- <p style="display: none;"><label for="nobot"><:antispam_champ_vide:></label><input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" /></p>
+ <p style="display: none;">
+ <label for="nobot"><:antispam_champ_vide:></label>
+ <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" />
+ </p>
<p class="boutons"><input type="submit" class="submit" value="<:pass_ok:>" /></p>
</form>
<script type='text/javascript'>/*<!#EVAL{chr(91)}CDATA#EVAL{chr(91)}*/
diff --git a/dist/formulaires/signature.html b/dist/formulaires/signature.html
index 3978dd69d0..dcfb85e18f 100644
--- a/dist/formulaires/signature.html
+++ b/dist/formulaires/signature.html
@@ -44,8 +44,10 @@
</fieldset>
[(#REM) Piege a robots spammeurs ]
- <p style="display: none;"><label for="nobot"><:antispam_champ_vide:></label>
- <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" /></p>
+ <p style="display: none;">
+ <label for="nobot"><:antispam_champ_vide:></label>
+ <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" />
+ </p>
[(#ENV{_message})
<fieldset>
diff --git a/dist/formulaires/site.html b/dist/formulaires/site.html
index 8093e18212..d7f00ca61b 100644
--- a/dist/formulaires/site.html
+++ b/dist/formulaires/site.html
@@ -26,8 +26,10 @@
</ul>
</fieldset>
[(#REM) Piege a robots spammeurs ]
- <p style="display: none;"><label for="nobot"><:antispam_champ_vide:></label>
- <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" /></p>
+ <p style="display: none;">
+ <label for="nobot"><:antispam_champ_vide:></label>
+ <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" />
+ </p>
<p class="boutons"><input type="submit" class="submit" value="<:bouton_valider:>" /></p>
</form>
]
diff --git a/prive/formulaires/login.html b/prive/formulaires/login.html
index 2f0a88d3f5..61cd49f0c1 100644
--- a/prive/formulaires/login.html
+++ b/prive/formulaires/login.html
@@ -2,44 +2,44 @@
#HTTP_HEADER{"Pragma: no-cache"}
<div class='formulaire_spip formulaire_login'>
- <br class='spacer' />
- [<p class="formulaire_message">(#ENV**{_deja_loge})</p>]
- [<p class="formulaire_message">(#ENV**{message_ok})</p>]
- [<p class='formulaire_erreur'>(#ENV**{message_erreur})</p>]
+ [(#REM) pour IE qui sinon se perd dans l'ajax !, ne pas retirer]<br class='bugajaxie' />
+ [<p class="reponse_formulaire reponse_formulaire_ok">(#ENV**{_deja_loge})</p>]
+ [<p class="reponse_formulaire reponse_formulaire_ok">(#ENV**{message_ok})</p>]
+ [<p class='reponse_formulaire reponse_formulaire_erreur'>(#ENV**{message_erreur})</p>]
- [(#ENV{echec_cookie})<fieldset class='formulaire_erreur'>
- <h2><:avis_erreur_cookie:></h2>
- <p><:login_cookie_oblige:><br /><:login_cookie_accepte:></p>
+ [(#ENV{echec_cookie})
+ <fieldset class='formulaire_erreur'>
+ <h2><:avis_erreur_cookie:></h2>
+ <p class="erreur_message"><:login_cookie_oblige:><br /><:login_cookie_accepte:></p>
</fieldset>]
[(#ENV{editable})
<form id='formulaire_login' method='post' action='#ENV{action}' enctype='multipart/form-data'>
- [(#REM) declarer les hidden qui declencheront le service du formulaire
- parametre : url d'action ]
- #ACTION_FORMULAIRE{#ENV{action}}
- <fieldset><legend><:form_forum_identifiants:></legend>
- <span id="spip_logo_auteur">#ENV*{_logo,''}</span>
- <ul>
- <li class="editer_login obligatoire">
- <label for="var_login"><:login_login2:></label>
- <input class='text forml' type='text' name='var_login' id='var_login' value="[(#ENV**{var_login})]" size='40' />
- [<span class='erreur'>(#ENV**{erreurs}|table_valeur{var_login})</span>]
- </li>
- <li class="editer_password obligatoire">
- <label for="password"><:login_pass2:></label>
- <input class='password' type='password' name='password' id='password' value="" size='40' />
- [<span class='erreur'>(#ENV**{erreurs}|table_valeur{password})</span>]
- <span class='details'>[<a href="#URL_PAGE{spip_pass}" target="spip_pass" onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=330'); return false;"><:login_motpasseoublie:></a>]</span>
- </li>
- [(#ENV{rester_connecte})
- <li class="editer_session">
- <input class='checkbox' type="checkbox" name="session_remember" id="session_remember" value="oui" [(#ENV**{cnx}|?{' '})checked="checked"] onchange="jQuery(this).addClass('modifie');" />
- <label class='nofx' for="session_remember"><:login_rester_identifie:></label>
- </li>
- ]
- </ul>
- <p class="spip_bouton"><input type="submit" value="<:bouton_valider:>" /></p>
- </fieldset>
+ [(#REM) declarer les hidden qui declencheront le service du formulaire parametre : url d'action ]
+ #ACTION_FORMULAIRE{#ENV{action}}
+ <fieldset>
+ <legend><:form_forum_identifiants:></legend>
+ <span id="spip_logo_auteur">#ENV*{_logo,''}</span>
+ <ul>
+ <li class="editer_login obligatoire">
+ <label for="var_login"><:login_login2:></label>
+ <input class='text forml' type='text' name='var_login' id='var_login' value="[(#ENV**{var_login})]" size='40' />
+ [<span class="erreur_message">(#ENV**{erreurs}|table_valeur{var_login})</span>]
+ </li>
+ <li class="editer_password obligatoire">
+ <label for="password"><:login_pass2:></label>
+ <input class='password' type='password' name='password' id='password' value="" size='40' />
+ [<span class="erreur_message">(#ENV**{erreurs}|table_valeur{password})</span>]
+ <span class='details'>[<a href="#URL_PAGE{spip_pass}" target="spip_pass" onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=330'); return false;"><:login_motpasseoublie:></a>]</span>
+ </li>
+ [(#ENV{rester_connecte})
+ <li class="editer_session">
+ <input class='checkbox' type="checkbox" name="session_remember" id="session_remember" value="oui" [(#ENV**{cnx}|?{' '})checked="checked"] onchange="jQuery(this).addClass('modifie');" />
+ <label class='nofx' for="session_remember"><:login_rester_identifie:></label>
+ </li>]
+ </ul>
+ </fieldset>
+ <p class="boutons"><input type="submit" value="<:bouton_valider:>" /></p>
</form>
]
[(#REM) en cas d'absence de cookie, on represente le formulaire alternatif ]
@@ -47,11 +47,13 @@
(#ENV{auth_http}|form_hidden)
]
<fieldset>
- <legend><:login_sans_cookiie:></legend>
- <div><:login_preferez_refuser:>
- <input type="hidden" name="essai_auth_http" value="oui"/>
- [<input type="hidden" name="url" value="(#ENV{url})"/>]
- <p class="spip_bouton"><input type="submit" value="<:login_sans_cookiie:>"/></p></div>
+ <legend><:login_sans_cookiie:></legend>
+ <div>
+ <:login_preferez_refuser:>
+ <input type="hidden" name="essai_auth_http" value="oui"/>
+ [<input type="hidden" name="url" value="(#ENV{url})"/>]
+ <p class="boutons"><input type="submit" value="<:login_sans_cookiie:>"/></p>
+ </div>
</fieldset>
</form>
]
@@ -126,4 +128,4 @@ jQuery('form#formulaire_login').submit(function(){
// OU qu'il sera accepte par LDAP ou autre auth
}
});
-/*#EVAL{chr(93)}[(#EVAL{chr(93)})]>*/</script>
+/*#EVAL{chr(93)}[(#EVAL{chr(93)})]>*/</script>
\ No newline at end of file
diff --git a/prive/login.html b/prive/login.html
index cf1c8f2db0..0d03b6843a 100644
--- a/prive/login.html
+++ b/prive/login.html
@@ -33,11 +33,11 @@
.forml,input { font-size: 1.0em; }
#var_lang_ecrire {font-size:0.8em;}
p .forml { width: 20em; font-family: inherit; }
- .spip_bouton input { float: #LANG_RIGHT; }
+ .boutons input { float: #LANG_RIGHT; }
.reponse_formulaire { font-weight: bold; color: red; }
a { color: #e86519; text-decoration: none; }
- .retour { text-align: center;font-size:0.8em; }
- formulaire_login.retour { font-size:1em; }
+ .retour { clear: both; text-align: center; font-size: 0.8em; }
+ formulaire_login.retour { font-size: 1em; }
-->
</style>
[(#REM|f_jQuery)]
@@ -49,16 +49,15 @@ jQuery(function(){ jQuery('input#var_login').focus(); });
<div id='minipres'>
- <h3 class="spip">#NOM_SITE_SPIP<br />
+ <h1 class="spip">#NOM_SITE_SPIP</h1>
[(#REM)
Est-ce qu'on se connecte a l'espace prive ou pas ?
]
[(#ENV{url}|=={''}|?{#SET{prive,' '}})]
[(#ENV{url}|match{^#EVAL{_DIR_RESTREINT_ABS}}|?{#SET{prive,' '}})]
- [(#GET{prive}) <small><:login_acces_prive:></small>]
+ [(#GET{prive}) <h3 class="spip"><:login_acces_prive:></h3>]
- </h3>
#MENU_LANG_ECRIRE
--
GitLab