fir_auth_2fa: show navbar during setup

security-geeks · Dec 28, 2024 · eb25d01 · eb25d01
1 parent ea231e2
commit eb25d01
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 28 deletions.
diff --git 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 %}
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>{% trans "Sign in &middot; FIR" %}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
 
-    <link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
-    <link href="{% static "custom_css/fir.css" %}" rel="stylesheet">
-    <link href="{% static "custom_css/login.css" %}" rel="stylesheet">
-    {% block extra_media %}{% endblock %}
+{% block content_wrapper %}
+  <div class="container">
+    <div class="row justify-content-md-center">
+	    <div class="col-sm-8 col-sm-offset-4 col-xs-12 col-xs-offset-0">
+      {% block content %}{% endblock %}
+	    </div>
+    </div>
+  </div>
+{% endblock %}
 
-    <!-- Fav and touch icons -->
-    <link rel="shortcut icon" href="{% static "img/favicon.png" %}">
-  </head>
-
-  <body>
-    {% block content_wrapper %}
-      <div class="container">
-        {% block content %}{% endblock %}
-       </div>
-      {% endblock %}
-    <script src="{% static "js/jquery.min.js" %}"></script>
-    <script src="{% static "js/bootstrap.min.js" %}"></script>
-  </body>
-</html>
diff --git 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
@@ -110,7 +110,9 @@
 
     <div class="container-fluid mt-2 pt-2">
       {% block header %}{% endblock %}
-      {% block content %}{% endblock %}
+      {% block content_wrapper %}
+        {% block content %}{% endblock %}
+      {% endblock%}
     </div>
 
     <!-- Le javascript

diff --git a/incidents/templates/incidents/login.html b/incidents/templates/incidents/login.html
@@ -21,6 +21,7 @@
   <body>
 
     <div class="container">
+    {% block content %}
       <div class="row justify-content-md-center">
         <div class="col-sm-5 col-sm-offset-4 col-xs-12 col-xs-offset-0">
           <form class="form-signin p-4" method="post">
@@ -52,6 +53,7 @@ <h2 class="form-signin-heading">{%  trans "Sign in to FIR" %}</h2>
           {% endif %}
         </div>
       </div>
+    {% endblock %}
     </div>
 
     <script src="{% static "js/jquery.min.js" %}"></script>