From 7fa5bae4bf365bb80c9a0189f8bfc419c18cdb41 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Fri, 17 Nov 2023 14:01:14 +0100
Subject: [PATCH] rework login page WIP
https://gitlab.pasteur.fr/hub/strass/-/issues/152
---
.../locale/en/LC_MESSAGES/django.mo | Bin 380 -> 476 bytes
.../locale/en/LC_MESSAGES/django.po | 13 +++++-
.../locale/fr/LC_MESSAGES/django.mo | Bin 7253 -> 7742 bytes
.../locale/fr/LC_MESSAGES/django.po | 17 +++++---
.../templates/registration/login.html | 39 +++++++++++++-----
setup.py | 2 +-
6 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.mo b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.mo
index 71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845..0673ea98a5f6d2e9fbbd119eb69ef7a752f85c50 100644
GIT binary patch
delta 185
zcmeyvbcebAo)F7a1|VPpVi_RT0b*7lwgF-g2moSnAPxj#Cq@Q_Odzcf#A|?TAOZuB
zUN~?}PR=jQD^W<yDN0RDsZ>ZzF3BuQ)nf=K%FjwoF46T&(G5#2D$dN$vr-6f+~}{%
kXb_oSS_D)F(U)0_rd3CwGQU(IIWbQmCqG>wGf$5J04m%mG5`Po
delta 65
wcmcb^{D;Zno)F7a1|VPrVi_P-0b*t#)&XJ=umEBwprj>`2C0F8jTtVC00zSbA^-pY
diff --git a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po
index a4df74b..bb28f0b 100644
--- a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po
+++ b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 09:26+0000\n"
+"POT-Creation-Date: 2023-11-17 12:43+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -136,12 +136,21 @@ msgid ""
" do not remain linked to your account."
msgstr ""
-msgid "Create account"
+msgid "Connect or create an account"
+msgstr ""
+
+msgid "I already have an account"
msgstr ""
msgid "Reset my password"
msgstr ""
+msgid "I am not registered yet"
+msgstr ""
+
+msgid "Create account"
+msgstr ""
+
msgid "Your password has been set. You may go ahead and log in now."
msgstr ""
diff --git a/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.mo b/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.mo
index 9b9778b1ad191ca5552193b0cd125100303a3964..bf8d8ab21436b7a690f6cf4a7c15b9b0bc23a4cd 100644
GIT binary patch
delta 1880
zcmZA1TWl0n9LMpq(AEm2l$N4UFUJcvg>``zYpnuSEH;>knvGQ-7<LccZM!qg&TO$Y
zaT9Aa%9{-#F-D0dCXEurO)x>g#0@?Oi5O!9AAFFQ;3eS+pKA2`n{JhOvj6$a?VS0a
z|C!nEyU+BNe`>8eWN3ZFEkx%6V+L_|9UIyw^~Ufs$JyL~pW!n60$1U;coY7CEm+qu
zH%>e1{>|8dJ;*I4jX8V)?>44v&a%_WiQjN3{)M`63B8q28)~2wn`Z3B5$wkkSiv?N
zZZzgDd>M88K5Cp3cq5*w`BlvexQOSQAK6*K4Zol!J&P+bK`+g$17E@|s6>w;Kl3G<
zc07+t^k>uq|3>Cu>K8F<Y{JFZkIdLSjjG^_*u?YAo9rm#!>EoQ;RpCBDxoyJJ$xQj
z^3$k<FXCRjikkV8O~!1(2$k4}sEVCJe&!sTgLo0sm|a5sH?s3NJ1Y{#{EEXIYaLQB
zg1z_-cHt#lr^_t#4({(pCTk{{juL+r^}vI8JHCyoz)4g>*H9B!Oc_}<v!<2$EAu2L
zRJx}y#Ai_tI*&KwHB`rD%A^OaM~f+BwagyW%l90P;0T_^A5cqqX!+a(j$ypisD87{
zsXtXV^`s|TYIb0pA@VcH+VP{c<K3tk?!%+_3X-EqG5SL6Lndqb@je_xRq737wahf`
z!uQJTP<3+!llUiU;MKf&x^XAoihEEA26z@HQ3-CRJUQHjx8ZSAr7mEEzvG>_mohwt
zQ>Z2S8p+v|FR`Q2T}72ly~p7UZpAJ>-fgV)D8A0|$Gqx2*hy9c7@%fy5_NtdS#Z0d
z!f}F~sJ4#SMChRp5}GVs%5m1~Ihb!6Bt`H)WY!XEh|Pp0)KnFfa=vY3r>l0LujLU!
zOQBh+Q7E&W*g)(cv@E>GaeF}De_!oj3qC~LL$C^Q(^{%+BOWGHDGCuU5yVX|q)M#i
z(Na?J_;bDk)$S*{3BBNrg#H86^q&!5&?lysL`@~XH{Sbi!^*^8$?DoEeaow+ch>hW
z^+t=%%T8D?6XnNUvNBcQmRRY#Ok{(i&2TMp*7LcX2}*ucd8^^OM9R*0%6a40Up0?g
zuVDQkvPCzP4<lD}Sv%pPN~SSr*gEEg;enu-wK*@e`<(M_=%S<@3`(}(P1vEpdO1?z
zX<0iO4B5QTPzNgKnlC4M(m_;oHWL)aNXLbd%~ofIt4HFj_iwP{K`FFjL22Ag&h2Lc
zUvqH9WaVf}Z^AyI&b3pP2WE=Z8CSF=zcyy&%Cgx+*T7mYKR@!nm&|~(zO!K|&m+j(
z`I&%R@_v{p=A)#mTyA?ev7maSGS&V}LtlZ(XPs^gsf?}8MAaD$xj*mclQw-_o&_)O
QN6z>B=zl3sf79{WKfpE)5dZ)H
delta 1415
zcmYk+OGs2v9LMqh)p2yxv~g0?GPS3cmhUXJXi-`aB1N_9L4j$HMG->SP#7+HEHZ0R
zZVD*{U38&El0@{{Sh%P*gT0C9u_#<+(D!%e5*_Bu=bStDp7THdbMA~czO0W<Wd-_;
zvW_~Rnx0^`4QCShqO>HL@v+T(C1WdwaVO^EL7a^}sOS4p_uavHcn|s5E56z>hKq4y
z&@9U=Y8^B(xzLTe@d9dqKFq*t*onh<7jyVAf)lt1-}(Kdl=$;`7~*=NZ>euJrgFUr
zbFc*i%x}ACoaDlOBqDo@8sHaZ;~&(@B3x8}6-X>rhikD3)36J*vK~~1hA<t+Pys(f
zJr~29_yGgVZ@q-I7tf<o`U4eVh*9@o5o)EUu@VPSfxSj$=sRkn89av}Iy<l*%kdlL
zIE+2Ztb=|f4^`lGjMmbapizQ}?863bEJK2`BW$c9?m|rz#X`J@3Sbl!@FUcgy+H-~
z8I`Ft(r^sJsPWI@TpUF`_cToYHNkr>kY)RVJZnF(6BF5w`*;-du$(+9;AT{Yx>3(v
zMv`U&zPEi{RAA$%fS>sN7>>~Y7$N`K^GkD>3<r_9Z3tK47%CHAk?h(uwxGjkWYf0b
zO5BCYOfTxbTUdZDDzHg>j4@O|H;BF+hodwW(1_&5Q&NS;>2Jk__z*YYC)5^{kw3<;
z22`fnP#M~XC$NY#)!|iK&sILiUiulli#n`VPz#v!`_X)kHurgh>XhqM)QXo=6?qMH
z3ALW8JylU4T6GasMVV941XW%u{(r(8UKUs58fuyUn=;oxWdTuZq`?98N;Th#UMW;r
zN?kz>s6$bTo4l483GrSl7Ve#m690M%*7|KxOs)8@uUAw>Sue0wvr?}c-xuw@&Vz~$
zri!+KUGiQfw%<G9%aA`x?-awoQrS0>)a<4QQysTD`Gw=wgboMYsmz$;PKO&Dw=MG9
WanEEAI0=UixW&2KgMAMQPW=Uf6@M%M
diff --git a/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po b/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po
index 60501f7..f4e5c1c 100644
--- a/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po
+++ b/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-01 09:26+0000\n"
+"POT-Creation-Date: 2023-11-17 12:43+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -145,14 +145,21 @@ msgstr ""
"soit les supprimer manuellement, soit les modifier afin qu'ils\n"
" ne restent pas liés à votre compte."
-msgid "Create account"
-msgstr "Créer un compte"
+msgid "Connect or create an account"
+msgstr "Me connecter ou créer un compte"
+
+msgid "I already have an account"
+msgstr "J'ai déjà un compte"
msgid "Reset my password"
msgstr "Réinitialiser mon mot de passe"
-#, fuzzy
-#| msgid "Your password has been set. You may go ahead and log in now."
+msgid "I am not registered yet"
+msgstr "Je ne suis pas encore inscrit.e"
+
+msgid "Create account"
+msgstr "Créer un compte"
+
msgid "Your password has been set. You may go ahead and log in now."
msgstr ""
"Votre mot de passe a été défini. Vous pouvez maintenant vous connecter."
diff --git a/basetheme_bootstrap/templates/registration/login.html b/basetheme_bootstrap/templates/registration/login.html
index 39eef42..d7fa388 100644
--- a/basetheme_bootstrap/templates/registration/login.html
+++ b/basetheme_bootstrap/templates/registration/login.html
@@ -4,18 +4,35 @@
{% load i18n %}
{% block title %}{%trans "Login"%}{% endblock %}
-{% block page_title %}{%trans "Login"%}{% endblock %}
+
+{% block whole_content_page_title %}
+<div class="pb-2 mb-2 col-12">
+ <div class="content-page-title text-center">
+ <h1>{%trans "Connect or create an account"%}</h1>
+ </div>
+</div>
+{% endblock %}
{% block content %}
-<div class="col-xs-12 col-12 col-sm-10 col-sm-offset-1 offset-sm-1 col-md-8 col-md-offset-2 offset-md-2 col-lg-6 col-lg-offset-3 offset-lg-3 col-xl-4 col-xl-offset-4 offset-xl-4 col-xxl-2 d-flex flex-column d-sm-block">
- <form method="post">
- {% csrf_token %}
- {{ form|crispy }}
- <button class="btn btn-primary w-100" type="submit">{%trans "Login"%}</button>
- </form>
- <br/>
- <hr class="d-none flex-column d-sm-block"/>
- <a href="{% url 'basetheme_bootstrap:signup' %}{%if next%}?next={{next}}{%endif%}" role="button" class="btn btn-default btn-outline-primary mb-4 mb-sm-0">{%trans "Create account"%}</a>
- <a href="{% url 'basetheme_bootstrap:password_reset' %}" role="button" class="btn btn-default btn-outline-primary pull-right float-right">{%trans "Reset my password"%}</a>
+<div class="col-12 col-offset-0 col-md-6 col-xl-4 offset-xl-1 d-flex flex-column mb-4">
+ <div class="card mt-4">
+ <div class="card-header">{%trans "I already have an account"%}</div>
+ <div class="card-body">
+ <form method="post">
+ {% csrf_token %}
+ {{ form|crispy }}
+ <button class="btn btn-primary w-100" type="submit">{%trans "Login"%}</button>
+ </form>
+ <a href="{% url 'basetheme_bootstrap:password_reset' %}" role="button" class="btn btn-default btn-outline-primary w-100 mt-2">{%trans "Reset my password"%}</a>
+ </div>
+ </div>
+</div>
+<div class="col-12 col-offset-0 col-md-6 col-xl-4 offset-xl-2 d-flex flex-column mb-4">
+ <div class="card mt-4">
+ <div class="card-header">{%trans "I am not registered yet"%}</div>
+ <div class="card-body">
+ <a href="{% url 'basetheme_bootstrap:signup' %}{%if next%}?next={{next}}{%endif%}" role="button" class="btn btn-default btn-primary w-100">{%trans "Create account"%}</a>
+ </div>
+ </div>
</div>
{% endblock %}
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 50745e9..f807714 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup(
name='django-basetheme-bootstrap',
- version='1.3',
+ version='1.4',
description='Django Basetheme Bootstrap',
long_description=readme,
author='Bryan Brancotte',
--
GitLab