From 07c1a4a2b4211c1975f9d641401636a8cbc35f9c Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Wed, 27 Feb 2013 19:02:32 +0100 Subject: Switch to the new-style "url" tag Required by Django >= 1.5 https://docs.djangoproject.com/en/1.5/releases/1.5/ --- hyperkitty/api.py | 2 +- hyperkitty/templates/404.html | 2 +- hyperkitty/templates/500.html | 2 +- hyperkitty/templates/api.html | 12 ++++++------ hyperkitty/templates/base.html | 14 +++++++------- hyperkitty/templates/index.html | 2 +- hyperkitty/templates/login.html | 6 +++--- hyperkitty/templates/message.html | 2 +- hyperkitty/templates/message_new.html | 4 ++-- hyperkitty/templates/messages/like_form.html | 2 +- hyperkitty/templates/messages/message.html | 6 +++--- hyperkitty/templates/messages/reply_form.html | 2 +- hyperkitty/templates/thread.html | 6 +++--- hyperkitty/templates/thread_list.html | 2 +- hyperkitty/templates/threads/month_list.html | 2 +- hyperkitty/templates/threads/right_col.html | 4 ++-- hyperkitty/templates/threads/summary_thread.html | 6 +++--- hyperkitty/templates/threads/summary_thread_large.html | 10 +++++----- hyperkitty/templates/threads/tags.html | 2 +- hyperkitty/templates/user_profile.html | 12 ++++++------ hyperkitty/urls.py | 2 +- 21 files changed, 51 insertions(+), 51 deletions(-) diff --git a/hyperkitty/api.py b/hyperkitty/api.py index a75dc4a..f7c7431 100644 --- a/hyperkitty/api.py +++ b/hyperkitty/api.py @@ -21,7 +21,7 @@ import json import re from rest_framework.views import View -from django.conf.urls.defaults import url +from django.conf.urls import url from django.conf import settings from django.http import HttpResponseNotModified, HttpResponse diff --git a/hyperkitty/templates/404.html b/hyperkitty/templates/404.html index 8b819d4..dbfef16 100644 --- a/hyperkitty/templates/404.html +++ b/hyperkitty/templates/404.html @@ -30,7 +30,7 @@ Oh! Snap

I can't find this page. - Back home + Back home diff --git a/hyperkitty/templates/500.html b/hyperkitty/templates/500.html index a2b3d13..5a45d80 100644 --- a/hyperkitty/templates/500.html +++ b/hyperkitty/templates/500.html @@ -35,7 +35,7 @@ Error ! - {{ app_name|title }} Oh! Snap

There's been an error somewhere, sorry. - Back home + Back home diff --git a/hyperkitty/templates/api.html b/hyperkitty/templates/api.html index 763574b..4c4af27 100644 --- a/hyperkitty/templates/api.html +++ b/hyperkitty/templates/api.html @@ -32,8 +32,8 @@ Using the address /api/email/<list name>/<Message-ID> you will be able to retrieve the information known about a specific email on the specified mailing-list.

-

For example: - {% url api_email mlist_fqdn='devel@fp.o', hashid='13129854572893334' %} +

For example: + {% url 'api_email' mlist_fqdn='devel@fp.o' hashid='13129854572893334' %}

@@ -43,8 +43,8 @@ retrieve the information known about a specific email on the specified mailing-l Using the address /api/thread/<list name>/<Message-ID> you will be able to retrieve the all the email for a specific thread on the specified mailing-list.

-

For example: - {% url api_thread mlist_fqdn='devel@fp.o', threadid='13129854572893334' %} +

For example: + {% url 'api_thread' mlist_fqdn='devel@fp.o' threadid='13129854572893334' %}

@@ -61,8 +61,8 @@ search for all emails of the specified mailing-list containing the provided keyw
  • Content
  • SubjectContent
    • -

    For example: - {% url api_search mlist_fqdn='devel@fp.o', field='From', keyword='pingoured' %} +

    For example: + {% url 'api_search' mlist_fqdn='devel@fp.o' field='From' keyword='pingoured' %}

    diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index c564468..98450f5 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -25,28 +25,28 @@ - {{ app_name|title }} + {{ app_name|title }}