diff --git a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.mo b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.mo index 71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845..0673ea98a5f6d2e9fbbd119eb69ef7a752f85c50 100644 Binary files a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.mo and b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.mo differ diff --git a/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po b/basetheme_bootstrap/locale/en/LC_MESSAGES/django.po index a4df74bdfbc0cc868ff7494fa168c438958c7391..bb28f0b5f2302da975eea1f1de7b86fee195f0bf 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 Binary files a/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.mo and b/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.mo differ diff --git a/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po b/basetheme_bootstrap/locale/fr/LC_MESSAGES/django.po index 60501f787dc792841cad394a7eacb7ccc13ded82..f4e5c1cca1c57abecdc19da9ed1ada8085355e78 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 39eef4254a0acd49049ed9a6a67f3b479202d1cd..d7fa3887895e2150270d4e2280d7531b062df44d 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 50745e971aa46046b514eeccc97a15f333c740b2..f80771432ab6c0405ebb6d398f8f119e6b5f4020 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',