diff --git a/core/static/user/login.scss b/core/static/user/login.scss index 4121579e..78024655 100644 --- a/core/static/user/login.scss +++ b/core/static/user/login.scss @@ -31,6 +31,11 @@ body { background-color: white !important; margin: 0; + > .title { + text-align: center; + margin: 0; + } + > div, > form { box-sizing: border-box; @@ -41,13 +46,16 @@ body { gap: 10px; width: 100%; max-width: 500px; + margin-top: 20px; + > p, > div { display: flex; flex-direction: column; justify-content: center; align-items: center; width: 100%; + margin: 0; > label { width: 100%; @@ -59,6 +67,7 @@ body { } > input, + > p > input, > div > input { box-sizing: border-box; width: 100%; @@ -70,9 +79,37 @@ body { } > .danger, - > div > error { + > .errorlist { color: red; text-align: center; + margin: 10px 0 0 0; + list-style-type: none; + } + + > .required > .helptext { + text-align: center; + font-style: italic; + } + + > .required:last-of-type { + box-sizing: border-box; + max-width: 300px; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + + > label { + width: 100%; + } + + > img { + width: 70px; + object-fit: contain; + } + + > input { + width: 200px; + } } } } \ No newline at end of file diff --git a/core/templates/core/login.jinja b/core/templates/core/login.jinja index c7d37241..752a57f3 100644 --- a/core/templates/core/login.jinja +++ b/core/templates/core/login.jinja @@ -10,7 +10,7 @@ {% endblock %} {% block content %} - +

{% trans %}Login{% endtrans %}

{% if next %} {% if user.is_authenticated %} diff --git a/core/templates/core/register.jinja b/core/templates/core/register.jinja index 04ec99cf..3e90cabc 100644 --- a/core/templates/core/register.jinja +++ b/core/templates/core/register.jinja @@ -1,20 +1,35 @@ {% extends "core/base.jinja" %} -{% block title %}{% trans %}Register a user{% endtrans %}{% endblock %} +{%- block additional_css -%} + + +{%- endblock -%} + +{% block title %}{% trans %}Register{% endtrans %}{% endblock %} {% block content %} -

{% trans %}Register a user{% endtrans %}

+

{% trans %}Register{% endtrans %}

-{% if user_registered %} -{% trans user_name=user_registered.get_display_name() %}Welcome {{ user_name }}!{% endtrans %} -{% trans %}You successfully registred and you will soon receive a confirmation mail.{% endtrans %} - -{% trans username=user_registered.username %}Your username is {{ username }}.{% endtrans %} -{% endif %} - -
- {% csrf_token %} - {{ form }} -

-
+ {% if user_registered %} + {% trans user_name=user_registered.get_display_name() %}Welcome {{ user_name }}!{% endtrans %}
+ {% trans %}You successfully registred and you will soon receive a confirmation mail.{% endtrans %}
+ {% trans username=user_registered.username %}Your username is {{ username }}.{% endtrans %}
+ + {% else %} +
+ {% csrf_token %} + {{ form }} + +
+ {% endif %} +{% endblock %} + +{% block additional_js %} + {% endblock %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index e247dc16..76ef05fb 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2402,7 +2402,7 @@ msgstr "Connexion" #: core/templates/core/base.jinja:62 core/templates/core/register.jinja:18 msgid "Register" -msgstr "S'enregister" +msgstr "Inscription" #: core/templates/core/base.jinja:85 core/templates/core/base.jinja:86 #: forum/templates/forum/macros.jinja:171