inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 04:55:44 +00:00
Code Activity

Auth forms fix (#3214)

Browse Source 
* Improvement and consolidation of various auth forms

* Update "disable 2FA" page to use form fields

Note: Requires merging of https://github.com/valohai/django-allauth-2fa/pull/135

* Update django-allauth-2fa requirements
This commit is contained in:
Oliver
2022-06-17 11:33:45 +10:00
committed by GitHub
parent 50a4bda184
commit 0d01ea2f2e
7 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/templates/allauth_2fa/authenticate.html
View File

@ -9,7 +9,7 @@
{{ form|crispy }}
<button type="submit" class="btn btn-primary">
{% trans 'Authenticate' %}
<span class='fas fa-check-circle'></span> {% trans 'Authenticate' %}
</button>
</form>
{% endblock %}

20
InvenTree/templates/allauth_2fa/backup_tokens.html
View File

@ -17,17 +17,23 @@
{% trans 'Backup tokens have been generated, but are not revealed here for security reasons. Press the button below to generate new ones.' %}
{% endif %}
{% else %}
{% trans 'No tokens. Press the button below to generate some.' %}
{% trans 'No backup tokens are available. Press the button below to generate some.' %}
{% endif %}
<br>
<hr>
<form method="post">
{% csrf_token %}
<button type="submit" class="btn btn-primary w-100">
{% trans 'Generate backup tokens' %}
</button>
<div class='btn-group float-right' role='group'>
<button type="submit" class="btn btn-primary w-100">
<span class='fas fa-key'></span> {% trans 'Generate Tokens' %}
</button>
</div>
</form>
<br>
<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm">{% trans "Back to settings" %}</a>
<div>
<a type='button' href="{% url 'settings' %}" class="btn btn-secondary">
<span class='fas fa-undo-alt'></span> {% trans "Return to Site" %}
</a>
</div>
{% endblock %}

17
InvenTree/templates/allauth_2fa/remove.html
View File

@ -1,5 +1,5 @@
{% extends "account/base.html" %}
{% load i18n %}
{% load i18n crispy_forms_tags %}
{% block content %}
<h3>
@ -10,9 +10,18 @@
<form method="post">
{% csrf_token %}
<button type="submit" class="btn btn-danger w-100">
{% trans 'Disable Two-Factor' %}
</button>
{{ form|crispy }}
<hr>
<div class='btn-group float-right' role='group'>
<button type="submit" class="btn btn-danger w-100">
<span class='fas fa-times-circle'></span> {% trans 'Disable 2FA' %}
</button>
</div>
</form>
<div>
<a type='button' href="{% url 'settings' %}" class="btn btn-secondary">
<span class='fas fa-undo-alt'></span> {% trans "Return to Site" %}
</a>
</div>
{% endblock %}

13
InvenTree/templates/allauth_2fa/setup.html
View File

@ -31,12 +31,17 @@
{% csrf_token %}
{{ form|crispy }}
<button type="submit" class="btn btn-primary btn-block w-100">
{% trans 'Verify' %}
</button>
<hr>
<div class='btn-group float-right' role='group'>
<button type="submit" class="btn btn-primary btn-block w-100">
<span class='fas fa-check-circle'></span> {% trans 'Verify' %}
</button>
</div>
</form>
<div>
<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm mt-3">{% trans "Back to settings" %}</a>
<a type='button' href="{% url 'settings' %}" class="btn btn-secondary">
<span class='fas fa-undo-alt'></span> {% trans "Return to Site" %}
</a>
</div>
{% endblock %}