diff --git a/dist/login.html b/dist/login.html
index c0fb464179d8dbfc1e4de10e56e08e948a67b574..a5de7196ea1e7d37153c37aecbfa80e4543f31ae 100644
--- a/dist/login.html
+++ b/dist/login.html
@@ -10,40 +10,37 @@
<title><:login_acces_prive:></title>
<meta http-equiv="Content-Type" content="text/html; charset=#CHARSET" />
<link rel="stylesheet" href="#CHEMIN{spip_style.css}" type="text/css" />
- <link rel="stylesheet" href="#CHEMIN{typographie.css}" type="text/css" />
[ <link rel="shortcut icon" href="(#CHEMIN{favicon.ico})" />
]</head>
-<body>
+<body style="background: white; text-align: center;">
+
+<div style="width: 400px; margin: auto; padding: 3em 0;">
-<div style='text-align: center; margin: auto; width: 400px'>
-<br /><br /><br />
- <table width="100%"><tr><td>
- <div style="float: center">
<h3 class="spip">#NOM_SITE_SPIP<br />
<small><:login_acces_prive:></small>
</h3>
- <div style="text-align: #LANG_RIGHT">#MENU_LANG_ECRIRE</div>
- </div>
-#LOGIN_PRIVE
+ [(#MENU_LANG_ECRIRE)]
+
+ [(#LOGIN_PRIVE)]
- <div style='text-align: center;font-family: Verdana,arial,helvetica,sans-serif; font-size: 12px;'>
+ <p>
-[[<a style='color: #e86519'
- href='#URL_PAGE{spip_inscription,focus=nom_inscription}&mode=(#URL_SITE_SPIP|tester_config{mode_inscription})'
+[[<a style="color: #e86519"
+ href="#URL_PAGE{spip_inscription,focus=nom_inscription}&mode=(#URL_SITE_SPIP|tester_config{mode_inscription})"
target="spip_pass"
onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=500'); return false;"><:login_sinscrire:></a>]]
-[<a style='color: #e86519'
+[<a style="color: #e86519"
href="#URL_PAGE{spip_pass}"
target="spip_pass"
onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=280'); return false;"><:login_motpasseoublie:></a>]
-[<a style='color: #e86519' href="#URL_SITE_SPIP/"><:login_retoursitepublic:></a>]
+[<a style="color: #e86519" href="#URL_SITE_SPIP/"><:login_retoursitepublic:></a>]
-</div>
+ </p>
-</td></tr></table></div>
+</div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/dist/spip_style.css b/dist/spip_style.css
index bdd82fcaed90f367f0c72158b39161ccab6201f4..d273f39e7bfcd87ac463af4337463b508657b004 100644
--- a/dist/spip_style.css
+++ b/dist/spip_style.css
@@ -63,7 +63,7 @@ table.spip td { padding: 3px; text-align: left; vertical-align: middle; }
/* Logos et documents
---------------------------------------------- */
-img, img.spip_logos { margin: 0; padding: 0; border: 0; }
+img, .spip_logos { margin: 0; padding: 0; border: 0; }
.spip_documents { font-family: Verdana, Arial, Helvetica, sans-serif; }
.spip_documents_center { margin: auto; text-align: center; width: 80%; }
@@ -118,14 +118,14 @@ form, fieldset, legend, label, input, textarea, select, option {
font-size: 1em; }
input.spip_bouton {
- width: auto;
+ float: right;
+ /*width: auto;*/
background: #666666;
margin: 3px 0;
padding: 1px 2px;
border: 2px outset #666666;
font-weight: bold;
- color: #FFFFFF;
- float: right; }
+ color: #FFFFFF; }
/* * Reponse du formulaire (erreur) */
.reponse_formulaire {
@@ -174,9 +174,25 @@ div.choix_mots label { display: inline; }
float: right;
text-align: left;
width: 12em; }
+.formulaire_recherche label { display: none; }
.spip_surligne { background: #FFFF66; }
+/* Formulaire menu de langues
+----------------------------------------------- */
+.formulaire_menu_lang {
+ float: right;
+ text-align: left;
+ width: 12em;
+ font-size: 0.71em; }
+.formulaire_menu_lang label { display: none; }
+
+/* Formulaire de login
+----------------------------------------------- */
+.formulaire_login { clear: both; font-size: 0.88em; }
+.formulaire_login .forml { width: 12em; }
+.formulaire_login .spip_logos { float: right; padding-left: 10px; }
+
/* ------------------------------------------ */
/* Couleurs des liens
/* ------------------------------------------ */
diff --git a/formulaires/formulaire_admin.html b/formulaires/formulaire_admin.html
index 980bc8e95b0dbda1825d5efaf19092f682f203d7..dad7689a6fd84835f7e848cd9afedf766e441f8b 100644
--- a/formulaires/formulaire_admin.html
+++ b/formulaires/formulaire_admin.html
@@ -1,16 +1,14 @@
-<div [class="(#ENV{divclass,spip-admin-bloc})" ]dir='#LANG_DIR'>[
- <a href='(#ENV{analyser})' class='spip-admin-boutons'><:analyse_xml:>[(#ENV{xhtml_error}|?{' *',''})]</a>][
- <a href='[(#ENV{voir_article})]' class='spip-admin-boutons'><:admin_modifier_article:> ((#ENV{id_article}))</a>][
- <a href='[(#ENV{voir_breve})]' class='spip-admin-boutons'><:admin_modifier_breve:> ((#ENV{id_breve}))</a>][
- <a href='[(#ENV{voir_rubrique})]' class='spip-admin-boutons'><:admin_modifier_rubrique:> ((#ENV{id_rubrique}))</a>][
- <a href='[(#ENV{voir_mot})]' class='spip-admin-boutons'><:admin_modifier_mot:> ((#ENV{id_mot}))</a>][
- <a href='[(#ENV{voir_site})]' class='spip-admin-boutons'><:icone_modifier_site:> ((#ENV{id_syndic}))</a>][
- <a href='[(#ENV{voir_auteur})]' class='spip-admin-boutons'><:admin_modifier_auteur:> ((#ENV{id_auteur}))</a>][
- <a href='(#ENV{ecrire})' class='spip-admin-boutons'><:espace_prive:></a>]
- <a href='[(#SELF|parametre_url{var_mode,recalcul})]' class='spip-admin-boutons'><:admin_recalculer:>[(#ENV{use_cache})]</a>[
- <a href='(#ENV{statistiques})' class='spip-admin-boutons'>[<:info_visites:> (#ENV{visites})][; <:info_popularite_5:> (#ENV{popularite})]</a>][
- <a href='(#ENV{preview})'
-class='spip-admin-boutons'><:previsualisation:></a>][
- <a href='(#ENV{debug})'
-class='spip-admin-boutons'><:admin_debug:></a>]
-</div>
+<div[ class="(#ENV{divclass,spip-admin-bloc})"] dir="#LANG_DIR">[
+ <a href="(#ENV{analyser})" class="spip-admin-boutons"><:analyse_xml:>[(#ENV{xhtml_error}|?{' *',''})]</a>][
+ <a href="[(#ENV{voir_article})]" class="spip-admin-boutons"><:admin_modifier_article:> ((#ENV{id_article}))</a>][
+ <a href="[(#ENV{voir_breve})]" class="spip-admin-boutons"><:admin_modifier_breve:> ((#ENV{id_breve}))</a>][
+ <a href="[(#ENV{voir_rubrique})]" class="spip-admin-boutons"><:admin_modifier_rubrique:> ((#ENV{id_rubrique}))</a>][
+ <a href="[(#ENV{voir_mot})]" class="spip-admin-boutons"><:admin_modifier_mot:> ((#ENV{id_mot}))</a>][
+ <a href="[(#ENV{voir_site})]" class="spip-admin-boutons"><:icone_modifier_site:> ((#ENV{id_syndic}))</a>][
+ <a href="[(#ENV{voir_auteur})]" class="spip-admin-boutons"><:admin_modifier_auteur:> ((#ENV{id_auteur}))</a>][
+ <a href="(#ENV{ecrire})" class="spip-admin-boutons"><:espace_prive:></a>]
+ <a href="[(#SELF|parametre_url{var_mode,recalcul})]" class="spip-admin-boutons"><:admin_recalculer:>[(#ENV{use_cache})]</a>[
+ <a href="(#ENV{statistiques})" class="spip-admin-boutons">[<:info_visites:> (#ENV{visites})][; <:info_popularite_5:> (#ENV{popularite})]</a>][
+ <a href="(#ENV{preview})" class="spip-admin-boutons"><:previsualisation:></a>][
+ <a href="(#ENV{debug})" class="spip-admin-boutons"><:admin_debug:></a>]
+</div>
\ No newline at end of file
diff --git a/formulaires/formulaire_login.html b/formulaires/formulaire_login.html
index 57e5343a4cba9c138d0ea274ae9589f8c4fe5328..70dec11f81fd12e92beb2a18aadca096ef94167e 100644
--- a/formulaires/formulaire_login.html
+++ b/formulaires/formulaire_login.html
@@ -2,13 +2,12 @@
#HTTP_HEADER{"Pragma: no-cache"}
[(#ENV{echec_cookie})
<h3 class="spip"><:avis_erreur_cookie:></h3>
- <strong><:login_cookie_oblige:></strong>
- <:login_cookie_accepte:>
-]
+ <strong><:login_cookie_oblige:></strong>
+ <:login_cookie_accepte:>]
-<div style="font-family: Verdana,arial,helvetica,sans-serif; font-size: 12px;">
+<div class="formulaire_spip formulaire_login">
<script type="text/javascript" src="#EVAL{_DIR_IMG_PACK}md5.js"></script>
- <form id="login[_(#ENV{login})]"
+ <form id="login[_(#ENV{login})]"
action="[(#ENV{action2})]"
method="post"[(#ENV{source}|=={spip}|?{' ',''})
onsubmit='if (this.session_password.value) {
@@ -16,47 +15,38 @@
this.next_session_password_md5.value = calcMD5("[(#ENV{alea_futur})]" + this.session_password.value);
this.session_password.value = "";
}']>
- <div class="spip_encadrer" style="[(#URL_SITE_SPIP|style_align)]">[
- <div class="reponse_formulaire">(#ENV*{erreur})</div>
-][
- <label for="var_login"><strong><:login_login2:></strong></label>(#ENV{login}|?{'',' '})
- <input type="text" class="forml" id="var_login" name="var_login" value="" size="40" />
-
-][
-<div>
-[<div style="float: #LANG_RIGHT; padding-#LANG_LEFT: 10px;">(#LOGO_AUTEUR||reduire_image{100,80}|inserer_attribut{alt,#ENV{login_alt}})</div>]
- <input type="hidden" name="session_login_hidden" value="(#ENV{login})" />
+ <fieldset class="spip_encadrer" style="[(#URL_SITE_SPIP|style_align)]">
+ <legend><:form_forum_identifiants:></legend>
+ [<p class="reponse_formulaire">(#ENV*{erreur})</p>]
+ [<p><label for="var_login"><:login_login2:></label>(#ENV{login}|?{'',' '})
+ <input type="text" class="forml" id="var_login" name="var_login" value="" size="40" /></p>]
+
+[
+[(#LOGO_AUTEUR||reduire_image{100,80}|inserer_attribut{alt,#ENV{login_alt}})]
+<input type="hidden" name="session_login_hidden" value="(#ENV{login})" />
<script type="text/javascript"><!--
-document.write("<:login_login:> <strong>[(#ENV{login_alt})]<" + "/strong>[<a style='color: #e86519' href='[(#ENV{action2}
+document.write("<:login_login:> <strong>[(#ENV{login_alt})]<" + "/strong> [<a style='color: #e86519' href='[(#ENV{action2}
|parametre_url{cookie_admin,non}
|parametre_url{url,#ENV*{url}}
- |parametre_url{retour,#ENV*{self}})]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>]")
+ |parametre_url{retour,#ENV*{self}})]'><:login_autre_identifiant:><" + "/a>]")
//--></script>
<noscript>
- <p class='notes' style='font-size: 130%'>
- <:login_non_securise:>
- <a href="[(#ENV{action})]"><:login_recharger:></a>.
- </p>
- <label><strong><:login_login2:></strong></label>
- <input type='text' name='session_login' class="forml" [value="(#ENV{login})" ]size='40' />
+ <p class="reponse_formulaire"><:login_non_securise:> <a href="[(#ENV{action})]"><:login_recharger:></a>.</p>
+ <p><label for="session_login"><:login_login2:></label>
+ <input type="text" class="forml" name="session_login" id="session_login"[ value="(#ENV{login})"] size="40" /></p>
</noscript>
-</div>
-<p>
- <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" />
- <input type="checkbox"
- name="session_remember"
- id="session[_(#ENV{login})]"
- value="oui"[(#ENV*{prefs}|filtre_rester_connecte)checked="checked"]/>
- <label for="session[_(#ENV{login})]"><:login_rester_identifie:></label>
-</p>
- <input type="hidden" name="session_password_md5" value="" />
- <input type="hidden" name="next_session_password_md5" value="" />
- <input type="hidden" name="essai_login" value="oui" />
-] <input type="hidden" name="url" value="[(#ENV{url})]" />
- <div style="text-align: right"><input type="submit" class="spip_bouton" value="<:bouton_valider:>" /></div>
- </div>
+ <p><label[ for="var_login_(#ENV{login})"]><:login_pass2:></label>
+ <input type="password" class="forml" name="session_password"[ id="var_login_(#ENV{login})"] value="" size="20" /></p>
+ <p><input type="checkbox" name="session_remember" id="session[_(#ENV{login})]" value="oui"[(#ENV*{prefs}|filtre_rester_connecte)checked="checked"]/>
+ <label for="session[_(#ENV{login})]"><:login_rester_identifie:></label></p>
+
+ <input type="hidden" name="session_password_md5" value="" />
+ <input type="hidden" name="next_session_password_md5" value="" />
+ <input type="hidden" name="essai_login" value="oui" />
+] <input type="hidden" name="url" value="[(#ENV{url})]" />
+ <input type="submit" class="spip_bouton" value="<:bouton_valider:>" />
+ </fieldset>
</form>
<script type="text/javascript"><!--
document.getElementById('var_login[_(#ENV{login})]').focus();
@@ -64,14 +54,12 @@ document.getElementById('var_login[_(#ENV{login})]').focus();
<form action="(#ENV{auth_http})" method="get">[
(#ENV{auth_http}|form_hidden)
]
- <fieldset>
- <div>
- <:login_preferez_refuser:>
- <input type="hidden" name="essai_auth_http" value="oui"/>
- [<input type="hidden" name="url" value="(#ENV{url})"/>]
- </div>
- <div style="text-align: right"><input type="submit" class="spip_bouton" value="<:login_sans_cookiie:>"/></div>
- </fieldset>
+ <fieldset>
+ <legend><:login_preferez_refuser:></legend>
+ <input type="hidden" name="essai_auth_http" value="oui"/>
+ [<input type="hidden" name="url" value="(#ENV{url})"/>]
+ <input type="submit" class="spip_bouton" value="<:login_sans_cookiie:>"/>
+ </fieldset>
</form>
]
-</div>
+</div>
\ No newline at end of file
diff --git a/formulaires/formulaire_login_forum.html b/formulaires/formulaire_login_forum.html
index 79b6eb999b5e7dc963a6e99b0116e18eaad6e8d9..4a4efa5b4e934db0fa2fec67e0aa89434b519e27 100644
--- a/formulaires/formulaire_login_forum.html
+++ b/formulaires/formulaire_login_forum.html
@@ -1,8 +1,11 @@
[(#REM) Formulaire de connexion pour les forums sur abonnement appele dans formulaire_forum.php ]
+<div class="formulaire_spip formulaire_login_forum">
+<a name="formulaire_login_forum" id="formulaire_login_forum"></a>
+
<fieldset class="reponse_formulaire">
-<legend><:forum_vous_inscrire:></legend>
-<:forum_vous_enregistrer:> <:forum_vous_inscrire:>
+<legend><:Forum:> <:bouton_radio_modere_abonnement:></legend>
+<p><:forum_vous_enregistrer:> <:forum_vous_inscrire:></p>
</fieldset>
#LOGIN_PUBLIC
@@ -13,4 +16,6 @@
[<a[ href="(#ENV{oubli})"] target="spip_pass" onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=280'); return false;"><:login_motpasseoublie:></a>]
-</p>
\ No newline at end of file
+</p>
+
+</div>
\ No newline at end of file
diff --git a/formulaires/formulaire_oubli.html b/formulaires/formulaire_oubli.html
index c21d7e21686f1a0a45ecc4858f9209135926ccd8..22a8160abb2d77e5f7bca190058a21f8ba627718 100644
--- a/formulaires/formulaire_oubli.html
+++ b/formulaires/formulaire_oubli.html
@@ -1,21 +1,22 @@
-<div class='spip_serif'>[
+<div class="formulaire_spip formulaire_oubli">[
(#ENV*{message})
][
(#ENV*{message}|?{'',' '})
-<form id="oubli_form" action='[(#ENV{action})]' method="post">
- <fieldset class='spip_sanscadre'>
+<form id="oubli_form" action="[(#ENV{action})]" method="post">
+ <fieldset class="spip_sanscadre">
<legend><:pass_nouveau_pass:></legend>[
<input type="hidden" name="p" value="(#ENV{p})" />
- <label><:pass_choix_pass:></label>
- <input type="password" name="oubli" />
+ <p><label for="oubli"><:pass_choix_pass:></label>
+ <input type="password" name="oubli" id="oubli" /></p>
][
(#ENV{p}|?{'',' '})
- <label><:pass_indiquez_cidessous:></label>
- <input type="text" name="oubli" />
+ <p><:pass_indiquez_cidessous:></p>
+ <p><label for="oubli"><:form_pet_votre_email:></label><br />
+ <input type="text" name="oubli" id="oubli" /></p>
]
- <input type="submit" class="fondl" value="<:pass_ok:>" />
- </fieldset>
+ <input type="submit" class="spip_bouton" value="<:pass_ok:>" />
+ </fieldset>
</form>
]
</div>
@@ -30,6 +31,6 @@ document.write((window.opener) ? "javascript:close()" : "./")
document.write("'><:pass_quitter_fenetre:><" + "/a>");
//--></script>
<noscript>
- [<a style='color: #e86519' href='./'><:pass_retour_public:></a>]
+ [<a style="color: #e86519" href='./'><:pass_retour_public:></a>]
</noscript>
-</div>
+</div>
\ No newline at end of file