diff --git a/app/dashboard/templates/dashboard/alias_contact_manager.html b/app/dashboard/templates/dashboard/alias_contact_manager.html index 286fa916..c9e988a1 100644 --- a/app/dashboard/templates/dashboard/alias_contact_manager.html +++ b/app/dashboard/templates/dashboard/alias_contact_manager.html @@ -84,7 +84,7 @@
- + Delete @@ -101,16 +101,28 @@ {% block script %} {% endblock %} \ No newline at end of file diff --git a/app/dashboard/templates/dashboard/api_key.html b/app/dashboard/templates/dashboard/api_key.html index 01a3f4ee..6d93fccc 100644 --- a/app/dashboard/templates/dashboard/api_key.html +++ b/app/dashboard/templates/dashboard/api_key.html @@ -104,16 +104,28 @@ {% block script %} diff --git a/app/dashboard/templates/dashboard/custom_domain.html b/app/dashboard/templates/dashboard/custom_domain.html index a296bbb6..702d2dee 100644 --- a/app/dashboard/templates/dashboard/custom_domain.html +++ b/app/dashboard/templates/dashboard/custom_domain.html @@ -20,7 +20,8 @@ {% endif %} @@ -69,20 +70,3 @@ {% endblock %} - -{% block script %} - -{% endblock %} \ No newline at end of file diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html index b4ed3e6f..02ba129e 100644 --- a/app/dashboard/templates/dashboard/directory.html +++ b/app/dashboard/templates/dashboard/directory.html @@ -107,16 +107,30 @@ {% endblock %} \ No newline at end of file diff --git a/app/dashboard/templates/dashboard/domain_detail/info.html b/app/dashboard/templates/dashboard/domain_detail/info.html index f208e87f..42b4e7fe 100644 --- a/app/dashboard/templates/dashboard/domain_detail/info.html +++ b/app/dashboard/templates/dashboard/domain_detail/info.html @@ -54,7 +54,7 @@

Delete Domain

Please note that this operation is irreversible. - All aliases associated with this domain will be also deleted + All aliases associated with this domain will be also deleted.
@@ -71,16 +71,27 @@ }); $(".delete-custom-domain").on("click", function (e) { - notie.confirm({ - text: "All aliases associated with {{ custom_domain.domain }} will be also deleted, " + + let that = $(this); + + bootbox.confirm({ + message: "All aliases associated with {{ custom_domain.domain }} will be also deleted, " + " please confirm.", - cancelCallback: () => { - // nothing to do + buttons: { + confirm: { + label: 'Yes, delete it', + className: 'btn-danger' + }, + cancel: { + label: 'Cancel', + className: 'btn-outline-primary' + } }, - submitCallback: () => { - $(this).closest("form").submit(); + callback: function (result) { + if (result) { + that.closest("form").submit(); + } } - }); + }) }); {% endblock %} \ No newline at end of file diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index 7432ea96..c7ab1007 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -483,7 +483,6 @@ {% block script %} {% endblock %} \ No newline at end of file diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index 8d9dc5a6..5d515ea8 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -306,17 +306,29 @@ {% block script %} {% endblock %} diff --git a/app/developer/templates/developer/index.html b/app/developer/templates/developer/index.html index d8d33bbf..b1ebcc76 100644 --- a/app/developer/templates/developer/index.html +++ b/app/developer/templates/developer/index.html @@ -65,28 +65,5 @@ {% endblock %} -{% block script %} - -{% endblock %} diff --git a/static/package-lock.json b/static/package-lock.json index d2a84667..59d2b610 100644 --- a/static/package-lock.json +++ b/static/package-lock.json @@ -61,6 +61,21 @@ "tslib": "^1.9.3" } }, + "bootbox": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/bootbox/-/bootbox-5.4.0.tgz", + "integrity": "sha512-GCPrDwZpJsUnqzrto3ZURVafypl13+DAyE3YZx5jR5EIoTDSyREPhr77hlCuPKvM6VvXR5Mh/34W3DYMC7JE9g==", + "requires": { + "bootstrap": "^4.4.0", + "jquery": "^3.4.1", + "popper.js": "^1.16.0" + } + }, + "bootstrap": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", + "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==" + }, "font-awesome": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", @@ -76,10 +91,10 @@ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" }, - "notie": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/notie/-/notie-4.3.1.tgz", - "integrity": "sha1-DRmd4VEwJC4hZ1UHq6Y8aSngrdo=" + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, "qrious": { "version": "4.0.2", diff --git a/static/package.json b/static/package.json index d41cfa1c..4dedbbae 100644 --- a/static/package.json +++ b/static/package.json @@ -17,9 +17,9 @@ "homepage": "https://github.com/simple-login/app#readme", "dependencies": { "@sentry/browser": "^5.12.0", + "bootbox": "^5.4.0", "font-awesome": "^4.7.0", "intro.js": "^2.9.3", - "notie": "^4.3.1", "qrious": "^4.0.2", "toastr": "^2.1.4", "vue": "^2.6.11" diff --git a/templates/base.html b/templates/base.html index d5397157..042e7c0f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -42,11 +42,6 @@ - - - - @@ -62,6 +57,8 @@ + +