diff --git a/src/documents/context_processors.py b/src/documents/context_processors.py index 9f8dacfb3..91a7ce391 100644 --- a/src/documents/context_processors.py +++ b/src/documents/context_processors.py @@ -1,11 +1,28 @@ from django.conf import settings as django_settings +from paperless.config import GeneralConfig + def settings(request): + general_config = GeneralConfig() + + app_title = ( + django_settings.APP_TITLE + if general_config.app_title is None or len(general_config.app_title) == 0 + else general_config.app_title + ) + app_logo = ( + django_settings.APP_LOGO + if general_config.app_logo is None or len(general_config.app_logo) == 0 + else general_config.app_logo + ) + return { "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, "domain": getattr(django_settings, "PAPERLESS_URL", request.get_host()), + "APP_TITLE": app_title, + "APP_LOGO": app_logo, } diff --git a/src/documents/static/accounts.css b/src/documents/static/base.css similarity index 88% rename from src/documents/static/accounts.css rename to src/documents/static/base.css index 2a1d905f9..90d8d7b77 100644 --- a/src/documents/static/accounts.css +++ b/src/documents/static/base.css @@ -7,6 +7,19 @@ body { --pngx-primary-active: #0c2c10; } +.logo { + height: auto; +} + +.byline { + font-size: 0.6rem; + letter-spacing: 0.1rem; +} + +.text-primary { + color: var(--pngx-primary) !important; +} + .form-control { --bs-body-bg: #fff; } @@ -28,6 +41,7 @@ body { .form-accounts { max-width: 330px; + min-width: 300px; } .form-stacked-top input { @@ -74,4 +88,8 @@ body { svg.logo .text { fill: #abb2bf !important; } + + .byline { + color: #abb2bf; + } } diff --git a/src/documents/templates/paperless-ngx/base.html b/src/documents/templates/paperless-ngx/base.html index 7a15320fd..49fc0edf4 100644 --- a/src/documents/templates/paperless-ngx/base.html +++ b/src/documents/templates/paperless-ngx/base.html @@ -13,14 +13,31 @@ {% endblock head_title %} - +
{% csrf_token %} - {% include "paperless-ngx/snippets/svg_logo.html" with extra_attrs="width='300' class='logo mb-4'" %} + {% if not APP_LOGO and not APP_TITLE %} + {% include "paperless-ngx/snippets/svg_logo.html" with extra_attrs="width='300' class='logo mb-4'" %} + {% else %} + {% if APP_LOGO %} + +
+ by Paperless-ngx +
+ {% else %} +

+ {% include "paperless-ngx/snippets/svg_leaf.html" with extra_attrs="width='30' class='mt-2'" %} +
+ {{ APP_TITLE }} + by Paperless-ngx +
+

+ {% endif %} + {% endif %} {% for message in messages %}