From 967fc9809002bc88b9e42eb38f006dfa376a7f35 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:23:53 -0800 Subject: [PATCH] Fix: Refactor accounts templates and create signup template (#5899) --- src/documents/context_processors.py | 1 + .../static/{signin.css => accounts.css} | 28 ++-- src/documents/templates/account/login.html | 149 +++++++----------- .../templates/account/password_reset.html | 71 ++------- .../account/password_reset_done.html | 50 ++---- .../account/password_reset_from_key.html | 87 +++------- .../account/password_reset_from_key_done.html | 52 ++---- src/documents/templates/account/signup.html | 70 ++++++++ src/documents/templates/index.html | 22 +-- .../templates/paperless-ngx/base.html | 56 +++++++ .../paperless-ngx/snippets/svg_logo.html | 18 +++ .../socialaccount/authentication_error.html | 53 ++----- .../templates/socialaccount/login.html | 59 ++----- .../templates/socialaccount/signup.html | 92 +++-------- src/locale/en_US/LC_MESSAGES/django.po | 132 +++++++++------- 15 files changed, 396 insertions(+), 544 deletions(-) rename src/documents/static/{signin.css => accounts.css} (78%) create mode 100644 src/documents/templates/account/signup.html create mode 100644 src/documents/templates/paperless-ngx/base.html create mode 100644 src/documents/templates/paperless-ngx/snippets/svg_logo.html diff --git a/src/documents/context_processors.py b/src/documents/context_processors.py index b58c77268..0eaaa8e46 100644 --- a/src/documents/context_processors.py +++ b/src/documents/context_processors.py @@ -6,4 +6,5 @@ def settings(request): "EMAIL_ENABLED": django_settings.EMAIL_HOST != "localhost" or django_settings.EMAIL_HOST_USER != "", "DISABLE_REGULAR_LOGIN": django_settings.DISABLE_REGULAR_LOGIN, + "ACCOUNT_ALLOW_SIGNUPS": django_settings.ACCOUNT_ALLOW_SIGNUPS, } diff --git a/src/documents/static/signin.css b/src/documents/static/accounts.css similarity index 78% rename from src/documents/static/signin.css rename to src/documents/static/accounts.css index b98a6a38d..2a1d905f9 100644 --- a/src/documents/static/signin.css +++ b/src/documents/static/accounts.css @@ -26,32 +26,38 @@ body { --bs-btn-active-color: var(--pngx-primary-active); } -.form-signin { +.form-accounts { max-width: 330px; } -#inputUsername, -#inputPassword1 { +.form-stacked-top input { margin-bottom: -1px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -#inputUsername:focus { +.form-stacked-middle input { + margin-bottom: -1px; + border-top-right-radius: 0; + border-top-left-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.form-stacked-bottom input { + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +.form-accounts .form-floating input:focus { position: relative; z-index: 100; } -#inputUsername:focus~label { +.form-accounts .form-floating input:focus~label { z-index: 101; } -#inputPassword, -#inputPassword2 { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - @media (prefers-color-scheme: dark) { /* From theme_dark.scss */ body { diff --git a/src/documents/templates/account/login.html b/src/documents/templates/account/login.html index 0dd8d8e1b..5613b9845 100644 --- a/src/documents/templates/account/login.html +++ b/src/documents/templates/account/login.html @@ -1,109 +1,66 @@ - - -{% load static %} +{% extends "paperless-ngx/base.html" %} {% load i18n %} - - - - - - - +{% block head_title %} + {% trans "Paperless-ngx sign in" %} +{% endblock head_title %} - {% translate "Paperless-ngx sign in" %} +{% block form_top_content %} +

+ {% translate "Please sign in." %} + {% if ACCOUNT_ALLOW_SIGNUPS %} +
{% blocktrans %}Don't have an account yet? Sign up{% endblocktrans %} + {% endif %} +

+{% endblock form_top_content %} - - - - - -
-
- {% csrf_token %} - - {% for message in messages %} - - {% endfor %} -

{% translate "Please sign in." %}

- {% if form.errors %} - - {% elif request.GET.sharelink_notfound %} - - {% elif request.GET.sharelink_expired %} - - {% endif %} - {% if not DISABLE_REGULAR_LOGIN %} +{% block form_content %} + {% if not DISABLE_REGULAR_LOGIN %} {% translate "Username" as i18n_username %} {% translate "Password" as i18n_password %} -
- - +
+ +
-
- - +
+ +
- +
{% if EMAIL_ENABLED %} -
- {% translate "Forgot your password?" %} -
+
+ {% translate "Forgot your password?" %} +
{% endif %} - {% endif %} - -{% load allauth socialaccount %} -{% get_providers as socialaccount_providers %} -{% if socialaccount_providers %} - {% if not DISABLE_REGULAR_LOGIN %} -

{% translate "or sign in via" %}

{% endif %} -
    - {% for provider in socialaccount_providers %} - {% if provider.id == "openid" %} - {% for brand in provider.get_brands %} - {% provider_login_url provider openid=brand.openid_url process=process as href %} -
  • {{ brand.name }}
    • - {% endfor %} - {% else %} - {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %} -
  • -
    - {% csrf_token %} - -
    -
    • - {% endif %} - {% endfor %} -
-{% endif %} -
- - +{% endblock form_content %} + +{% block after_form_content %} + {% load allauth socialaccount %} + {% get_providers as socialaccount_providers %} + {% if socialaccount_providers %} + {% if not DISABLE_REGULAR_LOGIN %} +

{% translate "or sign in via" %}

+ {% endif %} +
    + {% for provider in socialaccount_providers %} + {% if provider.id == "openid" %} + {% for brand in provider.get_brands %} + {% provider_login_url provider openid=brand.openid_url process=process as href %} +
  • {{ brand.name }}
    • + {% endfor %} + {% else %} + {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %} +
  • +
    + {% csrf_token %} + +
    +
    • + {% endif %} + {% endfor %} +
+ {% endif %} +{% endblock after_form_content %} diff --git a/src/documents/templates/account/password_reset.html b/src/documents/templates/account/password_reset.html index 1b5de5aeb..019babd52 100644 --- a/src/documents/templates/account/password_reset.html +++ b/src/documents/templates/account/password_reset.html @@ -1,60 +1,23 @@ - - -{% load static %} +{% extends "paperless-ngx/base.html" %} {% load i18n %} -{% load allauth %} - - - - - - - +{% block head_title %} + {% trans "Paperless-ngx reset password request" %} +{% endblock head_title %} - {% translate "Paperless-ngx reset password request" %} - - - - - - - {% url 'account_reset_password' as reset_url %} - +{% endblock form_content %} diff --git a/src/documents/templates/account/password_reset_done.html b/src/documents/templates/account/password_reset_done.html index b798ee324..25fed4788 100644 --- a/src/documents/templates/account/password_reset_done.html +++ b/src/documents/templates/account/password_reset_done.html @@ -1,44 +1,14 @@ - - -{% load static %} +{% extends "paperless-ngx/base.html" %} {% load i18n %} - - - - - - - +{% block head_title %} + {% trans "Paperless-ngx reset password sent" %} +{% endblock head_title %} - {% translate "Paperless-ngx reset password sent" %} +{% block form_top_content %} +

{% translate "Check your inbox." %}

+{% endblock form_top_content %} - - - - - -
- -

{% translate "Check your inbox." %}

-

{% translate "We've emailed you instructions for setting your password. You should receive the email shortly!" %}

-
- - +{% block form_content %} +

{% translate "We've emailed you instructions for setting your password. You should receive the email shortly!" %}

+{% endblock form_content %} diff --git a/src/documents/templates/account/password_reset_from_key.html b/src/documents/templates/account/password_reset_from_key.html index 11b40cd22..a9b2c3406 100644 --- a/src/documents/templates/account/password_reset_from_key.html +++ b/src/documents/templates/account/password_reset_from_key.html @@ -1,70 +1,31 @@ - - -{% load static %} +{% extends "paperless-ngx/base.html" %} {% load i18n %} -{% load allauth %} - - - - - - - +{% block head_title %} + {% trans "Paperless-ngx reset password confirmation" %} +{% endblock head_title %} - {% translate "Paperless-ngx reset password confirmation" %} +{% block form_top_content %} +

{% translate "Set a new password." %}

+{% endblock form_top_content %} - - - - - -