From 5550c89b9aed725efe05f95d7f523828fe984bfe Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 14:44:31 +0000 Subject: [PATCH 01/24] make padding uniform --- InvenTree/InvenTree/static/css/inventree.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 632ec2e0e5..f3e1a558e2 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -545,6 +545,7 @@ .inventree-body { width: 100%; padding: 5px; + padding-right: 0; } .inventree-pre-content { @@ -835,7 +836,7 @@ input[type="submit"] { .panel { box-shadow: 2px 2px #DDD; - margin-bottom: 20px; + margin-bottom: .75rem; background-color: #fff; border: 1px solid #ccc; } From d604b2afff2b668bc8ca3a25bffafb4c4af7d667 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 14:44:46 +0000 Subject: [PATCH 02/24] make padding uniform --- InvenTree/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index 856deac4be..6378b6b2ee 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -83,7 +83,7 @@ -
+
{% block alerts %}
From 19a3568511ad75869c5917dfee2f6982baf52047 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 15:02:40 +0000 Subject: [PATCH 03/24] fix nav arranging on mobile --- InvenTree/templates/navbar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 58c7b8ecb2..56cc4ed488 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -62,9 +62,9 @@
{% include "search_form.html" %} -
    +
      {% if barcodes %} -
    - From bbd723a17673feac250a6fe93b93752cd4b291c6 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 15:11:31 +0000 Subject: [PATCH 05/24] fix QR code alingment --- InvenTree/InvenTree/static/css/inventree.css | 6 ------ InvenTree/templates/qr_code.html | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index f3e1a558e2..00041f0fae 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -125,12 +125,6 @@ align-content: center; } -.qr-container { - width: 100%; - align-content: center; - object-fit: fill; -} - .navbar { border-bottom: 1px solid #ccc; background-color: var(--secondary-color); diff --git a/InvenTree/templates/qr_code.html b/InvenTree/templates/qr_code.html index 8964ef02be..a39847629d 100644 --- a/InvenTree/templates/qr_code.html +++ b/InvenTree/templates/qr_code.html @@ -3,7 +3,7 @@
    {% if qr_data %} -
    +
    {% else %} From 857cdd5aeac4004a269e4d82256a5eca2f799baa Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 17:41:11 +0000 Subject: [PATCH 06/24] Enlsigh is the base - always translated! Fixes #2257 --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index d1baf1ba6e..867c8ef733 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -224,7 +224,7 @@ {% if lang_translated %} {% blocktrans %}{{ lang_translated }}% translated{% endblocktrans %} {% else %} - {% trans 'No translations available' %} + {% if lang_code == 'en' %}-{% else %}{% trans 'No translations available' %}{% endif %} {% endif %} {% endfor %} From cea466973a4886721a790610a2d4d88929f0675b Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 19:55:02 +0000 Subject: [PATCH 07/24] Check if language has enough translations Fixes #2257 --- InvenTree/templates/InvenTree/settings/user.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 867c8ef733..2692d11c02 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -216,9 +216,12 @@ {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} {% get_language_info_list for LANGUAGES as languages %} + {% define 'alllang' in request.GET as ALL_LANG %} {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} + {% define lang_translated > 10 or lang_code == 'en' as use_lang %} + {% if ALL_LANG or use_lang %} + {% endif %} {% endfor %}
    +

    {% trans "Some languages are have a low translation percentage." %} + {% if ALL_LANG %} + {% trans "Show only sufficent" %} + {% else %} + {% trans "Show them too" %} + {% endif %} +

    From dccc832779e9741f711880c945fbdfb30c2c5a15 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 20:41:29 +0000 Subject: [PATCH 08/24] fix logic --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 2692d11c02..81c9af885e 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -216,7 +216,7 @@ {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} {% get_language_info_list for LANGUAGES as languages %} - {% define 'alllang' in request.GET as ALL_LANG %} + {% if 'alllang' in request.GET %}{% define True as ALL_LANG %}{% endif %} {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} From 45b7bc0c5128a2dee7a5e8476ce8e1b261909983 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 20:41:52 +0000 Subject: [PATCH 09/24] always show the current language --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 81c9af885e..4e882b5e19 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -220,7 +220,7 @@ {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} - {% define lang_translated > 10 or lang_code == 'en' as use_lang %} + {% if lang_translated > 10 or lang_code == 'en' or lang_code == LANGUAGE_CODE %}{% define True as use_lang %}{% else %}{% define False as use_lang %}{% endif %} {% if ALL_LANG or use_lang %}