From eb25d0110725dcc8dedd527686acc0a2ea341c86 Mon Sep 17 00:00:00 2001 From: Augustin-FL Date: Sat, 28 Dec 2024 21:09:14 +0100 Subject: [PATCH] fir_auth_2fa: show navbar during setup --- fir_auth_2fa/templates/two_factor/_base.html | 36 ++++++-------------- fir_auth_2fa/templates/two_factor/login.html | 2 +- incidents/templates/base.html | 4 ++- incidents/templates/incidents/login.html | 2 ++ 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/fir_auth_2fa/templates/two_factor/_base.html b/fir_auth_2fa/templates/two_factor/_base.html index ba402a1e..b4e61496 100644 --- a/fir_auth_2fa/templates/two_factor/_base.html +++ b/fir_auth_2fa/templates/two_factor/_base.html @@ -1,30 +1,14 @@ +{% extends "base.html" %} {% load i18n %} {% load static %} - - - - - {% trans "Sign in · FIR" %} - - - - - - - {% block extra_media %}{% endblock %} +{% block content_wrapper %} +
+
+
+ {% block content %}{% endblock %} +
+
+
+{% endblock %} - - - - - - {% block content_wrapper %} -
- {% block content %}{% endblock %} -
- {% endblock %} - - - - diff --git a/fir_auth_2fa/templates/two_factor/login.html b/fir_auth_2fa/templates/two_factor/login.html index 5f6cf5d0..175b8c21 100644 --- a/fir_auth_2fa/templates/two_factor/login.html +++ b/fir_auth_2fa/templates/two_factor/login.html @@ -1,4 +1,4 @@ -{% extends "two_factor/_base.html" %} +{% extends "incidents/login.html" %} {% load i18n %} {% load field_type %} {% load static %} diff --git a/incidents/templates/base.html b/incidents/templates/base.html index dbe1613a..816e2905 100755 --- a/incidents/templates/base.html +++ b/incidents/templates/base.html @@ -110,7 +110,9 @@
{% block header %}{% endblock %} - {% block content %}{% endblock %} + {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock%}