From 500213b5ab621fa10c1d9c8f0696adb623919171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20M=C3=BCller?= <9070224-W13R@users.noreply.gitlab.com> Date: Wed, 29 Jun 2022 19:02:01 +0200 Subject: [PATCH 1/4] Use 'surname, forename' instead of 'forename surname' in userlist on login page --- application/app/templates/registration/login.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/app/templates/registration/login.html b/application/app/templates/registration/login.html index c0179b4..14dc819 100644 --- a/application/app/templates/registration/login.html +++ b/application/app/templates/registration/login.html @@ -71,12 +71,12 @@ {% if user_.first_name %} - {{ user_.first_name }} - {% if user_.last_name %} - {{ user_.last_name }} + {{ user_.last_name }}, {% endif %} + {{ user_.first_name }} + {% else %} {{ user_.username }} {% endif %} -- 2.43.0 From 91a184b284a5cb4020e0a427534c941f55a2a138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20M=C3=BCller?= <9070224-W13R@users.noreply.gitlab.com> Date: Wed, 29 Jun 2022 19:08:21 +0200 Subject: [PATCH 2/4] Make the login overlay a bit more compact --- static/css/login.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/static/css/login.css b/static/css/login.css index 8a7fb03..346b4f9 100644 --- a/static/css/login.css +++ b/static/css/login.css @@ -70,9 +70,12 @@ form input[type="password"], form input[type="text"] { font-size: 1rem; margin: .1rem 0; } +form .horizontalButtonList { + margin-top: 1.5rem; +} .pinpad { - margin-top: 3rem; - margin-bottom: 2rem; + margin-top: 1.5rem; + margin-bottom: 0; display: flex; flex-direction: column; align-items: center; -- 2.43.0 From 4fd02a84980025a780dfc069e85476907e97eb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20M=C3=BCller?= <9070224-W13R@users.noreply.gitlab.com> Date: Wed, 29 Jun 2022 20:04:28 +0200 Subject: [PATCH 3/4] #7 fix broken login page for Webkit Browsers --- static/js/login.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/login.js b/static/js/login.js index 0f11ba0..df54187 100644 --- a/static/js/login.js +++ b/static/js/login.js @@ -1,4 +1,4 @@ -{ +(() => { // Define variables @@ -84,4 +84,4 @@ } } -} \ No newline at end of file +})() \ No newline at end of file -- 2.43.0 From 4cd55136218d58c30c314e3e6193f484c63f1216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20M=C3=BCller?= <9070224-W13R@users.noreply.gitlab.com> Date: Wed, 29 Jun 2022 20:10:03 +0200 Subject: [PATCH 4/4] Bump version to 10 --- lib/env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/env.sh b/lib/env.sh index 9eeb667..d11c933 100644 --- a/lib/env.sh +++ b/lib/env.sh @@ -2,5 +2,5 @@ export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt" export STATIC_FILES="$(pwd)/static/" -export APP_VERSION="9" +export APP_VERSION="10" export PYTHONPATH="$(pwd)/packages/" -- 2.43.0