Changeset 695d358 for remit/remit_templates/registration

Timestamp:

Jun 15, 2014, 10:06:46 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

6479b5c

Parents:

2e4e1fb

git-author:

Alex Dehnert <adehnert@…> (06/15/14 21:36:47)

git-committer:

Alex Dehnert <adehnert@…> (06/15/14 22:06:46)

Message:

Django 1.6: use new {% url %} syntax

Starting in Django 1.5, the argument to {% url %} is treated as a variable,
rather than a literal. To get a literal, we need to enclose the argument in
quotes. For Django 1.4 support, we also want to do {% load url from future %}
-- probably in more places than just base.html, but we'll see.

Location:

remit/remit_templates/registration

Files:

• logged_out.html (modified) (2 diffs)
• login.html (modified) (2 diffs)

remit/remit_templates/registration/logged_out.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Logged out of Remit{% endblock %}
@@ -6 +7 @@
 <h2>Logged out of Remit</h2>
 
-<p>You have been logged out of Remit. You can return to the <a href='{% url homepage %}'>homepage</a> or <a href='{% url login %}'>login again</a>.</p>
+<p>You have been logged out of Remit. You can return to the <a href='{% url "homepage" %}'>homepage</a> or <a href='{% url "login" %}'>login again</a>.</p>
 {% endblock %}

remit/remit_templates/registration/login.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block title %}Log in to Remit{% endblock %}
@@ -11 +12 @@
 {% endif %}
 
-<form method="post" action="{% url django.contrib.auth.views.login %}">
+<form method="post" action="{% url "django.contrib.auth.views.login" %}">
 {% csrf_token %}
 <table>