Ready now

2019-01-18 16:07:22 +03:00
parent 800f60ff53
commit 2f1c344e75
22 changed files with 1291 additions and 21 deletions
--- a/mfa/templates/FIDO2/Add.html
+++ b/mfa/templates/FIDO2/Add.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
+{% load static %}
 {% block head %}
-    <script type="application/javascript" src="{{ STATIC_URL }}js/cbor.js"></script>
+    <script type="application/javascript" src="{% static 'mfa/js/cbor.js'%}"></script>
    <script type="application/javascript">
    function begin_reg(){
    fetch('{% url 'fido2_begin_reg' %}',{}).then(function(response) {
@@ -44,6 +45,8 @@

 {% endblock %}
 {% block content %}
+      <br/>
+    <br/>
     <div class="container">
     <div class="panel panel-default">
      <div class="panel-heading">
--- a/mfa/templates/FIDO2/Auth.html
+++ b/mfa/templates/FIDO2/Auth.html
@@ -1,4 +1,6 @@
-{% extends "login_base.html" %}
-{% block form %}
+{% extends "mfa_auth_base.html" %}
+{% block content %}
+    <br/>
+<br/>
 {% include 'FIDO2/recheck.html' with mode='auth' %}
 {% endblock %}
--- a/mfa/templates/FIDO2/recheck.html
+++ b/mfa/templates/FIDO2/recheck.html
@@ -1,4 +1,5 @@
-<script type="application/javascript" src="{{ STATIC_URL }}js/cbor.js"></script>
+{%  load static %}
+<script type="application/javascript" src="{% static 'mfa/js/cbor.js' %}"></script>
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
@@ -11,7 +12,7 @@
              <div class="row">
            <div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center">
                {% if mode == "auth" %}
-                   Welcome back <img src="{% url 'getUserImage' request.session.base_username  %}" title="{{ request.session.base_username }}" style="padding: 3px;height: 50px" class="img-circle"/> {{ request.session.base_username }}<br/>
+                   Welcome back {% comment %}<img src="{% url 'getUserImage' request.session.base_username  %}" title="{{ request.session.base_username }}" style="padding: 3px;height: 50px" class="img-circle"/>{% endcomment %} {{ request.session.base_username }}<br/>
                    <a href="{% url 'mfa_reset_cookie' %}">Not me</a>
                    <br/>

--- a/mfa/templates/MFA.html
+++ b/mfa/templates/MFA.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
+{% load static %}
 {% block head %}
-    <script src="{{ STATIC_URL }}js/qrious.min.js" type="text/javascript"></script>
    <script type="text/javascript">
    function confirmDel(id) {
        $.ajax({
@@ -34,10 +34,12 @@
        })
    }
    </script>
-    <link href="{{ STATIC_URL }}css/bootstrap-toggle.min.css" rel="stylesheet">
-    <script src="{{ STATIC_URL }}js/bootstrap-toggle.min.js"></script>
+    <link href="{% static  'mfa/css/bootstrap-toggle.min.css' %}" rel="stylesheet">
+    <script src="{% static 'mfa/js/bootstrap-toggle.min.js'%}"></script>
 {% endblock %}
 {% block content %}
+    <br/>
+    <br/>
    <div class="container">
    <div class="row">
        <div align="center">
--- a/mfa/templates/TOTP/Add.html
+++ b/mfa/templates/TOTP/Add.html
@@ -1,4 +1,6 @@
+
 {% extends "base.html" %}
+{% load static %}
 {% block head %}
    <style>
    #two-factor-steps {
@@ -10,7 +12,7 @@
        margin: 0px;
    }
    </style>
-    <script src="{{ STATIC_URL }}js/qrious.min.js" type="text/javascript"></script>
+    <script src="{% static 'mfa/js/qrious.min.js' %}" type="text/javascript"></script>
    <script type="text/javascript">
    var key="";
    $(document).ready(function addToken() {
@@ -59,6 +61,8 @@
    </script>
 {% endblock %}
 {% block content %}
+    <br/>
+    <br/>
    <div class="container">
        <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
            <div class="row" align="center">
--- a/mfa/templates/TOTP/verify.html
+++ b/mfa/templates/TOTP/verify.html
@@ -1,4 +1,4 @@
-{% extends "login_base.html" %}
+{% extends "mfa_auth_base.html" %}
 {% block head %}
    <style>
    .row{
@@ -6,8 +6,9 @@
    }
    </style>
 {% endblock %}
-{% block form %}
-
+{% block content %}
+<br/>
+<br/>
 {% include "TOTP/recheck.html" with mode='auth' %}

  {% endblock %}
--- a/mfa/templates/TrustedDevices/Add.html
+++ b/mfa/templates/TrustedDevices/Add.html
@@ -1,4 +1,4 @@
-{% extends "login_base.html" %}
+{% extends "mfa_auth_base.html" %}
 {% block head %}
    <script type="application/javascript">
    function checkFlag() {
@@ -24,7 +24,10 @@
    $(document).ready(checkTrusted())
    </script>
 {% endblock %}
-{% block form %}
+{% block content %}
+    <br/>
+    <br/>
+
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
--- a/mfa/templates/TrustedDevices/Done.html
+++ b/mfa/templates/TrustedDevices/Done.html
@@ -1,7 +1,9 @@
-{% extends "login_base.html" %}
+{% extends "mfa_auth_base.html" %}
 {% block head %}
 {% endblock %}
-{% block form %}
+{% block content %}
+    <br/>
+<br/>
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
--- a/mfa/templates/TrustedDevices/start.html
+++ b/mfa/templates/TrustedDevices/start.html
@@ -70,6 +70,8 @@
    </script>
 {% endblock %}
 {% block content %}
+      <br/>
+    <br/>
    <div class="container">
        <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
            <div class="row" align="center">
--- a/mfa/templates/U2F/Add.html
+++ b/mfa/templates/U2F/Add.html
@@ -33,6 +33,8 @@
    </script>
 {% endblock %}
 {% block content %}
+      <br/>
+    <br/>
    <div class="container">
        <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
            <div class="row" align="center">
--- a/mfa/templates/U2F/Auth.html
+++ b/mfa/templates/U2F/Auth.html
@@ -1,4 +1,6 @@
-{% extends "login_base.html" %}
-{% block form %}
+{% extends "mfa_auth_base.html" %}
+{% block content %}
+    <br/>
+<br/>
 {% include 'U2F/recheck.html' with mode='auth' %}
 {% endblock %}
--- a/mfa/templates/modal.html
+++ b/mfa/templates/modal.html
@@ -0,0 +1,18 @@
+<div class="modal " tabindex="-1" role="dialog" id="popUpModal" style=" top: 40px;">
+  <div class="modal-dialog" style="height: 80%;width: 80%;">
+    <div class="modal-content" >
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="modal-title"></h4>
+      </div>
+      <div class="modal-body" id="modal-body" >
+
+
+          </div>
+      <div class="modal-footer" id="modal-footer">
+        <button type="button" class="btn btn-default" id='btnModalClose' data-dismiss="modal">Close</button>
+      </div>
+
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
--- a/mfa/templates/select_mfa_method.html
+++ b/mfa/templates/select_mfa_method.html
@@ -1,5 +1,7 @@
-{% extends "login_base.html" %}
-{% block form %}
+{% extends "mfa_auth_base.html" %}
+{% block content %}
+    <br/>
+<br/>
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">