From 8bea746d8362a8165c1b720ce2b81ecd2217a89e Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:24:25 -0400 Subject: [PATCH 01/13] Update Add.html BS v5 changed block buttons, panels -> cards, and icon classes. --- mfa/templates/Email/Add.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mfa/templates/Email/Add.html b/mfa/templates/Email/Add.html index 9b1db75..a1a5bfe 100644 --- a/mfa/templates/Email/Add.html +++ b/mfa/templates/Email/Add.html @@ -5,11 +5,11 @@

-
-
+
+
Activate Token by email
-
+
{% csrf_token %} {% if invalid %} @@ -33,12 +33,12 @@
- +
-
+
@@ -48,4 +48,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} From f655851f65b6624ec2a24557abc7ee24d658e6e2 Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:28:34 -0400 Subject: [PATCH 02/13] BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes. --- mfa/templates/Email/recheck.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mfa/templates/Email/recheck.html b/mfa/templates/Email/recheck.html index 913804c..37e3f0d 100644 --- a/mfa/templates/Email/recheck.html +++ b/mfa/templates/Email/recheck.html @@ -16,11 +16,11 @@
-
-
+
+
Email One Time Password
-
+
@@ -48,14 +48,14 @@
- +
-
+
From 4a2839a4fba5c50b5e0035d43cf755d6e57a632a Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:30:27 -0400 Subject: [PATCH 03/13] BS v5 panels BootStrap v5 changed panels to cards --- mfa/templates/FIDO2/Add.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mfa/templates/FIDO2/Add.html b/mfa/templates/FIDO2/Add.html index 5340c45..fc11d37 100644 --- a/mfa/templates/FIDO2/Add.html +++ b/mfa/templates/FIDO2/Add.html @@ -59,11 +59,11 @@

-
-
+
+
FIDO2 Security Key
-
+
@@ -73,4 +73,4 @@
{% include "modal.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} From 566b05f1e69ff9d982d62e3c2d046e494ba06bf8 Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:32:09 -0400 Subject: [PATCH 04/13] BS v5 panels update BootStrap v5 changed panels to cards --- mfa/templates/FIDO2/recheck.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mfa/templates/FIDO2/recheck.html b/mfa/templates/FIDO2/recheck.html index e5d8e79..22696f0 100644 --- a/mfa/templates/FIDO2/recheck.html +++ b/mfa/templates/FIDO2/recheck.html @@ -4,11 +4,11 @@
-
-
+
+
Security Key
-
+
@@ -114,4 +114,4 @@ - \ No newline at end of file + From e4aaee6e1a33d9f67503a1b03810d3664a4ae4b7 Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:42:28 -0400 Subject: [PATCH 05/13] BS v5 buttons update Updated the display of buttons when used as an `` tag. This change was made in BS4. --- mfa/templates/TOTP/Add.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mfa/templates/TOTP/Add.html b/mfa/templates/TOTP/Add.html index d303f96..60b9f69 100644 --- a/mfa/templates/TOTP/Add.html +++ b/mfa/templates/TOTP/Add.html @@ -98,7 +98,7 @@
- + Cancel
@@ -106,4 +106,4 @@
{% include "modal.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} From b763c22297544e7e890c4d6f37ffef64c5f1f0c2 Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:43:53 -0400 Subject: [PATCH 06/13] BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes. --- mfa/templates/TOTP/recheck.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mfa/templates/TOTP/recheck.html b/mfa/templates/TOTP/recheck.html index 87c5a7c..2581f01 100644 --- a/mfa/templates/TOTP/recheck.html +++ b/mfa/templates/TOTP/recheck.html @@ -16,11 +16,11 @@
-
-
+
+
One Time Password
-
+
@@ -48,14 +48,14 @@
- +
-
+
From 7595b8d0c57d9af414e793eac26a0fb4e3e5551b Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:51:05 -0400 Subject: [PATCH 07/13] BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes. --- mfa/templates/TrustedDevices/Add.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mfa/templates/TrustedDevices/Add.html b/mfa/templates/TrustedDevices/Add.html index dbb1961..290d154 100644 --- a/mfa/templates/TrustedDevices/Add.html +++ b/mfa/templates/TrustedDevices/Add.html @@ -31,11 +31,11 @@
-
-
+
+
Add Trusted Device
-
+
{% if success %}
Please check your PC window, to continue the process. @@ -69,7 +69,7 @@
- + @@ -104,7 +104,7 @@
{% endcomment %} -
+
@@ -113,7 +113,7 @@ {% endif %}
-
+
From 32fdbf1bc08d73c058d66b800619be65cb47bdfb Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:52:14 -0400 Subject: [PATCH 08/13] BS v5 panels update --- mfa/templates/TrustedDevices/Done.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mfa/templates/TrustedDevices/Done.html b/mfa/templates/TrustedDevices/Done.html index f0fecc1..2c21c01 100644 --- a/mfa/templates/TrustedDevices/Done.html +++ b/mfa/templates/TrustedDevices/Done.html @@ -7,17 +7,17 @@
-
-
+
+
Add Trusted Device
-
+
Your device is now trusted, please try to login
-
+
From 8ed847922eb530596a6d32ef9b702ed8eef20e2f Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 12:54:16 -0400 Subject: [PATCH 09/13] BS v5 panels update --- mfa/templates/U2F/recheck.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mfa/templates/U2F/recheck.html b/mfa/templates/U2F/recheck.html index 9d9bfa6..1064151 100644 --- a/mfa/templates/U2F/recheck.html +++ b/mfa/templates/U2F/recheck.html @@ -2,11 +2,11 @@
-
-
+
+
Security Key
-
+
@@ -95,4 +95,4 @@ }) - \ No newline at end of file + From 227872291440ea9fa27386c80373252b5c4c08e3 Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 13:16:36 -0400 Subject: [PATCH 10/13] Font Awesome icon update Updated class attribute to also support new version of FA v6 trash can --- mfa/templates/MFA.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfa/templates/MFA.html b/mfa/templates/MFA.html index 1adb4ed..2c1a68a 100644 --- a/mfa/templates/MFA.html +++ b/mfa/templates/MFA.html @@ -98,7 +98,7 @@ {% if key.key_type in HIDE_DISABLE %} ---- {% else %} - + {% endif %} {% empty %} From 7a9195a73e922281bac1a6b9da2c4c4d7d16ee5e Mon Sep 17 00:00:00 2001 From: Ezra Rice Date: Thu, 2 Jun 2022 13:21:28 -0400 Subject: [PATCH 11/13] BS v5 panels update --- mfa/templates/select_mfa_method.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mfa/templates/select_mfa_method.html b/mfa/templates/select_mfa_method.html index d4bea9c..c6ca2ad 100644 --- a/mfa/templates/select_mfa_method.html +++ b/mfa/templates/select_mfa_method.html @@ -5,11 +5,11 @@
-
-
+
+
Select Second Verification Method
-
+
    {% for method in request.session.mfa_methods %} @@ -26,4 +26,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} From 7eecd759f7316b95efa966a9dd496f30caeefb50 Mon Sep 17 00:00:00 2001 From: Nathan Swain Date: Thu, 2 Jun 2022 12:53:41 -0600 Subject: [PATCH 12/13] Additional tweaks for bootstrap5 support btn-default -> btn-secondary use mb-3 to add margin to bottom of input-groups use $.modal('show') to show modals use bi bi-trash icon (font-awesome doesn't seem to be included with bs5 data-bs-dismiss on the modal close buttons put recheck templates in container divs add input-group-text class to addon icons for input fields --- example/example/templates/base.html | 2 +- example/example/templates/blank.html | 2 +- mfa/templates/Email/Add.html | 6 +++--- mfa/templates/Email/recheck.html | 8 +++++--- mfa/templates/FIDO2/recheck.html | 2 +- mfa/templates/MFA.html | 3 ++- mfa/templates/TOTP/Add.html | 4 ++-- mfa/templates/TOTP/recheck.html | 8 +++++--- mfa/templates/TrustedDevices/Add.html | 14 +++++++------- mfa/templates/TrustedDevices/start.html | 2 ++ mfa/templates/U2F/recheck.html | 2 +- mfa/templates/mfa_check.html | 1 + mfa/templates/modal.html | 4 ++-- mfa/templates/select_mfa_method.html | 3 +++ 14 files changed, 36 insertions(+), 25 deletions(-) diff --git a/example/example/templates/base.html b/example/example/templates/base.html index 786d08b..e5b1a6e 100644 --- a/example/example/templates/base.html +++ b/example/example/templates/base.html @@ -36,7 +36,7 @@
-
+
") $("#popUpModal").modal() + $("#popUpModal").modal('show') } function toggleKey(id) { @@ -98,7 +99,7 @@ {% if key.key_type in HIDE_DISABLE %} ---- {% else %} - + {% endif %} {% empty %} diff --git a/mfa/templates/TOTP/Add.html b/mfa/templates/TOTP/Add.html index 60b9f69..7bd2ce6 100644 --- a/mfa/templates/TOTP/Add.html +++ b/mfa/templates/TOTP/Add.html @@ -63,7 +63,7 @@ {% block content %}

-
+

Adding Authenticator

@@ -98,7 +98,7 @@
- Cancel + Cancel
diff --git a/mfa/templates/TOTP/recheck.html b/mfa/templates/TOTP/recheck.html index 2581f01..e172b0e 100644 --- a/mfa/templates/TOTP/recheck.html +++ b/mfa/templates/TOTP/recheck.html @@ -13,6 +13,7 @@ } +
@@ -46,8 +47,8 @@
-
- +
+ @@ -64,7 +65,7 @@
-
+
{% if request.session.mfa_methods|length > 1 %} Select Another Method {% endif %} @@ -74,3 +75,4 @@
+
diff --git a/mfa/templates/TrustedDevices/Add.html b/mfa/templates/TrustedDevices/Add.html index 290d154..ec74e16 100644 --- a/mfa/templates/TrustedDevices/Add.html +++ b/mfa/templates/TrustedDevices/Add.html @@ -67,8 +67,8 @@
-
- +
+ @@ -76,22 +76,22 @@
-
- +
+
- + I confirm that this device is mine and it is only used by me.
{% comment %}
-
- +
+