From 1ae2d85dd6f1b03fc9a1eec5539fad07d06e2c86 Mon Sep 17 00:00:00 2001 From: Barclay StudyPC Date: Thu, 12 Nov 2015 15:07:22 +0000 Subject: [PATCH] Load url tags removed - deprecated in django 1.9 --- .../templates/account/email.html | 9 ++++----- .../templates/account/email_confirm.html | 3 +-- .../templates/account/login.html | 1 - .../templates/account/logout.html | 3 +-- .../templates/account/password_reset_from_key.html | 1 - .../templates/account/password_reset_from_key_done.html | 3 +-- .../templates/account/signup.html | 1 - .../templates/account/signup_closed.html | 3 +-- .../templates/account/verified_email_required.html | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html index 2dab7e93..e757f21f 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html @@ -1,7 +1,6 @@ {% raw %}{% extends "account/base.html" %} {% load i18n %} -{% load url from future %} {% load crispy_forms_tags %} {% block head_title %}{% trans "Account" %}{% endblock %} @@ -13,7 +12,7 @@

{% trans "E-mail Addresses" %}

{% if user.emailaddress_set.all %}

{% trans 'The following e-mail addresses are associated with your account:' %}

- +
{% csrf_token %}
@@ -44,14 +43,14 @@
- {% else %} + {% else %}

{% trans 'Warning:'%} {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}

{% endif %}

{% trans "Add E-mail Address" %}

- +
{% csrf_token %} {{ form|crispy }} @@ -78,4 +77,4 @@ })(); {% endblock %} -{% endraw %} \ No newline at end of file +{% endraw %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html index d0343034..d7886239 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html @@ -1,6 +1,5 @@ {% raw %}{% extends "account/base.html" %} -{% load url from future %} {% load i18n %} {% load account %} @@ -16,7 +15,7 @@ {% if confirmation %} {% user_display confirmation.email_address.user as user_display %} - +

{% blocktrans with confirmation.email_address.email as email %}Please confirm that {{ email }} is an e-mail address for user {{ user_display }}.{% endblocktrans %}

diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html index fcd746ef..acbc50c2 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html @@ -3,7 +3,6 @@ {% load i18n %} {% load account %} {% load socialaccount %} -{% load url from future %} {% load crispy_forms_tags %} {% block head_title %}{% trans "Sign In" %}{% endblock %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html index cf21b87e..039dc7be 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html @@ -1,6 +1,5 @@ {% raw %}{% extends "account/base.html" %} -{% load url from future %} {% load i18n %} {% block head_title %}{% trans "Sign Out" %}{% endblock %} @@ -26,4 +25,4 @@ {% endblock %} -{% endraw %} \ No newline at end of file +{% endraw %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html index 603c25de..8e1b39e2 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html @@ -1,6 +1,5 @@ {% raw %}{% extends "account/base.html" %} -{% load url from future %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html index 9fb922e8..015028e4 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html @@ -1,6 +1,5 @@ {% raw %}{% extends "account/base.html" %} -{% load url from future %} {% load i18n %} {% block head_title %}{% trans "Change Password" %}{% endblock %} @@ -14,4 +13,4 @@ {% endblock %} -{% endraw %} \ No newline at end of file +{% endraw %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html index c8f1c75d..63e57a5f 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html @@ -1,6 +1,5 @@ {% raw %}{% extends "account/base.html" %} -{% load url from future %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html index 5de5361d..f5976dad 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html @@ -1,6 +1,5 @@ {% raw %}{% extends "account/base.html" %} -{% load url from future %} {% load i18n %} {% block head_title %}{% trans "Sign Up Closed" %}{% endblock %} @@ -16,4 +15,4 @@ {% endblock %} -{% endraw %} \ No newline at end of file +{% endraw %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html index f6355fb6..7d071c6a 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html @@ -1,6 +1,5 @@ {% raw %}{% extends "account/base.html" %} -{% load url from future %} {% load i18n %} {% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} @@ -26,4 +25,4 @@ {% endblock %} -{% endraw %} \ No newline at end of file +{% endraw %}