From f3672864fa4fde8928ac64ef0b9c48c5789c12ca Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 19 May 2024 11:04:29 -0700 Subject: [PATCH] Support app_title only --- src/documents/context_processors.py | 5 +++++ src/documents/static/base.css | 8 ++++++++ src/documents/templates/paperless-ngx/base.html | 11 +++++++++-- .../templates/paperless-ngx/snippets/svg_leaf.html | 5 +++++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 src/documents/templates/paperless-ngx/snippets/svg_leaf.html diff --git a/src/documents/context_processors.py b/src/documents/context_processors.py index fd2757133..869857dbf 100644 --- a/src/documents/context_processors.py +++ b/src/documents/context_processors.py @@ -5,6 +5,10 @@ from paperless.config import GeneralConfig def settings(request): general_config = GeneralConfig() + + app_title = django_settings.APP_TITLE + if general_config.app_title is not None and len(general_config.app_title) > 0: + app_title = general_config.app_title app_logo = django_settings.APP_LOGO if general_config.app_logo is not None and len(general_config.app_logo) > 0: app_logo = general_config.app_logo @@ -15,5 +19,6 @@ def settings(request): "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/base.css b/src/documents/static/base.css index d9cb9c606..ed6f091ba 100644 --- a/src/documents/static/base.css +++ b/src/documents/static/base.css @@ -16,6 +16,14 @@ body { letter-spacing: 0.1rem; } +.mt-n1 { + margin-top: -0.8rem; +} + +.text-primary { + color: var(--pngx-primary) !important; +} + .form-control { --bs-body-bg: #fff; } diff --git a/src/documents/templates/paperless-ngx/base.html b/src/documents/templates/paperless-ngx/base.html index 9e330ab38..293eab3e8 100644 --- a/src/documents/templates/paperless-ngx/base.html +++ b/src/documents/templates/paperless-ngx/base.html @@ -20,10 +20,17 @@
{% csrf_token %} - {% if not APP_LOGO %} + {% 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 %} + + {% else %} +

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

+ {% endif %}
diff --git a/src/documents/templates/paperless-ngx/snippets/svg_leaf.html b/src/documents/templates/paperless-ngx/snippets/svg_leaf.html new file mode 100644 index 000000000..bb33bbdd3 --- /dev/null +++ b/src/documents/templates/paperless-ngx/snippets/svg_leaf.html @@ -0,0 +1,5 @@ + + +