Merged more fixes and fix the order on model-title and close btn

Merge branch 'bootstrap5' of https://github.com/ezrajrice/django-mfa2 into v2.5b2
Remove emtpy modal calls.
2022-06-19 16:34:14 +03:00 · 2022-06-19 16:25:21 +03:00 · 2022-06-07 08:39:08 -06:00 · 2022-06-02 12:53:41 -06:00 · 2022-06-02 13:21:28 -04:00 · 2022-06-02 13:16:36 -04:00
18 changed files with 80 additions and 74 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 # Change Log
 ## 2.5.0

-   * Bumped fido2 version to 1.0
   * Fixed: issue in the 'Authorize' button don't show on Firefox and Chrome on iOS.
     Note: It seems Firefox doesn't support WebAuthn on iOS
   * Fixed: Support for bootstrap5
--- a/example/example/templates/base.html
+++ b/example/example/templates/base.html
@@ -36,7 +36,7 @@

    <!-- Navbar Search -->
    <form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0">
-      <div class="input-group">
+      <div class="input-group mb-3">
        <input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2">
        <div class="input-group-append">
          <button class="btn btn-primary" type="button">
--- a/example/example/templates/blank.html
+++ b/example/example/templates/blank.html
@@ -34,7 +34,7 @@

    <!-- Navbar Search -->
    <form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0">
-      <div class="input-group">
+      <div class="input-group mb-3">
        <input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2">
        <div class="input-group-append">
          <button class="btn btn-primary" type="button">
--- a/mfa/templates/Email/Add.html
+++ b/mfa/templates/Email/Add.html
@@ -4,12 +4,12 @@
 {% block content %}
 <br/>
 <br/>
-<div class="container">
-  <div class="panel panel-default">
-    <div class="panel-heading">
+<div class="container d-flex justify-content-center">
+  <div class="panel panel-default card">
+    <div class="panel-heading card-header">
      <strong> Activate Token by email</strong>
    </div>
-    <div class="panel-body">
+    <div class="panel-body card-body">
      <FORM METHOD="POST" ACTION="{% url 'start_email' %}" Id="formLogin"  onSubmit="" name="FrontPage_Form1">
        {% csrf_token %}
        {%  if invalid %}
@@ -31,14 +31,14 @@
          <div class="row">
            <div class="col-sm-12 col-md-12">
              <div class="form-group">
-                <div class="input-group">
-                  <span class="input-group-addon">
-                  <i class="glyphicon glyphicon-lock"></i>
+                <div class="input-group mb-3">
+                  <span class="input-group-addon input-group-text">
+                  <i class="glyphicon glyphicon-lock bi bi-lock"></i>
                  </span>
                  <input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>
                </div>
              </div>
-              <div class="form-group">
+              <div class="form-group d-grid gap-2">
                <input type="submit" class="btn btn-lg btn-success btn-block" value="Verify">
              </div>
            </div>
@@ -48,4 +48,4 @@
    </div>
  </div>
 </div>
-{% endblock %}
+{% endblock %}
--- a/mfa/templates/Email/recheck.html
+++ b/mfa/templates/Email/recheck.html
@@ -13,14 +13,15 @@

    }
 </script>
+<div class='container'>
 <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">
-<div class="panel panel-default">
-      <div class="panel-heading">
+<div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> Email One Time Password </strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">

      <FORM METHOD="POST" ACTION="{% url 'email_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">

@@ -46,16 +47,16 @@
      <div class="row">
 	  <div class="col-sm-12 col-md-12">
 	    <div class="form-group">
-	      <div class="input-group">
-		<span class="input-group-addon">
-		<i class="glyphicon glyphicon-lock"></i>
+	      <div class="input-group mb-3">
+		<span class="input-group-addon input-group-text">
+		<i class="glyphicon glyphicon-lock bi bi-lock"></i>
 		</span>
 		<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>

 	      </div>
 	    </div>

-          <div class="form-group">
+          <div class="form-group d-grid gap-2">

 	      <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck'  %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
 	      </div>
@@ -64,7 +65,7 @@
      </FORM>
      </div>
        <div class="row">
-        <div class="col-md-6" style="padding-left: 25px">
+        <div class="col-md-12 mb-3" style="padding-left: 25px">
            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
            {% endif %}
@@ -74,3 +75,4 @@
              </div>
 	      </div>
 	      </div>
+</div>
--- a/mfa/templates/FIDO2/Add.html
+++ b/mfa/templates/FIDO2/Add.html
@@ -59,11 +59,11 @@
      <br/>
    <br/>
     <div class="container">
-     <div class="panel panel-default">
-      <div class="panel-heading">
+     <div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> FIDO2 Security Key</strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">


    <div class="row alert alert-pr" id="res" align="center">
@@ -73,4 +73,4 @@
        </div>
    </div>
    {% include "modal.html" %}
-{% endblock %}
+{% endblock %}
--- a/mfa/templates/FIDO2/recheck.html
+++ b/mfa/templates/FIDO2/recheck.html
@@ -4,11 +4,11 @@
 <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">
-<div class="panel panel-default">
-      <div class="panel-heading">
+<div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> Security Key</strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">

              <div class="row">
            <div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center">
@@ -35,7 +35,7 @@
          </div>

          <div class="row">
-          <div style="padding-left: 15px">
+          <div class="col-md-12 mb-3" style="padding-left: 15px">

            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
@@ -114,4 +114,4 @@



-    </script>
+    </script>
--- a/mfa/templates/MFA.html
+++ b/mfa/templates/MFA.html
@@ -19,7 +19,7 @@
        $("#modal-body").html("Are you sure you want to delete '"+name+"'? you may lose access to your system if this your only 2FA.");
        $("#actionBtn").remove()
        $("#modal-footer").prepend("<button id='actionBtn' class='btn btn-danger' onclick='confirmDel("+id+")'>Confirm Deletion</button>")
-        $("#popUpModal").modal()
+        $("#popUpModal").modal('show')
    }

    function toggleKey(id) {
@@ -98,7 +98,7 @@
               <td>{% if key.key_type in HIDE_DISABLE %}
                   ----
                   {% else %}
-                    <a href="javascript:void(0)" onclick="deleteKey({{ key.id }},'{{ key.key_type }}')"> <span class="fa fa-trash"></span></a></td>
+                    <a href="javascript:void(0)" onclick="deleteKey({{ key.id }},'{{ key.key_type }}')"> <span class="fa fa-trash fa-solid fa-trash-can bi bi-trash-fill"></span></a></td>
                    {% endif %}
           </tr>
       {% empty %}
--- a/mfa/templates/TOTP/Add.html
+++ b/mfa/templates/TOTP/Add.html
@@ -63,7 +63,7 @@
 {% block content %}
 <br/>
 <br/>
-<div class="container">
+<div class="container d-flex justify-content-center">
    <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
        <div class="row" align="center">
            <h4>Adding Authenticator</h4>
@@ -98,7 +98,7 @@
                    <button class="btn btn-success" onclick="verify()">Enable</button>
                </div>
                <div class="col-md-6" align="right" style="padding-right: 30px">
-                    <a href="{% url 'mfa_home' %}"><button class="btn btn-default">Cancel</button></a>
+                    <a href="{% url 'mfa_home' %}" class="btn btn-default btn-secondary" role="button">Cancel</a>
                </div>
            </div>
        </div>
@@ -106,4 +106,4 @@
    </div>
 </div>
 {% include "modal.html" %}
-{% endblock %}
+{% endblock %}
--- a/mfa/templates/TOTP/recheck.html
+++ b/mfa/templates/TOTP/recheck.html
@@ -13,14 +13,15 @@

    }
 </script>
+<div class='container'>
 <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">
-<div class="panel panel-default">
-      <div class="panel-heading">
+<div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> One Time Password</strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">

      <FORM METHOD="POST" ACTION="{% url 'totp_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">

@@ -46,16 +47,16 @@
      <div class="row">
 	  <div class="col-sm-12 col-md-12">
 	    <div class="form-group">
-	      <div class="input-group">
-		<span class="input-group-addon">
-		<i class="glyphicon glyphicon-lock"></i>
+	      <div class="input-group mb-3">
+		<span class="input-group-addon input-group-text">
+		<i class="glyphicon glyphicon-lock bi bi-lock"></i>
 		</span>
 		<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>

 	      </div>
 	    </div>

-          <div class="form-group">
+          <div class="form-group d-grid gap-2">

 	      <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck'  %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
 	      </div>
@@ -64,7 +65,7 @@
      </FORM>
      </div>
        <div class="row">
-        <div class="col-md-6" style="padding-left: 25px">
+        <div class="col-md-12 mb-3" style="padding-left: 25px">
            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
            {% endif %}
@@ -74,3 +75,4 @@
              </div>
 	      </div>
 	      </div>
+</div>
--- a/mfa/templates/TrustedDevices/Add.html
+++ b/mfa/templates/TrustedDevices/Add.html
@@ -31,11 +31,11 @@
 <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">
-<div class="panel panel-default">
-      <div class="panel-heading">
+<div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> Add Trusted Device</strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">
        {%  if success %}
            <div class="alert alert-warning">
                Please check your PC window, to continue the process.
@@ -67,31 +67,31 @@
      <div class="row">
 	  <div class="col-sm-12 col-md-12">
 	    <div class="form-group">
-	      <div class="input-group">
-		<span class="input-group-addon">
-		<i class="glyphicon glyphicon-user"></i>
+	      <div class="input-group mb-3">
+		<span class="input-group-addon input-group-text">
+		<i class="glyphicon glyphicon-user bi bi-person"></i>
 		</span>
 		<input class="form-control" id="username" size="30" MaxLength="30" placeholder="Username" name="username" value="{{ username }}" type="text" autofocus autocomplete="on">

 	      </div>
 	    </div>
 	    <div class="form-group">
-		<div class="input-group">
-		<span class="input-group-addon">
+		<div class="input-group mb-3">
+		<span class="input-group-addon input-group-text">
 		<i class="fa fa-key"></i>
 		</span>
 		<input class="form-control" placeholder="e.g GAK-Y2M" id='key' style="text-transform: uppercase" name="key" type="text" size="9" MaxLength="9" value="{{ key }}">
 		</div>
 	    </div>
           <div class="form-group">
-		<span class="input-group">
+		<span class="input-group mb-3">
            <input id='agree' name="agree" type="checkbox"><span style="color: red"> I confirm that this device is mine and it is only used by me.</span>

 	    </div>
      {% comment %}
 	    <div class="form-group">
-	      <div class="input-group">
-	      <span class="input-group-addon">
+	      <div class="input-group mb-3">
+	      <span class="input-group-addon input-group-text">


 	      <select size="1" name="Institution_Code" style="font-size: 10pt; font-family: Calibri; height: 34px;width: 230px">
@@ -104,7 +104,7 @@
 	      </div>
 	      </div>
 	      {% endcomment %}
-	      <div class="form-group">
+	      <div class="form-group d-grid gap-2">
 	      <input type="submit" class="btn btn-lg btn-success btn-block" value="Trust Device">
 	      </div>
 	      </div>
@@ -113,7 +113,7 @@
 	      </form>
      {% endif %}
 	      </div>
-	      <div class="panel-footer ">
+	      <div class="panel-footer card-footer">


 	      </div>
--- a/mfa/templates/TrustedDevices/Done.html
+++ b/mfa/templates/TrustedDevices/Done.html
@@ -7,17 +7,17 @@
 <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">
-<div class="panel panel-default">
-      <div class="panel-heading">
+<div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> Add Trusted Device</strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">
            <div class="alert alert-success">
                Your device is now trusted, please try to <a href="{{ HOST }}{{ BASE_URL }}accounts/login/"> login</a>
            </div>

 	      </div>
-	      <div class="panel-footer ">
+	      <div class="panel-footer card-footer">


 	      </div>
--- a/mfa/templates/TrustedDevices/start.html
+++ b/mfa/templates/TrustedDevices/start.html
@@ -15,7 +15,7 @@
    function sendEmail() {
        $("#modal-title").html("Send Link")
        $("#modal-body").html("Sending Email, Please wait....");
-        $("#popUpModal").modal();
+        $("#popUpModal").modal('show');
        $.ajax({
            "url":"{% url 'td_sendemail' %}",
            success:function (data) {
@@ -60,7 +60,7 @@
                    $("#actionBtn").remove();
                    $("#modal-footer").prepend("<button id='actionBtn' class='btn btn-success' onclick='checkMFA()'>Trust Device</button>")
                    $("#modal-body").html(data)
-                    $("#popUpModal").modal()
+                    $("#popUpModal").modal('show');
                }
            }
        })
--- a/mfa/templates/U2F/recheck.html
+++ b/mfa/templates/U2F/recheck.html
@@ -2,11 +2,11 @@
 <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">
-<div class="panel panel-default">
-      <div class="panel-heading">
+<div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> Security Key</strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">

              <div class="row">
            <div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center">
@@ -24,7 +24,7 @@
          </div>

          <div class="row">
-          <div style="padding-left: 15px">
+          <div class="col-md-12 mb-3" style="padding-left: 15px">

            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
@@ -95,4 +95,4 @@
        })


-    </script>
+    </script>
--- a/mfa/templates/mfa_check.html
+++ b/mfa/templates/mfa_check.html
@@ -24,7 +24,7 @@
                {
                    $("#modal-title").html("Recheck Indentity")
                    $("#modal-body").html(data["html"])
-                    $("#popUpModal").modal()
+                    $("#popUpModal").modal('show')
                }


--- a/mfa/templates/modal.html
+++ b/mfa/templates/modal.html
@@ -2,15 +2,15 @@
  <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>
+          <button type="button" class="close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
      </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>
+        <button type="button" class="btn btn-default btn-secondary" id='btnModalClose' data-dismiss="modal" data-bs-dismiss="modal">Close</button>
      </div>

    </div><!-- /.modal-content -->
--- a/mfa/templates/select_mfa_method.html
+++ b/mfa/templates/select_mfa_method.html
@@ -2,14 +2,15 @@
 {% block content %}
    <br/>
 <br/>
+<div class='container'>
 <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">
-<div class="panel panel-default">
-      <div class="panel-heading">
+<div class="panel panel-default card">
+      <div class="panel-heading card-header">
 	      <strong> Select Second Verification Method</strong>
      </div>
-      <div class="panel-body">
+      <div class="panel-body card-body">
          <ul>
              {% for method in request.session.mfa_methods %}

@@ -25,5 +26,7 @@
      </div>
 </div>
 </div>
+
 </div>
-{% endblock %}
+</div>
+{% endblock %}
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import find_packages, setup

 setup(
    name='django-mfa2',
-    version='2.5.0b1',
+    version='2.5.0b2',
    description='Allows user to add 2FA to their accounts',
    long_description=open("README.md").read(),
    long_description_content_type="text/markdown",
Author	SHA1	Message	Date
Mohamed ElKalioby	dfb60ac685	Merged more fixes and fix the order on model-title and close btn	2022-06-19 16:34:14 +03:00
Mohamed ElKalioby	12b4ef5c8e	Merge branch 'bootstrap5' of https://github.com/ezrajrice/django-mfa2 into v2.5b2	2022-06-19 16:25:21 +03:00
Nathan Swain	7b2c5727e4	Remove emtpy modal calls. modal('show') should work for all versions of bootstrap.	2022-06-07 08:39:08 -06:00
Nathan Swain	7eecd759f7	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	2022-06-02 12:53:41 -06:00
Ezra Rice	7a9195a73e	BS v5 panels update	2022-06-02 13:21:28 -04:00
Ezra Rice	2278722914	Font Awesome icon update Updated class attribute to also support new version of FA v6 trash can	2022-06-02 13:16:36 -04:00
Ezra Rice	8ed847922e	BS v5 panels update	2022-06-02 12:54:16 -04:00
Ezra Rice	32fdbf1bc0	BS v5 panels update	2022-06-02 12:52:14 -04:00
Ezra Rice	7595b8d0c5	BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:51:05 -04:00
Ezra Rice	b763c22297	BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:43:53 -04:00
Ezra Rice	e4aaee6e1a	BS v5 buttons update Updated the display of buttons when used as an `<a>` tag. This change was made in BS4.	2022-06-02 12:42:28 -04:00
Ezra Rice	566b05f1e6	BS v5 panels update BootStrap v5 changed panels to cards	2022-06-02 12:32:09 -04:00
Ezra Rice	4a2839a4fb	BS v5 panels BootStrap v5 changed panels to cards	2022-06-02 12:30:27 -04:00
Ezra Rice	f655851f65	BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:28:34 -04:00
Ezra Rice	8bea746d83	Update Add.html BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:24:25 -04:00