From 2abcb114a8941e4228819a6f57bf4dba88ee0fbd Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 11:28:46 +1100 Subject: [PATCH 1/8] Visual improvements for "currency" page --- .../InvenTree/settings/currencies.html | 18 ++++++++++-------- InvenTree/templates/panel.html | 8 +++++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/currencies.html b/InvenTree/templates/InvenTree/settings/currencies.html index ba6e782508..706f836317 100644 --- a/InvenTree/templates/InvenTree/settings/currencies.html +++ b/InvenTree/templates/InvenTree/settings/currencies.html @@ -13,29 +13,31 @@ {% include "InvenTree/settings/setting.html" with key="INVENTREE_DEFAULT_CURRENCY" icon="fa-globe" %} - -
- - + - + + {% for rate in rates %} - + + + + {% endfor %} + - diff --git a/InvenTree/templates/panel.html b/InvenTree/templates/panel.html index 1491991e8c..53c5ca997a 100644 --- a/InvenTree/templates/panel.html +++ b/InvenTree/templates/panel.html @@ -1,7 +1,13 @@
{% block panel_heading %}
-

{% block heading %}HEADING{% endblock %}

+
+

{% block heading %}HEADING{% endblock %}

+
+
+ {% block actions %} + {% endblock %} +
{% endblock %} {% block panel_content %} From 66b078e4b9b1e4a0b7675c756e5e91a9634eaadb Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 11:31:24 +1100 Subject: [PATCH 2/8] Refactor part settings page --- .../templates/InvenTree/settings/part.html | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/part.html b/InvenTree/templates/InvenTree/settings/part.html index 351810b7dc..1b2a3e5498 100644 --- a/InvenTree/templates/InvenTree/settings/part.html +++ b/InvenTree/templates/InvenTree/settings/part.html @@ -9,8 +9,6 @@ {% block content %} -

{% trans "Part Options" %}

-
{% trans "Base Currency" %} {{ base_currency }}
{% trans "Exchange Rates" %}{% trans "Exchange Rates" %}
{{ rate.currency }} {{ rate.value }}{{ rate.currency }}
{% trans "Last Update" %} + {% if rates_updated %} {{ rates_updated }} {% else %} @@ -44,7 +46,7 @@
{% csrf_token %} - +
{% include "InvenTree/settings/setting.html" with key="PART_IPN_REGEX" %} @@ -40,12 +38,17 @@
-

{% trans "Part Import" %}

- - - +
+
+

{% trans "Part Import" %}

+ {% include "spacer.html" %} +
+ +
+
+
@@ -53,14 +56,16 @@
- - -

{% trans "Part Parameter Templates" %}

- -
- +
+ +

{% trans "Part Parameter Templates" %}

+ {% include "spacer.html" %} +
+ +
+
From 489d085de83aa1d03f19f7491efa450335c90909 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 11:32:57 +1100 Subject: [PATCH 3/8] Refactor "category" settings page --- InvenTree/templates/InvenTree/settings/category.html | 12 ++++++------ InvenTree/templates/panel.html | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/category.html b/InvenTree/templates/InvenTree/settings/category.html index 9eb595ddde..f90d1e8d11 100644 --- a/InvenTree/templates/InvenTree/settings/category.html +++ b/InvenTree/templates/InvenTree/settings/category.html @@ -7,6 +7,12 @@ {% trans "Category Settings" %} {% endblock %} +{% block actions %} + +{% endblock %} + {% block content %}
@@ -21,12 +27,6 @@
-
- -
-
diff --git a/InvenTree/templates/panel.html b/InvenTree/templates/panel.html index 53c5ca997a..86867f07b4 100644 --- a/InvenTree/templates/panel.html +++ b/InvenTree/templates/panel.html @@ -3,10 +3,11 @@

{% block heading %}HEADING{% endblock %}

-
-
- {% block actions %} - {% endblock %} + {% include "spacer.html" %} +
+ {% block actions %} + {% endblock %} +
{% endblock %} From d1f2d960be9f9b1cf4733e16d1aaf02b7b119aa0 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 12:15:46 +1100 Subject: [PATCH 4/8] Refactor "user account" page --- .../templates/InvenTree/settings/user.html | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index d6cbf998a7..29813465cd 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -11,18 +11,18 @@ {% trans "Account Settings" %} {% endblock %} +{% block actions %} +
+ {% trans "Edit" %} +
+
+ {% trans "Set Password" %} +
+{% endblock %} + {% block content %} {% mail_configured as mail_conf %} -
-
- {% trans "Edit" %} -
-
- {% trans "Set Password" %} -
-
- @@ -39,7 +39,10 @@
{% trans "Username" %}
-

{% trans "Email" %}

+
+

{% trans "Email" %}

+ {% include "spacer.html" %} +
@@ -89,8 +92,18 @@
{% csrf_token %} - {{ add_email_form|crispy }} - + + +
+
@
+ +
+ +
+
+
{% endif %}
From ec147ea25fbe85a5e6fbd9a50f22ad7b1d5411ca Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 12:49:44 +1100 Subject: [PATCH 5/8] Further work on email settings page --- .../templates/InvenTree/settings/user.html | 124 +++++++++--------- 1 file changed, 64 insertions(+), 60 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 29813465cd..1b5e507047 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -45,50 +45,51 @@
-
- {% if user.emailaddress_set.all %} -

{% trans 'The following email addresses are associated with your account:' %}

+
+
+ {% if user.emailaddress_set.all %} +

{% trans 'The following email addresses are associated with your account:' %}

- - + {% else %} +

{% trans 'Warning:'%} + {% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %} +

- {% else %} -

{% trans 'Warning:'%} - {% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %} -

- - {% endif %} - - {% if can_add_email %} -
-

{% trans "Add Email Address" %}

+ {% endif %} +
+
+ {% if can_add_email %} +
{% trans "Add Email Address" %}
{% csrf_token %} @@ -106,7 +107,7 @@
{% endif %} -
+
@@ -168,26 +169,26 @@
-
- {% csrf_token %} - -
-
-
- +
+ + {% csrf_token %} + + +
+ +
+
-
-
- -
- - + +
@@ -199,7 +200,10 @@
{% csrf_token %} -
+ +
-
-
- +
+ +
- +

{% trans "Help the translation efforts!" %}

From fc9ca5e48138e8f1f513d7c4af4d9fdbeea2e748 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 12:54:41 +1100 Subject: [PATCH 6/8] Pretty badges for email accounts --- .../templates/InvenTree/settings/user.html | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 1b5e507047..aaf16cf853 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -55,20 +55,26 @@
{% for emailaddress in user.emailaddress_set.all %} +
{% if emailaddress.verified %} - {% trans "Verified" %} + {% trans "Verified" %} {% else %} - {% trans "Unverified" %} + {% trans "Unverified" %} {% endif %} - {% if emailaddress.primary %}{% trans "Primary" %}{% endif %} - + {% if emailaddress.primary %}{% trans "Primary" %}{% endif %}
+
{% endfor %}
From a3889c709e5cc46fde650af5437166ceb69744d7 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 12:57:40 +1100 Subject: [PATCH 7/8] More tweaks --- InvenTree/common/models.py | 6 +++--- InvenTree/templates/InvenTree/settings/login.html | 2 +- InvenTree/templates/InvenTree/settings/setting.html | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index 3dae13c3e0..1809f437f7 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -807,19 +807,19 @@ class InvenTreeSetting(BaseInvenTreeSetting): # login / SSO 'LOGIN_ENABLE_PWD_FORGOT': { 'name': _('Enable password forgot'), - 'description': _('Enable password forgot function on the login-pages'), + 'description': _('Enable password forgot function on the login pages'), 'default': True, 'validator': bool, }, 'LOGIN_ENABLE_REG': { 'name': _('Enable registration'), - 'description': _('Enable self-registration for users on the login-pages'), + 'description': _('Enable self-registration for users on the login pages'), 'default': False, 'validator': bool, }, 'LOGIN_ENABLE_SSO': { 'name': _('Enable SSO'), - 'description': _('Enable SSO on the login-pages'), + 'description': _('Enable SSO on the login pages'), 'default': False, 'validator': bool, }, diff --git a/InvenTree/templates/InvenTree/settings/login.html b/InvenTree/templates/InvenTree/settings/login.html index d3cba1180f..96d986d6c7 100644 --- a/InvenTree/templates/InvenTree/settings/login.html +++ b/InvenTree/templates/InvenTree/settings/login.html @@ -17,7 +17,7 @@ {% include "InvenTree/settings/setting.html" with key="LOGIN_ENABLE_PWD_FORGOT" icon="fa-info-circle" %} {% include "InvenTree/settings/setting.html" with key="LOGIN_MAIL_REQUIRED" icon="fa-info-circle" %} - {% trans 'Signup' %} +
{% trans 'Signup' %}
{% include "InvenTree/settings/setting.html" with key="LOGIN_ENABLE_REG" icon="fa-info-circle" %} diff --git a/InvenTree/templates/InvenTree/settings/setting.html b/InvenTree/templates/InvenTree/settings/setting.html index 4a506b46e6..7419b7ff34 100644 --- a/InvenTree/templates/InvenTree/settings/setting.html +++ b/InvenTree/templates/InvenTree/settings/setting.html @@ -21,15 +21,13 @@
{% else %}
- {% if setting.value %} - {{ setting.value }} + {{ setting.value }} {% else %} - {% trans "No value set" %} + {% trans "No value set" %} {% endif %} - {{ setting.units }}
{% endif %} From e3dfb6cbc8f3d2c8cb9c7a25b21771dc4d2d80f5 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 2 Nov 2021 13:08:10 +1100 Subject: [PATCH 8/8] Improve messaging --- InvenTree/templates/InvenTree/settings/user.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index aaf16cf853..d1baf1ba6e 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -155,7 +155,9 @@ {% else %} -

{% trans 'You currently have no social network accounts connected to this account.' %}

+
+ {% trans "There are no social network accounts connected to your InvenTree account" %} +
{% endif %}