From abf2093ab9a88449b06668af66e7fd245a3f6d94 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 27 Oct 2021 16:26:41 +1100 Subject: [PATCH] Adds user option to enable "sticky header" --- InvenTree/common/models.py | 9 +++++++- .../templates/InvenTree/settings/navbar.html | 6 +++++ .../templates/InvenTree/settings/setting.html | 4 ++-- .../InvenTree/settings/settings.html | 1 + .../InvenTree/settings/user_display.html | 22 +++++++++++++++++++ InvenTree/templates/navbar.html | 3 ++- 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 InvenTree/templates/InvenTree/settings/user_display.html diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index 551515733d..3dae13c3e0 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1017,7 +1017,14 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'description': _('Use the escape key to close modal forms'), 'default': False, 'validator': bool, - } + }, + + 'STICKY_HEADER': { + 'name': _('Fixed Navbar'), + 'description': _('InvenTree navbar position is fixed to the top of the screen'), + 'default': False, + 'validator': bool, + }, } class Meta: diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html index 6c956761a2..46150f57d1 100644 --- a/InvenTree/templates/InvenTree/settings/navbar.html +++ b/InvenTree/templates/InvenTree/settings/navbar.html @@ -42,6 +42,12 @@ +
  • + + {% trans "Display" %} + +
  • +
  • {% trans "Forms" %} diff --git a/InvenTree/templates/InvenTree/settings/setting.html b/InvenTree/templates/InvenTree/settings/setting.html index de3439a647..77d86d86e8 100644 --- a/InvenTree/templates/InvenTree/settings/setting.html +++ b/InvenTree/templates/InvenTree/settings/setting.html @@ -16,8 +16,8 @@ {% trans setting.name %} {% if setting.is_bool %} -
    - +
    +
    {% else %}
    diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html index cdc1279620..590e40f392 100644 --- a/InvenTree/templates/InvenTree/settings/settings.html +++ b/InvenTree/templates/InvenTree/settings/settings.html @@ -20,6 +20,7 @@ {% include "InvenTree/settings/user_search.html" %} {% include "InvenTree/settings/user_labels.html" %} {% include "InvenTree/settings/user_reports.html" %} +{% include "InvenTree/settings/user_display.html" %} {% include "InvenTree/settings/user_forms.html" %} {% if user.is_staff %} diff --git a/InvenTree/templates/InvenTree/settings/user_display.html b/InvenTree/templates/InvenTree/settings/user_display.html new file mode 100644 index 0000000000..1415e4c37b --- /dev/null +++ b/InvenTree/templates/InvenTree/settings/user_display.html @@ -0,0 +1,22 @@ +{% extends "panel.html" %} + +{% load i18n %} +{% load inventree_extras %} + +{% block label %}user-display{% endblock %} + +{% block heading %} +{% trans "Display Settings" %} +{% endblock %} + +{% block content %} + +
    + + + {% include "InvenTree/settings/setting.html" with key="STICKY_HEADER" icon="fa-bars" user_setting=True %} + +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 7f438bdb59..1bf0cfbf0d 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -3,8 +3,9 @@ {% load i18n %} {% settings_value 'BARCODE_ENABLE' as barcodes %} +{% settings_value 'STICKY_HEADER' user=request.user as sticky %} -