Merge pull request #11 from jwiltshire/master

Ensure url template tag compatibility for Django 1.4 - 1.6
This commit is contained in:
Scot Hacker 2014-05-05 23:21:58 -07:00
commit f150256c36
7 changed files with 11 additions and 4 deletions

View file

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load url from future %}
{% block title %}{{ list_title }} to-do items{% endblock %} {% block title %}{{ list_title }} to-do items{% endblock %}

View file

@ -1,3 +1,4 @@
{% load url from future %}
Dear {{ task.assigned_to.first_name }} - Dear {{ task.assigned_to.first_name }} -
A new task on the list {{ task.list.name }} has been assigned to you by {{ task.created_by.first_name }} {{ task.created_by.last_name }}: A new task on the list {{ task.list.name }} has been assigned to you by {{ task.created_by.first_name }} {{ task.created_by.last_name }}:
@ -14,7 +15,7 @@ Note: {{ task.note }}
Task details/comments: Task details/comments:
http://{{ site }}{% url todo-task_detail task.id %} http://{{ site }}{% url 'todo-task_detail' task.id %}
List {{ task.list.name }}: List {{ task.list.name }}:
http://{{ site }}{% url todo-incomplete_tasks task.list.id task.list.slug %} http://{{ site }}{% url 'todo-incomplete_tasks' task.list.id task.list.slug %}

View file

@ -1,3 +1,4 @@
{% load url from future %}
A new task comment has been added. A new task comment has been added.
Task: {{ task.title }} Task: {{ task.title }}
@ -9,8 +10,8 @@ Comment:
{% endautoescape %} {% endautoescape %}
Task details/comments: Task details/comments:
https://{{ site }}{% url todo-task_detail task.id %} https://{{ site }}{% url 'todo-task_detail' task.id %}
List {{ task.list.name }}: List {{ task.list.name }}:
https://{{ site }}{% url todo-incomplete_tasks task.list.id task.list.slug %} https://{{ site }}{% url 'todo-incomplete_tasks' task.list.id task.list.slug %}

View file

@ -1,4 +1,5 @@
{% extends "todo/base.html" %} {% extends "todo/base.html" %}
{% load url from future %}
{% block title %}{{ list_title }} Todo Lists{% endblock %} {% block title %}{{ list_title }} Todo Lists{% endblock %}

View file

@ -1,4 +1,5 @@
{% extends "todo/base.html" %} {% extends "todo/base.html" %}
{% load url from future %}
{% block title %}Search results{% endblock %} {% block title %}Search results{% endblock %}
{% block body_id %}post_search{% endblock %} {% block body_id %}post_search{% endblock %}

View file

@ -1,4 +1,5 @@
{% extends "todo/base.html" %} {% extends "todo/base.html" %}
{% load url from future %}
{% block title %}Todo List: {{ list.name }}{% endblock %} {% block title %}Todo List: {{ list.name }}{% endblock %}

View file

@ -1,4 +1,5 @@
{% extends "todo/base.html" %} {% extends "todo/base.html" %}
{% load url from future %}
{% block title %}Task: {{ task.title }}{% endblock %} {% block title %}Task: {{ task.title }}{% endblock %}