From 7834171c2a63c41c5a7a55abe954c938d76fbb5f Mon Sep 17 00:00:00 2001
From: Matthias
Date: Sat, 23 Apr 2022 23:38:49 +0200
Subject: [PATCH] [FR] White labeling Fixes #2301
---
InvenTree/InvenTree/settings.py | 7 +++++++
InvenTree/config_template.yaml | 3 +++
InvenTree/part/templatetags/inventree_extras.py | 7 +++++++
InvenTree/templates/account/login.html | 14 ++++++--------
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py
index e1c584362f..b96705d6dc 100644
--- a/InvenTree/InvenTree/settings.py
+++ b/InvenTree/InvenTree/settings.py
@@ -67,6 +67,13 @@ DEMO_MODE = _is_true(get_setting(
CONFIG.get('demo', False)
))
+# user interface customization values
+CUSTOMIZE = get_setting(
+ 'INVENTREE_CUSTOMIZE',
+ CONFIG.get('customize', {}),
+ {}
+)
+
DOCKER = _is_true(get_setting(
'INVENTREE_DOCKER',
False
diff --git a/InvenTree/config_template.yaml b/InvenTree/config_template.yaml
index 65dd20d3e8..862d062787 100644
--- a/InvenTree/config_template.yaml
+++ b/InvenTree/config_template.yaml
@@ -186,3 +186,6 @@ static_root: '/home/inventree/data/static'
# KEYCLOAK_URL: 'https://keycloak.custom/auth'
# KEYCLOAK_REALM: 'master'
+# customize:
+# login_message: |
+# InvenTree demo instance - Click here for login details
diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index dc93e00efa..2d0b0660d6 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -509,6 +509,13 @@ def mail_configured():
return bool(settings.EMAIL_HOST)
+@register.simple_tag()
+def inventree_customize(reference, *args, **kwargs):
+ """ Return customization values for the user interface """
+
+ return djangosettings.CUSTOMIZE.get(reference, '')
+
+
class I18nStaticNode(StaticNode):
"""
custom StaticNode
diff --git a/InvenTree/templates/account/login.html b/InvenTree/templates/account/login.html
index 6e62560bfa..1a4df286bb 100644
--- a/InvenTree/templates/account/login.html
+++ b/InvenTree/templates/account/login.html
@@ -1,7 +1,7 @@
{% extends "account/base.html" %}
{% load inventree_extras %}
-{% load i18n account socialaccount crispy_forms_tags inventree_extras %}
+{% load i18n account socialaccount crispy_forms_tags inventree_extras markdownify %}
{% block head_title %}{% trans "Sign In" %}{% endblock %}
@@ -10,6 +10,7 @@
{% settings_value 'LOGIN_ENABLE_REG' as enable_reg %}
{% settings_value 'LOGIN_ENABLE_PWD_FORGOT' as enable_pwd_forgot %}
{% settings_value 'LOGIN_ENABLE_SSO' as enable_sso %}
+{% inventree_customize 'login_message' as login_message %}
{% mail_configured as mail_conf %}
{% inventree_demo_mode as demo %}
@@ -35,19 +36,16 @@ for a account and sign in below:{% endblocktrans %}
{% endif %}
+ {% if login_message %}
+ {{ login_message|markdownify }}
+
+ {% endif %}
{% if mail_conf and enable_pwd_forgot and not demo %}
{% trans "Forgot Password?" %}
{% endif %}
- {% if demo %}
-
-
-
- {% endif %}
{% if enable_sso %}