Merge pull request #405 from yunti/load-url-tags

remove {% load url from future %} in templates - deprecated in django 1.9

{{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 @@
       <h2>{% trans "E-mail Addresses" %}</h2>
       {% if user.emailaddress_set.all %}
       <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
-          
+
       <form action="{% url 'account_email' %}" class="email_list" method="post">
       {% csrf_token %}
       <fieldset class="blockLabels">
@@ -44,14 +43,14 @@
       </fieldset>
       </form>
 
-      {% else %} 
+      {% else %}
       <p><strong>{% trans 'Warning:'%}</strong> {% 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." %}</p>
 
       {% endif %}
 
 
           <h2>{% trans "Add E-mail Address" %}</h2>
-          
+
           <form method="post" action="." class="add_email">
               {% csrf_token %}
               {{ form|crispy }}
@@ -78,4 +77,4 @@
 })();
 </script>
 {% endblock %}
-{% endraw %}
+{% endraw %}

{{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 %}
-                
+
         <p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p>
 
         <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">

{{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 %}

{{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 @@
 </div>
 
 {% endblock %}
-{% endraw %}
+{% endraw %}

{{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 %}
 

{{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 @@
   </div>
 </div>
 {% endblock %}
-{% endraw %}
+{% endraw %}

{{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 %}
 

{{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 @@
   </div>
 </div>
 {% endblock %}
-{% endraw %}
+{% endraw %}

{{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 @@
   </div>
 </div>
 {% endblock %}
-{% endraw %}
+{% endraw %}