Skip to content
Snippets Groups Projects
Commit 7fa5bae4 authored by Bryan BRANCOTTE's avatar Bryan BRANCOTTE
Browse files

rework login page

parent e39c4cef
Branches
Tags v1.4
No related merge requests found
Pipeline #116055 passed
No preview for this file type
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -136,12 +136,21 @@ msgid "" ...@@ -136,12 +136,21 @@ msgid ""
" do not remain linked to your account." " do not remain linked to your account."
msgstr "" msgstr ""
msgid "Create account" msgid "Connect or create an account"
msgstr ""
msgid "I already have an account"
msgstr "" msgstr ""
msgid "Reset my password" msgid "Reset my password"
msgstr "" 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." msgid "Your password has been set. You may go ahead and log in now."
msgstr "" msgstr ""
......
No preview for this file type
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -145,14 +145,21 @@ msgstr "" ...@@ -145,14 +145,21 @@ msgstr ""
"soit les supprimer manuellement, soit les modifier afin qu'ils\n" "soit les supprimer manuellement, soit les modifier afin qu'ils\n"
" ne restent pas liés à votre compte." " ne restent pas liés à votre compte."
msgid "Create account" msgid "Connect or create an account"
msgstr "Créer un compte" 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" msgid "Reset my password"
msgstr "Réinitialiser mon mot de passe" msgstr "Réinitialiser mon mot de passe"
#, fuzzy msgid "I am not registered yet"
#| msgid "Your password has been set. You may go ahead and log in now." 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." msgid "Your password has been set. You may go ahead and log in now."
msgstr "" msgstr ""
"Votre mot de passe a été défini. Vous pouvez maintenant vous connecter." "Votre mot de passe a été défini. Vous pouvez maintenant vous connecter."
......
...@@ -4,18 +4,35 @@ ...@@ -4,18 +4,35 @@
{% load i18n %} {% load i18n %}
{% block title %}{%trans "Login"%}{% endblock %} {% 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 %} {% 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"> <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"> <form method="post">
{% csrf_token %} {% csrf_token %}
{{ form|crispy }} {{ form|crispy }}
<button class="btn btn-primary w-100" type="submit">{%trans "Login"%}</button> <button class="btn btn-primary w-100" type="submit">{%trans "Login"%}</button>
</form> </form>
<br/> <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>
<hr class="d-none flex-column d-sm-block"/> </div>
<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> </div>
<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>
<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> </div>
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -7,7 +7,7 @@ readme = open('README.rst').read() ...@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup( setup(
name='django-basetheme-bootstrap', name='django-basetheme-bootstrap',
version='1.3', version='1.4',
description='Django Basetheme Bootstrap', description='Django Basetheme Bootstrap',
long_description=readme, long_description=readme,
author='Bryan Brancotte', author='Bryan Brancotte',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment