diff --git a/angelman/angelman/templates/admin/login.html b/angelman/angelman/templates/admin/login.html deleted file mode 100644 index a7445cb5..00000000 --- a/angelman/angelman/templates/admin/login.html +++ /dev/null @@ -1,118 +0,0 @@ -{% extends "rdrf_cdes/base.html" %} -{% load i18n admin_static %} - -{% block extrastyle %} - {{ block.super }} - -{% endblock %} - -{% block bodyclass %}login{% endblock %} - -{% block nav-global %}{% endblock %} - -{% block content_title %}{% endblock %} - -{% block breadcrumbs %}{% endblock %} - -{% block content %} - -{% if form.errors and not form.non_field_errors and not form.this_is_the_login_form.errors %} -

-

- {% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} -
-

-{% endif %} - -{% if form.non_field_errors or form.this_is_the_login_form.errors %} - {% for error in form.non_field_errors|add:form.this_is_the_login_form.errors %} -

- {{ error }} -

- {% endfor %} -{% endif %} - -{% if form.non_field_errors %} -

-

- {% for error in form.non_field_errors %} - {{ error }} - {% endfor %} -
-

-{% endif %} - -
- -
{% csrf_token %} -
- -
- -

-
-

- Please enter your e-mail address and the password you chose when you registered. -

-

- If you haven't got a user account yet, you can create one by going to https://angelmanregistry.info and clicking 'Register Now'. -

-

- If you have forgotten your password, please click on 'Trouble signing in?' -

-
- -
- -
- Welcome -
- -
-
- -
- {{ form.username }} - {% if not form.this_is_the_login_form.errors %}{{ form.username.errors.as_text }}{% endif %} - -
-
-
- -
- {{ form.password }} - {% if not form.this_is_the_login_form.errors %}{{ form.password.errors.as_text }}{% endif %} - - -
-
-
- {% url 'admin_password_reset' as password_reset_url %} - {% if password_reset_url %} -
- {% trans 'Forgotten your password or username?' %} -
- {% endif %} -
-
- -
- {% trans "Trouble signing in?" %} - -
-
- -
- -
-
-
- - -
-{% endblock %} diff --git a/angelman/angelman/templates/two_factor/core/login.html b/angelman/angelman/templates/two_factor/core/login.html new file mode 100644 index 00000000..5e2abec3 --- /dev/null +++ b/angelman/angelman/templates/two_factor/core/login.html @@ -0,0 +1,89 @@ +{% extends "two_factor/_base_focus.html" %} + +{% load i18n static two_factor %} + +{% block content %} +
+ {% csrf_token %} + +
+
Login
+
+
+ {% if wizard.steps.current == 'auth' %} +
+
+

Please enter your e-mail address and the password you chose when you registered.

+

If you haven't got a user account yet, you can create one by going to https://angelmanregistry.info and clicking 'Register Now'.

+

If you have forgotten your password, please click on 'Trouble signing in?'

+
+
+ {% elif wizard.steps.current == 'token' %} +
+ {% blocktrans %}Please enter the token generated by your token generator.{% endblocktrans %} +
+ {% endif %} +
+ + {% if form.non_field_errors %} +
+
+ +
+
+ {% endif %} + + {% if wizard.steps.current == 'auth' %} + + +
+ + +
+
+ + +
+ {% elif wizard.steps.current == 'token' %} + +
+ + +
+ {% else %} + {% include "two_factor/_wizard_forms.html" %} + {% endif %} + + {# hidden submit button to enable [enter] key #} +
+ +
+
+ {% include "two_factor/_wizard_actions.html" %} +
+
+
+ +
+ {% trans "Trouble signing in?" %} +
+
+ + + +{% endblock %} diff --git a/rdrf b/rdrf index 5a5f1c3f..1a74e847 160000 --- a/rdrf +++ b/rdrf @@ -1 +1 @@ -Subproject commit 5a5f1c3fbffbd4dbc11c8641c18be7005d41430b +Subproject commit 1a74e847bcdb1565868fb47cd3d47c0028da45b8