Support app_title only

This commit is contained in:
shamoon
2024-05-19 11:04:29 -07:00
parent af5fc7775f
commit f3672864fa
4 changed files with 27 additions and 2 deletions

View File

@@ -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,
}

View File

@@ -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;
}

View File

@@ -20,10 +20,17 @@
<div class="position-absolute top-50 start-50 translate-middle">
<form class="form-accounts" method="post">
{% 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 %}
<img src="{{APP_LOGO}}" width="300" class="logo mb-1" />
{% else %}
<h1 class="text-primary font-weight-normal mb-1">
{% include "paperless-ngx/snippets/svg_leaf.html" with extra_attrs="width='30' class='mt-n1'" %}
<span class="ms-2">{{ APP_TITLE }}</span>
</h1>
{% endif %}
<div class="d-flex flex-column align-items-end mb-4">
<span class="byline text-uppercase font-monospace">by Paperless-ngx</span>
</div>

View File

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" {{ extra_attrs }} fill="currentColor">
<path
d="M194.7,0C164.22,70.94,17.64,79.74,64.55,194.06c.58,1.47-10.85,17-18.47,29.9-1.76-6.45-3.81-13.48-3.52-14.07,38.11-45.14-27.26-70.65-30.78-107.58C-4.64,131.62-10.5,182.92,39,212.53c.3,0,2.64,11.14,3.81,16.71a58.55,58.55,0,0,0-2.93,6.45c-1.17,2.93,7.62,2.64,7.62,3.22.88-.29,21.7-36.93,22.28-37.23C187.67,174.72,208.48,68.6,194.7,0ZM134.61,74.75C79.5,124,70.12,160.64,71.88,178.53,53.41,134.85,107.64,86.77,134.61,74.75ZM28.2,145.11c10.55,9.67,28.14,39.28,13.19,56.57C44.91,193.77,46.08,175.89,28.2,145.11Z"
transform="translate(0 0)" />
</svg>

After

Width:  |  Height:  |  Size: 679 B