From 87b5369dbceb64bd3979c3fe5c3542727f15547a Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 5 Sep 2014 16:26:23 +0200
Subject: [PATCH] goto Django 1.6.7

---
 telemeta/forms/format.py                      |  2 +-
 telemeta/templates/postman/base.html          | 10 ++--
 telemeta/templates/postman/base_folder.html   |  8 ++--
 telemeta/templates/postman/view.html          |  8 ++--
 telemeta/templates/telemeta/admin.html        |  2 +-
 .../telemeta/admin_enumerations.html          |  2 +-
 .../templates/telemeta/admin_general.html     |  2 +-
 telemeta/templates/telemeta/base.html         | 48 +++++++++----------
 telemeta/templates/telemeta/collection.m3u    |  2 +-
 .../templates/telemeta/collection_add.html    |  4 +-
 .../templates/telemeta/collection_detail.html | 24 +++++-----
 .../telemeta/collection_detail_dc.html        |  6 +--
 .../templates/telemeta/collection_edit.html   |  6 +--
 .../templates/telemeta/collection_list.html   | 10 ++--
 .../telemeta/collection_related_edit.html     |  4 +-
 .../templates/telemeta/collection_xspf.xml    |  6 +--
 telemeta/templates/telemeta/country_info.html |  4 +-
 .../templates/telemeta/enumeration_edit.html  |  8 ++--
 .../telemeta/enumeration_edit_value.html      | 10 ++--
 .../templates/telemeta/geo_continents.html    |  4 +-
 .../templates/telemeta/geo_countries.html     |  6 +--
 .../telemeta/geo_country_collections.html     |  4 +-
 .../templates/telemeta/geo_country_items.html |  4 +-
 telemeta/templates/telemeta/home.html         |  6 +--
 .../templates/telemeta/inc/children_list.html |  2 +-
 .../telemeta/inc/collection_list.html         |  2 +-
 .../telemeta/inc/collection_related.html      |  6 +--
 .../templates/telemeta/inc/dublincore.html    |  8 ++--
 .../telemeta/inc/mediaitem_list.html          |  4 +-
 .../telemeta/inc/mediaitem_related.html       |  6 +--
 .../telemeta/inc/module_revisions.html        | 14 +++---
 .../telemeta/inc/module_searches.html         |  2 +-
 .../telemeta/inc/module_user_revisions.html   |  4 +-
 .../templates/telemeta/inc/resource_list.html |  2 +-
 .../telemeta/inc/resource_related.html        |  6 +--
 .../templates/telemeta/inc/user_list.html     |  2 +-
 .../telemeta/instrument_alias_edit.html       |  6 +--
 .../telemeta/instrument_alias_edit_value.html | 10 ++--
 .../templates/telemeta/instrument_edit.html   |  6 +--
 .../telemeta/instrument_edit_value.html       | 10 ++--
 telemeta/templates/telemeta/lists.html        | 12 ++---
 telemeta/templates/telemeta/login.html        |  4 +-
 .../templates/telemeta/mediaitem_add.html     |  4 +-
 .../templates/telemeta/mediaitem_copy.html    |  4 +-
 .../templates/telemeta/mediaitem_detail.html  | 34 ++++++-------
 .../telemeta/mediaitem_detail_dc.html         |  4 +-
 .../templates/telemeta/mediaitem_edit.html    | 10 ++--
 .../telemeta/mediaitem_keywords_edit.html     |  4 +-
 .../templates/telemeta/mediaitem_list.html    | 10 ++--
 .../telemeta/mediaitem_performances_edit.html |  4 +-
 .../templates/telemeta/mediaitem_player.html  |  2 +-
 .../telemeta/mediaitem_player_contour.html    |  2 +-
 .../telemeta/mediaitem_related_edit.html      |  4 +-
 .../templates/telemeta/mediaitem_xspf.xml     |  4 +-
 .../templates/telemeta/profile_detail.html    |  4 +-
 telemeta/templates/telemeta/profile_edit.html |  4 +-
 .../registration/password_change_done.html    |  2 +-
 .../registration/password_change_form.html    |  2 +-
 .../registration/password_reset_email.html    |  2 +-
 .../templates/telemeta/resource_detail.html   | 14 +++---
 .../telemeta/resource_detail_dc.html          |  4 +-
 .../templates/telemeta/resource_edit.html     |  6 +--
 .../templates/telemeta/resource_list.html     |  2 +-
 .../telemeta/resource_related_edit.html       |  4 +-
 .../templates/telemeta/search_criteria.html   |  4 +-
 .../templates/telemeta/search_results.html    | 16 +++----
 telemeta/urls.py                              | 36 +++++++-------
 telemeta/views/core.py                        |  3 +-
 68 files changed, 242 insertions(+), 243 deletions(-)

diff --git a/telemeta/forms/format.py b/telemeta/forms/format.py
index fa3cc1c5..452df8e2 100644
--- a/telemeta/forms/format.py
+++ b/telemeta/forms/format.py
@@ -6,4 +6,4 @@ from telemeta.models import *
 class FormatForm(ModelForm):
     class Meta:
         model = Format
-        exclude = ('item')
+        exclude = ('item',)
diff --git a/telemeta/templates/postman/base.html b/telemeta/templates/postman/base.html
index c209be06..cf1246d8 100644
--- a/telemeta/templates/postman/base.html
+++ b/telemeta/templates/postman/base.html
@@ -9,10 +9,10 @@
 {% block title_buttons %}
 <div id="postman_menu" style="padding-left: 20px;">
 {% postman_unread as unread_count %}
-<a href="{% url postman_inbox %}" class="component_icon button icon_edit">{% trans "Inbox" %}{% if unread_count %} <strong>({{ unread_count }})</strong>{% endif %}</a></li>
-<a href="{% url postman_sent %}" class="component_icon button icon_edit">{% trans "Sent Messages" %}</a>
-<a href="{% url postman_write %}" class="component_icon button icon_edit">{% trans "Write" %}</a>
-<a href="{% url postman_archives %}" class="component_icon button icon_edit">{% trans "Archives" %}</a>
-<a href="{% url postman_trash %}" class="component_icon button icon_edit">{% trans "Trash" %}</a>
+<a href="{% url "postman_inbox" %}" class="component_icon button icon_edit">{% trans "Inbox" %}{% if unread_count %} <strong>({{ unread_count }})</strong>{% endif %}</a></li>
+<a href="{% url "postman_sent" %}" class="component_icon button icon_edit">{% trans "Sent Messages" %}</a>
+<a href="{% url "postman_write" %}" class="component_icon button icon_edit">{% trans "Write" %}</a>
+<a href="{% url "postman_archives" %}" class="component_icon button icon_edit">{% trans "Archives" %}</a>
+<a href="{% url "postman_trash" %}" class="component_icon button icon_edit">{% trans "Trash" %}</a>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/telemeta/templates/postman/base_folder.html b/telemeta/templates/postman/base_folder.html
index 7728819d..370f1171 100644
--- a/telemeta/templates/postman/base_folder.html
+++ b/telemeta/templates/postman/base_folder.html
@@ -34,7 +34,7 @@
 {% block pm_recipient_cell %}   <td>{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}</td>{% endblock %}
    <td>{% if message.is_new %}<strong>{% endif %}{% if message.is_replied %}<em>{% endif %}
 {% block pm_subject %}
-    <a href="{% if by_conversation and message.thread_id %}{% url postman_view_conversation message.thread_id %}{% else %}{{message.get_absolute_url }}{% endif %}?next={{ current_url|urlencode }}">
+    <a href="{% if by_conversation and message.thread_id %}{% url "postman_view_conversation" message.thread_id %}{% else %}{{message.get_absolute_url }}{% endif %}?next={{ current_url|urlencode }}">
     {% include "postman/inc_subject_ex.html" %}
     </a>
 {% endblock %}
@@ -46,9 +46,9 @@
 
 <br />
 {% block pm_form_buttons %}<span id="pm_buttons">
-{% block pm_delete_button %}<button type="submit" onclick="this.form.action='{% url postman_delete %}'">{% trans "Delete" %}</button>{% endblock %}
-{% block pm_archive_button %}<button type="submit" onclick="this.form.action='{% url postman_archive %}'">{% trans "Archive" %}</button>{% endblock %}
-{% block pm_undelete_button %}<button type="submit" onclick="this.form.action='{% url postman_undelete %}'">{% trans "Undelete" %}</button>{% endblock %}
+{% block pm_delete_button %}<button type="submit" onclick="this.form.action='{% url "postman_delete" %}'">{% trans "Delete" %}</button>{% endblock %}
+{% block pm_archive_button %}<button type="submit" onclick="this.form.action='{% url "postman_archive" %}'">{% trans "Archive" %}</button>{% endblock %}
+{% block pm_undelete_button %}<button type="submit" onclick="this.form.action='{% url "postman_undelete" %}'">{% trans "Undelete" %}</button>{% endblock %}
 </span>{% endblock %}
 
 </form>
diff --git a/telemeta/templates/postman/view.html b/telemeta/templates/postman/view.html
index 23c7264c..81b28bca 100644
--- a/telemeta/templates/postman/view.html
+++ b/telemeta/templates/postman/view.html
@@ -22,14 +22,14 @@
 <input type="hidden" {% if message.thread_id %}name="tpks" value="{{ message.thread_id }}"{% else %}name="pks" value="{{ message.pk }}"{% endif %} />
 <a href="{{ next_url }}">{% trans "Back" %}</a>
 <span id="pm_buttons">
-<button type="submit" onclick="this.form.action='{% url postman_delete %}?next={{ next_url|urlencode }}'">{% trans "Delete" %}</button>
-{% if not archived %}<button type="submit" onclick="this.form.action='{% url postman_archive %}?next={{ next_url|urlencode }}'">{% trans "Archive" %}</button>{% endif %}
+<button type="submit" onclick="this.form.action='{% url "postman_delete" %}?next={{ next_url|urlencode }}'">{% trans "Delete" %}</button>
+{% if not archived %}<button type="submit" onclick="this.form.action='{% url "postman_archive" %}?next={{ next_url|urlencode }}'">{% trans "Archive" %}</button>{% endif %}
 </span>
-{% if reply_to_pk %}<a href="{% url postman_reply reply_to_pk %}?next={{ next_url|urlencode }}">{% trans "Reply" %}</a>{% endif %}
+{% if reply_to_pk %}<a href="{% url "postman_reply" reply_to_pk %}?next={{ next_url|urlencode }}">{% trans "Reply" %}</a>{% endif %}
 </form>
 {% if reply_to_pk %}<hr />
 <h2>{% trans 'Reply' %}</h2>
-<form action="{% url postman_reply reply_to_pk %}?next={{ next_url|urlencode }}" method="post">{% csrf_token %}
+<form action="{% url "postman_reply" reply_to_pk %}?next={{ next_url|urlencode }}" method="post">{% csrf_token %}
 <div id="pm_reply">{{ form.body }}</div>
 <button type="submit">{% trans 'Reply' %}</button>
 </form>{% endif %}
diff --git a/telemeta/templates/telemeta/admin.html b/telemeta/templates/telemeta/admin.html
index 95facdc7..d9b1dd1b 100644
--- a/telemeta/templates/telemeta/admin.html
+++ b/telemeta/templates/telemeta/admin.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block title %}
-<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> <a href="{% url telemeta-admin-general %}">{% trans "Administration" %}</a></h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> <a href="{% url "telemeta-admin-general" %}">{% trans "Administration" %}</a></h1>
 {% endblock %}
 
  <li>{% trans "General" %}</a></li>
diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html
index c6352b7e..6cb3e58e 100644
--- a/telemeta/templates/telemeta/admin_enumerations.html
+++ b/telemeta/templates/telemeta/admin_enumerations.html
@@ -14,7 +14,7 @@
     <tr><th>{% trans "Title"%}</th></tr>
    </thead><tbody>
     {% for enum in enumerations %}
-         <tr><td><a href="{% url telemeta-enumeration-edit enum.id %}">
+         <tr><td><a href="{% url "telemeta-enumeration-edit" enum.id %}">
                 {% trans enum.name|capfirst %}</a></td></tr>
     {% endfor %}
     </tbody>
diff --git a/telemeta/templates/telemeta/admin_general.html b/telemeta/templates/telemeta/admin_general.html
index 00bcfcce..c83baffe 100644
--- a/telemeta/templates/telemeta/admin_general.html
+++ b/telemeta/templates/telemeta/admin_general.html
@@ -6,5 +6,5 @@
 {% endblock %}
 
 {% block tabcontents %}
- <iframe align="middle" frameborder="0" width="100%" height="600px"  src="{% url telemeta-home %}admin/django/" />
+ <iframe align="middle" frameborder="0" width="100%" height="600px"  src="{% url "telemeta-home" %}admin/django/" />
 {% endblock %}
diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index c0a5b06c..5221acc0 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -23,7 +23,7 @@
 {% block extra_stylesheets %}{% endblock %}
 
 {% block javascript %}
-<script src="{% url django.views.i18n.javascript_catalog %}" type="text/javascript"></script>
+<script src="{% url "django.views.i18n.javascript_catalog" %}" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}timeside/js/libs/jquery-1.6.min.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}telemeta/js/locale.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}telemeta/js/application.js" type="text/javascript"></script>
@@ -44,7 +44,7 @@
 <div id="header">
 <div id="logo">
 {% block logo %}
-<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_crem.png" alt="Telemeta" /></a>
+<a href="{% url "telemeta-home" %}"><img src="{{ STATIC_URL }}telemeta/images/logo_crem.png" alt="Telemeta" /></a>
 {% endblock %}
 </div>
 
@@ -58,19 +58,19 @@
 {{ user.username }} |
 {% endif %}
 {% if not perms.telemeta.can_not_view_users_and_profiles %}
-<a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a> |
+<a href="{% url "telemeta-profile-detail" user.username %}">{% trans "Profile" %}</a> |
 {% endif %}
-<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
-<a href="{% url telemeta-logout %}">{% trans "Sign out" %}
+<a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
+<a href="{% url "telemeta-logout" %}">{% trans "Sign out" %}
 <img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout" style="vertical-align:middle" /></a>
 {% else %}
-<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
-<a href="{% url telemeta-login %}">{% trans "Sign in" %}</a>
+<a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
+<a href="{% url "telemeta-login" %}">{% trans "Sign in" %}</a>
 {% endif %}
 </div>
 
 <div id="quick_search">
-<form action="{% url telemeta-search %}" id="_quickSearchForm" method="get">
+<form action="{% url "telemeta-search" %}" id="_quickSearchForm" method="get">
 <input type="text" id="quick_search_pattern" name="pattern" />
 <a href="#" class="component button"
                 onclick="document.getElementById('_quickSearchForm').submit(); return false;">{% trans "Search" %}</a>
@@ -86,37 +86,37 @@
  {% if user.is_authenticated %}
   <li><a href="#desk#" class="blue">{% trans "Desk" %}</a>
    <ul>
-    <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
-    <li><a href="{% url telemeta-desk-profile user.username %}">{% trans "Profile" %}</a></li>
-    <li><a href="{% url telemeta-desk-home %}">{% trans "Home" %}</a></li>
+    <li><a href="{% url "telemeta-desk-lists" %}">{% trans "Lists" %}</a></li>
+    <li><a href="{% url "telemeta-desk-profile" user.username %}">{% trans "Profile" %}</a></li>
+    <li><a href="{% url "telemeta-desk-home" %}">{% trans "Home" %}</a></li>
    </ul>
   </li>
  {% else %}
-  <li><a href="{% url telemeta-home %}" class="blue">{% trans "Home" %}</a></li>
+  <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
  {% endif %}
 
  <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
   <ul>
-    <li><a href="{% url telemeta-fonds %}">{% trans "Fonds" %}</a></li>
-    <li><a href="{% url telemeta-corpus %}">{% trans "Corpus" %}</a></li>
-    <li><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
-    <li><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
+    <li><a href="{% url "telemeta-fonds" %}">{% trans "Fonds" %}</a></li>
+    <li><a href="{% url "telemeta-corpus" %}">{% trans "Corpus" %}</a></li>
+    <li><a href="{% url "telemeta-collections" %}">{% trans "Collections" %}</a></li>
+    <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
   </ul>
  </li>
 
- <li><a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
+ <li><a href="{% url "telemeta-geo-continents" %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
 
- <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
+ <li><a href="{% url "telemeta-search-criteria" %}" class="orange">{% trans "Advanced search" %}</a></li>
  {% if user.is_authenticated and not perms.telemeta.can_not_view_users_and_profiles %}
- <li><a href="{% url telemeta-users %}" class="red">{% trans "Users" %}</a></li>
+ <li><a href="{% url "telemeta-users" %}" class="red">{% trans "Users" %}</a></li>
  {% endif %}
  {% if user.is_staff %}
  <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
  <ul>
- <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
- <li><a href="{% url telemeta-admin-enumerations %}">{% trans "Enumerations" %}</a></li>
- <li><a href="{% url telemeta-instrument-edit %}">{% trans "Instruments" %}</a></li>
- <li><a href="{% url telemeta-instrument-alias-edit %}">{% trans "Instrument aliases" %}</a></li>
+ <li><a href="{% url "telemeta-admin-general" %}">{% trans "General" %}</a></li>
+ <li><a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a></li>
+ <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a></li>
+ <li><a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument aliases" %}</a></li>
  </ul>
  </li>
 {% endif %}
@@ -164,7 +164,7 @@
    <td>
     <p class="right">
     Copyright &copy; {% current_year %} {% organization %}<br />
-    <a href="{% url telemeta-flatpage "legal_notices" %}">{% trans "Legal notices" %}</a>
+    <a href="{% url "telemeta-flatpage" "legal_notices" %}">{% trans "Legal notices" %}</a>
     </p>
    </td>
   </tr>
diff --git a/telemeta/templates/telemeta/collection.m3u b/telemeta/templates/telemeta/collection.m3u
index 2f00ed17..00ad96da 100644
--- a/telemeta/templates/telemeta/collection.m3u
+++ b/telemeta/templates/telemeta/collection.m3u
@@ -1,3 +1,3 @@
 #EXTM3U{% load telemeta_utils %}{% for item in collection.items.all %}
 #EXTINF:{{ item.get_duration }},{{ item }}
-http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %}{% endfor %}
+http://{{ host }}{% url "telemeta-item-export" item.public_id,"mp3" %}{% endfor %}
diff --git a/telemeta/templates/telemeta/collection_add.html b/telemeta/templates/telemeta/collection_add.html
index c1d7f3d2..f798c88c 100644
--- a/telemeta/templates/telemeta/collection_add.html
+++ b/telemeta/templates/telemeta/collection_add.html
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block title_buttons %}
-     <a href="{% url telemeta-collections %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+     <a href="{% url "telemeta-collections" %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
      <a href="#" class="component_icon button icon_save"
                 onclick="document.getElementById('_addCollectionForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
@@ -29,7 +29,7 @@
         {% endfor %}
         </table>
         <div align="center" style="margin-top:3ex;">
-            <a href="{% url telemeta-collections %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+            <a href="{% url "telemeta-collections" %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
             <a href="#" class="component_icon button icon_save"
                 onclick="document.getElementById('_addCollectionForm').submit(); return false;">{% trans "Save" %}</a>
         </div>
diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 78cee3ab..e6de75da 100644
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -35,20 +35,20 @@
 {% block title %}
     <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" />
     Collection :
-    <a href="{% url telemeta-collection-detail collection.public_id %}">{{ collection.title }}</a>
+    <a href="{% url "telemeta-collection-detail" collection.public_id %}">{{ collection.title }}</a>
 {% endblock %}
 
 {% block title_buttons %}
   <div class="fixedWidthAsPlayer">
     {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
-      <a href="{% url telemeta-collection-edit collection.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
-      <a href="{% url telemeta-collection-copy collection.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
-      <a href="{% url telemeta-collection-additem collection.public_id %}" class="component_icon button icon_add">{% trans "Add item" %}</a>
+      <a href="{% url "telemeta-collection-edit" collection.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
+      <a href="{% url "telemeta-collection-copy" collection.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
+      <a href="{% url "telemeta-collection-additem" collection.public_id %}" class="component_icon button icon_add">{% trans "Add item" %}</a>
      {% endif %}
     {% if user.is_authenticated %}
      <a href=# id="_add_to_playlist" class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
     {% if audio_export_enabled or perms.telemeta.can_download_all_items or user.is_superuser %}
-     <a href="{% url telemeta-collection-package collection.public_id %}" id="zip_package" class="component_icon button icon_zip">{% trans "Download" %} ZIP</a>
+     <a href="{% url "telemeta-collection-package" collection.public_id %}" id="zip_package" class="component_icon button icon_zip">{% trans "Download" %} ZIP</a>
     {% endif %}
     {% endif %}
    </div>
@@ -61,8 +61,8 @@
             <div id="collection_player">
              <div class="title">
               <h3><b>{% trans "Listen to this collection" %}</b>
-              (<a href="{% url telemeta-collection-m3u collection.public_id %}">M3U</a>,
-              <a href="{% url telemeta-collection-xspf collection.public_id %}">XSPF</a>)</h3>
+              (<a href="{% url "telemeta-collection-m3u" collection.public_id %}">M3U</a>,
+              <a href="{% url "telemeta-collection-xspf" collection.public_id %}">XSPF</a>)</h3>
              </div>
                 <!-- This is Jeroen Wijering's Flash MP3 Player,
                   under CC Attribution-NonCommercial-ShareAlike 2.0 license
@@ -72,7 +72,7 @@
                 </p>
                 <script type="text/javascript">
                   var so = new SWFObject('{{ STATIC_URL }}telemeta/swf/mp3player.swf','playlist','362','200','7');
-                  so.addVariable("file","{% url telemeta-collection-xspf collection.public_id %}");
+                  so.addVariable("file","{% url "telemeta-collection-xspf" collection.public_id %}");
                   so.addVariable("displayheight","0");
                   so.addParam("wmode", "opaque");
                   so.write('collection_player_c');
@@ -97,11 +97,11 @@
                 {% dl_field collection "year_published" placeholder %}
                 {% for parent in parents %}
                 <dt>{% trans parent.element_type|capitalize %}</dt>
-                <dd><a href="{% url telemeta-resource-detail parent.element_type parent.public_id %}">{{ parent.title }}</a></dd>
+                <dd><a href="{% url "telemeta-resource-detail" parent.element_type parent.public_id %}">{{ parent.title }}</a></dd>
                 {% endfor %}
                 {% if last_revision %}
                 <dt>{% trans "Last modification" %}</dt>
-                <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
+                <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url "telemeta-profile-detail" last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
                 {% endif %}
             </dl>
         {% endblock general_info %}
@@ -216,9 +216,9 @@
 {% endblock %}
 
 {% block delete %}
-<a href="{% url telemeta-collection-dublincore collection.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
+<a href="{% url "telemeta-collection-dublincore" collection.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediacollection %}
- <a href="#" onclick="if(confirm(gettrans('delete the collection permanently?'))){window.location.href='{% url telemeta-collection-delete collection.public_id %}';};return false;"
+ <a href="#" onclick="if(confirm(gettrans('delete the collection permanently?'))){window.location.href='{% url "telemeta-collection-delete" collection.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
 {% endblock %}
diff --git a/telemeta/templates/telemeta/collection_detail_dc.html b/telemeta/templates/telemeta/collection_detail_dc.html
index 37937797..f8a2ff1f 100644
--- a/telemeta/templates/telemeta/collection_detail_dc.html
+++ b/telemeta/templates/telemeta/collection_detail_dc.html
@@ -9,7 +9,7 @@
 <h1>Collection: {{ collection }}</h1>
 {% endblock %}
 {% block title_buttons %}
-<a class="component_icon button icon_previous" href="{% url telemeta-collection-detail collection.public_id %}">{% trans "Normal View" %}</a>
+<a class="component_icon button icon_previous" href="{% url "telemeta-collection-detail" collection.public_id %}">{% trans "Normal View" %}</a>
 {% endblock %}
 
 {% block content %}
@@ -19,9 +19,9 @@
 {% endblock %}
 
 {% block delete %}
-<a class="component_icon button icon_previous" href="{% url telemeta-collection-detail collection.public_id %}">{% trans "Normal View" %}</a>
+<a class="component_icon button icon_previous" href="{% url "telemeta-collection-detail" collection.public_id %}">{% trans "Normal View" %}</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediacollection %}
- <a href="#" onclick="if(confirm(gettrans('delete the collection permanently?'))){window.location.href='{% url telemeta-collection-delete collection.public_id %}';};return false;"
+ <a href="#" onclick="if(confirm(gettrans('delete the collection permanently?'))){window.location.href='{% url "telemeta-collection-delete" collection.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
 {% endblock %}
diff --git a/telemeta/templates/telemeta/collection_edit.html b/telemeta/templates/telemeta/collection_edit.html
index af931f6d..a03ebbab 100644
--- a/telemeta/templates/telemeta/collection_edit.html
+++ b/telemeta/templates/telemeta/collection_edit.html
@@ -6,7 +6,7 @@
     <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" /> Collection : {{ collection }}
 {% endblock %}
 {% block title_buttons %}
-    <a href="{% url telemeta-collection-detail collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    <a href="{% url "telemeta-collection-detail" collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('_editCollectionForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
@@ -28,11 +28,11 @@
        {% endfor %}
      <tr>
       <td style="padding-top: 1em">{% trans "Related media" %}:</td>
-      <td style="padding-top: 1em"><a href="{% url telemeta-collection-related_edit collection.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
+      <td style="padding-top: 1em"><a href="{% url "telemeta-collection-related_edit" collection.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
     </tr>
        </table>
         <div align="center" style="margin-top:3ex;">
-         <a href="{% url telemeta-collection-detail collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+         <a href="{% url "telemeta-collection-detail" collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
          <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('_editCollectionForm').submit(); return false;">{% trans "Save" %}</a>
         </div>
diff --git a/telemeta/templates/telemeta/collection_list.html b/telemeta/templates/telemeta/collection_list.html
index 1d4470fb..191d4585 100644
--- a/telemeta/templates/telemeta/collection_list.html
+++ b/telemeta/templates/telemeta/collection_list.html
@@ -9,12 +9,12 @@
 {% endblock %}
 
 {% block title_buttons %}
-     <a href="{% url telemeta-collections %}" class="component_icon button icon_filter">{% trans "All" %}</a>
-     <a href="{% url telemeta-collections-unpublished %}" class="component_icon button icon_filter">{% trans "Unpublished" %}</a>
-     <a href="{% url telemeta-collections-published %}" class="component_icon button icon_filter">{% trans "Published" %}</a>
-     <a href="{% url telemeta-collections-sound %}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
+     <a href="{% url "telemeta-collections" %}" class="component_icon button icon_filter">{% trans "All" %}</a>
+     <a href="{% url "telemeta-collections-unpublished" %}" class="component_icon button icon_filter">{% trans "Unpublished" %}</a>
+     <a href="{% url "telemeta-collections-published" %}" class="component_icon button icon_filter">{% trans "Published" %}</a>
+     <a href="{% url "telemeta-collections-sound" %}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
-      <a href="{% url telemeta-collection-add %}" class="component_icon button icon_add">{% trans "Add" %}</a>
+      <a href="{% url "telemeta-collection-add" %}" class="component_icon button icon_add">{% trans "Add" %}</a>
     {% endif %}
 {% endblock %}
 
diff --git a/telemeta/templates/telemeta/collection_related_edit.html b/telemeta/templates/telemeta/collection_related_edit.html
index d0ca5a68..48f3e0f4 100644
--- a/telemeta/templates/telemeta/collection_related_edit.html
+++ b/telemeta/templates/telemeta/collection_related_edit.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block title_buttons %}
- <a href="{% url telemeta-collection-detail collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="{% url "telemeta-collection-detail" collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
  <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('_editMediaCollectionRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
@@ -37,7 +37,7 @@
        <br />
     {% endfor %}
       <div align="center">
-        <a href="{% url telemeta-collection-detail collection.public_id %}"
+        <a href="{% url "telemeta-collection-detail" collection.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('_editMediaCollectionRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
diff --git a/telemeta/templates/telemeta/collection_xspf.xml b/telemeta/templates/telemeta/collection_xspf.xml
index 3d1aca51..df3e60b1 100644
--- a/telemeta/templates/telemeta/collection_xspf.xml
+++ b/telemeta/templates/telemeta/collection_xspf.xml
@@ -5,7 +5,7 @@
 {% with collection.to_dublincore.flatten as dc %}
   <creator>{{ dc.creator }}</creator>
   <title>{{ dc.title }}</title>
-  <info>http://{{ host }}{% url telemeta-collection-detail collection.public_id %}</info>
+  <info>http://{{ host }}{% url "telemeta-collection-detail" collection.public_id %}</info>
 {% endwith %}
 {% endblock %}
 
@@ -16,9 +16,9 @@
     <track>
       <title>{{ item }}</title>
       <meta rel="type">mp3</meta>
-      <location>http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %}</location>
+      <location>http://{{ host }}{% url "telemeta-item-export" item.public_id,"mp3" %}</location>
       <duration>{{ item.computed_duration.as_seconds|mul:1000 }}</duration>
-      <info>http://{{ host }}{% url telemeta-item-detail item.public_id %}</info>
+      <info>http://{{ host }}{% url "telemeta-item-detail" item.public_id %}</info>
     </track>
  {% endif %}
  {% endif %}
diff --git a/telemeta/templates/telemeta/country_info.html b/telemeta/templates/telemeta/country_info.html
index 0783deea..8b4ea5f6 100644
--- a/telemeta/templates/telemeta/country_info.html
+++ b/telemeta/templates/telemeta/country_info.html
@@ -3,11 +3,11 @@
 
 <h2>{{ country }}</h2>
 <p>
-<a href="{% url telemeta-geo-country-items continent.flatname,country.flatname %}">
+<a href="{% url "telemeta-geo-country-items" continent.flatname,country.flatname %}">
 {{ country.items|resources_num }}
 </a>
 {% trans "in" %}
-<a href="{% url telemeta-geo-country-collections continent.flatname,country.flatname %}">
+<a href="{% url "telemeta-geo-country-collections" continent.flatname,country.flatname %}">
 {{ country.collections|resources_num }}
 </a>
 </p>
diff --git a/telemeta/templates/telemeta/enumeration_edit.html b/telemeta/templates/telemeta/enumeration_edit.html
index 04d58c30..097d0c6e 100644
--- a/telemeta/templates/telemeta/enumeration_edit.html
+++ b/telemeta/templates/telemeta/enumeration_edit.html
@@ -4,13 +4,13 @@
 {% block head_title %}{% trans "Enumeration" %} : {{ enumeration_name|capfirst }} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> <a href="{% url telemeta-admin-general %}">{% trans "Administration" %}</a> > <a href="{% url telemeta-admin-enumerations %}">{% trans "Enumerations" %}</a></h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> <a href="{% url "telemeta-admin-general" %}">{% trans "Administration" %}</a> > <a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a></h1>
 {% endblock %}
 
 {% block tabcontents %}
  <h4>{{ enumeration_name|capfirst }}</h4>
  <form class="addnew" id="_addenum" method="POST"
-        action="{% url telemeta-enumeration-add enumeration_id %}">{% csrf_token %}
+        action="{% url "telemeta-enumeration-add" enumeration_id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Add entry" %}</legend>
    <div class="field">
@@ -25,7 +25,7 @@
   </fieldset>
  </form>
  {% if enumeration_values %}
- <form id="_updateenum" method="POST" action="{% url telemeta-enumeration-update enumeration_id %}">{% csrf_token %}
+ <form id="_updateenum" method="POST" action="{% url "telemeta-enumeration-update" enumeration_id %}">{% csrf_token %}
   <table class="listing">
    <thead>
     <tr><th class="sel">&nbsp;</th><th>{% trans "Value"%}</th>
@@ -35,7 +35,7 @@
     {% for record in enumeration_values %}
     <tr>
      <td><input type="checkbox" name="sel" value="{{record.id}}" /></td>
-     <td><a href="{% url telemeta-enumeration-record-edit enumeration_id,record.id %}">
+     <td><a href="{% url "telemeta-enumeration-record-edit" enumeration_id,record.id %}">
         {{record.value}}</a></td>
     </tr>
     {% endfor %}
diff --git a/telemeta/templates/telemeta/enumeration_edit_value.html b/telemeta/templates/telemeta/enumeration_edit_value.html
index 643abae4..c6c52933 100644
--- a/telemeta/templates/telemeta/enumeration_edit_value.html
+++ b/telemeta/templates/telemeta/enumeration_edit_value.html
@@ -4,7 +4,7 @@
 {% block extra_javascript %}
 <script type="text/javascript">
 $(document).ready(function(){
-    InitChatWindow("{% url jqchat_ajax room.id %}", null);
+    InitChatWindow("{% url "jqchat_ajax" room.id %}", null);
     });
 </script>
 {% endblock extra_javascript %}
@@ -23,7 +23,7 @@ $(document).ready(function(){
 
  <h4>{{ enumeration_name|capfirst }}</h4>
  <form class="mod" id="addenum" method="post"
-    action="{% url telemeta-enumeration-record-update enumeration_id,enumeration_record.id %}">{% csrf_token %}
+    action="{% url "telemeta-enumeration-record-update" enumeration_id,enumeration_record.id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Modify an entry" %}</legend>
    <div class="field">
@@ -33,14 +33,14 @@ $(document).ready(function(){
    <div class="buttons">
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('addenum').submit(); return false;">{% trans "Save" %}</a>
-        <a href="{% url telemeta-enumeration-edit enumeration_id %}"
+        <a href="{% url "telemeta-enumeration-edit" enumeration_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    </div>
   </fieldset>
  </form>
 
  <form class="mod" id="replenum" method="post"
-    action="{% url telemeta-enumeration-replace enumeration_id,enumeration_record.id %}">{% csrf_token %}
+    action="{% url "telemeta-enumeration-replace" enumeration_id,enumeration_record.id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Replace by" %}</legend>
    <div class="field">
@@ -55,7 +55,7 @@ $(document).ready(function(){
    <div class="buttons">
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('replenum').submit(); return false;">{% trans "Replace" %}</a>
-        <a href="{% url telemeta-enumeration-edit enumeration_id %}"
+        <a href="{% url "telemeta-enumeration-edit" enumeration_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    </div>
   </fieldset>
diff --git a/telemeta/templates/telemeta/geo_continents.html b/telemeta/templates/telemeta/geo_continents.html
index 9fec8aee..5684466e 100644
--- a/telemeta/templates/telemeta/geo_continents.html
+++ b/telemeta/templates/telemeta/geo_continents.html
@@ -31,11 +31,11 @@ var resourceMap = new ResourceMap('.continents', {
 {% if continents %}
 <ul class="continents">
 {% for group in continents %}
-  <li class="name {% if not forloop.counter0|divisibleby:"2" %}odd{% endif %}"><b><a href="{% url telemeta-geo-countries group.continent.flatname %}">{{ group.continent }}</a></b>
+  <li class="name {% if not forloop.counter0|divisibleby:"2" %}odd{% endif %}"><b><a href="{% url "telemeta-geo-countries" group.continent.flatname %}">{{ group.continent }}</a></b>
     <ul>
     {% for country in group.countries %}
       <li id="resource-{{country.id}}" class="country_name resourcemap-element">
-        <a href="{% url telemeta-geo-country-collections group.continent.flatname,country.flatname %}">
+        <a href="{% url "telemeta-geo-country-collections" group.continent.flatname,country.flatname %}">
           <span class="resourcemap-name">{{ country }}</span></a>
         {% if not country.latitude|is_none and not country.longitude|is_none %}
         <input type="hidden" class="resourcemap-lat" value="{{country.latitude}}" />
diff --git a/telemeta/templates/telemeta/geo_countries.html b/telemeta/templates/telemeta/geo_countries.html
index 64d538d7..12f15286 100644
--- a/telemeta/templates/telemeta/geo_countries.html
+++ b/telemeta/templates/telemeta/geo_countries.html
@@ -5,7 +5,7 @@
 {% block head_title %}{{ continent }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
- <img src="{{ STATIC_URL }}telemeta/images/world_red.png" alt="geo-countries" style="vertical-align:middle" /> <a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> / {{ continent }}
+ <img src="{{ STATIC_URL }}telemeta/images/world_red.png" alt="geo-countries" style="vertical-align:middle" /> <a href="{% url "telemeta-geo-continents" %}">{% trans "World" %}</a> / {{ continent }}
 {% endblock title %}
 
 {% block content %}
@@ -20,14 +20,14 @@
     <td>{{ country }}</td>
     <td>
     {% with country.collections.count as num %}
-    <a href="{% url telemeta-geo-country-collections continent.flatname,country.flatname %}">
+    <a href="{% url "telemeta-geo-country-collections" continent.flatname,country.flatname %}">
     {% blocktrans count num as counter %}1 collection{% plural %}{{ counter }} collections{% endblocktrans %}
     </a>
     {% endwith %}
     </td>
     <td>
     {% with country.items.count as num %}
-    <a href="{% url telemeta-geo-country-items continent.flatname,country.flatname %}">
+    <a href="{% url "telemeta-geo-country-items" continent.flatname,country.flatname %}">
     {% blocktrans count num as counter %}1 item{% plural %}{{ counter }} items {% endblocktrans %}
     </a>
     {% endwith %}
diff --git a/telemeta/templates/telemeta/geo_country_collections.html b/telemeta/templates/telemeta/geo_country_collections.html
index 2ef5c194..85434291 100644
--- a/telemeta/templates/telemeta/geo_country_collections.html
+++ b/telemeta/templates/telemeta/geo_country_collections.html
@@ -5,8 +5,8 @@
 {% block head_title %}{{ country }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<img src="{{ STATIC_URL }}telemeta/images/world_red.png" alt="geo-country" style="vertical-align:middle" /> <a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
-  <a href="{% url telemeta-geo-countries continent.flatname %}">{{ continent }}</a> / {{ country }}
+<img src="{{ STATIC_URL }}telemeta/images/world_red.png" alt="geo-country" style="vertical-align:middle" /> <a href="{% url "telemeta-geo-continents" %}">{% trans "World" %}</a> /
+  <a href="{% url "telemeta-geo-countries" continent.flatname %}">{{ continent }}</a> / {{ country }}
 {% endblock title %}
 
 {% block content %}
diff --git a/telemeta/templates/telemeta/geo_country_items.html b/telemeta/templates/telemeta/geo_country_items.html
index d1e18299..b28ac69f 100644
--- a/telemeta/templates/telemeta/geo_country_items.html
+++ b/telemeta/templates/telemeta/geo_country_items.html
@@ -5,8 +5,8 @@
 {% block head_title %}{{ country }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
-  <a href="{% url telemeta-geo-countries continent.flatname %}">{{ continent }}</a> 
+<a href="{% url "telemeta-geo-continents" %}">{% trans "World" %}</a> /
+  <a href="{% url "telemeta-geo-countries" continent.flatname %}">{{ continent }}</a> 
   / {{ country }}
 {% endblock title %}
 
diff --git a/telemeta/templates/telemeta/home.html b/telemeta/templates/telemeta/home.html
index 665f615f..47700d09 100644
--- a/telemeta/templates/telemeta/home.html
+++ b/telemeta/templates/telemeta/home.html
@@ -13,7 +13,7 @@
     <h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlist" style="vertical-align:middle" />
     {% trans "Musical selection" %}</h3>
     <div style="background-color: white; align: center; padding: 1em;">
-    <span style="font-size: 80%; "><a href="{% url telemeta-item-detail sound_pub_item.public_id %}"><b>{{ sound_pub_item }}</b></a>{% if sound_pub_item.alt_title %} ({{ sound_pub_item.alt_title }}){% endif %}<br /><span style="font-size: 90%; padding: 1ex;">{{ sound_pub_item.location.fullnames|to_string }}</span></span>
+    <span style="font-size: 80%; "><a href="{% url "telemeta-item-detail" sound_pub_item.public_id %}"><b>{{ sound_pub_item }}</b></a>{% if sound_pub_item.alt_title %} ({{ sound_pub_item.alt_title }}){% endif %}<br /><span style="font-size: 90%; padding: 1ex;">{{ sound_pub_item.location.fullnames|to_string }}</span></span>
     <iframe style="margin-top: 1ex;" width='376' height='220' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='/archives/items/{{ sound_pub_item.public_id }}/player/362x130/'></iframe>
 
     </div>
@@ -24,7 +24,7 @@
     <h3><img src="{{ STATIC_URL }}telemeta/images/module_world.png" alt="world" style="vertical-align:middle" />
     {% trans "Geo Navigator" %}</h3>
     <div style="background-color: white;" align="center">
-    <a class="image-link" href="{% url telemeta-geo-continents %}">
+    <a class="image-link" href="{% url "telemeta-geo-continents" %}">
     <img class="map-thumbnail" src="{{ STATIC_URL }}telemeta/images/world2.png" alt="{% trans "Open the geographic navigator" %}" style="width:398px" /></a>
     </div>
 </div>
@@ -65,7 +65,7 @@
     {% trans "Musical selection" %}</h1>
 </div>
 {% for item in sound_pub_items %}
-<div style="float: left; margin: 3px; width: 48%" align="center"><a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>{% if item.alt_title %} ({{ item.alt_title }}){% endif %}<br /><span style="font-size: 80%">{{ item.location.fullnames|to_string }}</span><br />
+<div style="float: left; margin: 3px; width: 48%" align="center"><a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>{% if item.alt_title %} ({{ item.alt_title }}){% endif %}<br /><span style="font-size: 80%">{{ item.location.fullnames|to_string }}</span><br />
 <iframe width='376' height='220' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='/archives/items/{{ item.public_id }}/player/362x130/'></iframe></div>
 {% endfor %}
 </div>
diff --git a/telemeta/templates/telemeta/inc/children_list.html b/telemeta/templates/telemeta/inc/children_list.html
index 3f4764bf..0ebadcba 100644
--- a/telemeta/templates/telemeta/inc/children_list.html
+++ b/telemeta/templates/telemeta/inc/children_list.html
@@ -21,7 +21,7 @@
 {% if child.code %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
     <td class="highlight">
-        <a href="{% url telemeta-resource-detail resource.children_type child.public_id %}">{{ child.title }}</a>
+        <a href="{% url "telemeta-resource-detail" resource.children_type child.public_id %}">{{ child.title }}</a>
     </td>
     <td>{{ child.descriptions }}</td>
     <td>{{ child.code }}</td>
diff --git a/telemeta/templates/telemeta/inc/collection_list.html b/telemeta/templates/telemeta/inc/collection_list.html
index 24fe8cf5..2e90a6f7 100644
--- a/telemeta/templates/telemeta/inc/collection_list.html
+++ b/telemeta/templates/telemeta/inc/collection_list.html
@@ -20,7 +20,7 @@
 {% for collection in collections %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
     <td class="highlight">
-        <a href="{% url telemeta-collection-detail collection.public_id %}">{{ collection.title }}</a>
+        <a href="{% url "telemeta-collection-detail" collection.public_id %}">{{ collection.title }}</a>
     </td>
     <td>
         {{ collection.code|default:collection.old_code }}
diff --git a/telemeta/templates/telemeta/inc/collection_related.html b/telemeta/templates/telemeta/inc/collection_related.html
index 0318bc91..997d9953 100644
--- a/telemeta/templates/telemeta/inc/collection_related.html
+++ b/telemeta/templates/telemeta/inc/collection_related.html
@@ -28,7 +28,7 @@
                                             {{ media.url|get_filename }}</a>
                                         {% endif %}
                                     {% else %}
-                                        <a href="{% url telemeta-collection-related collection.public_id media.id %}" target="_blank">
+                                        <a href="{% url "telemeta-collection-related" collection.public_id media.id %}" target="_blank">
                                         {% if media.title %}
                                             {{ media.title }}</a>
                                         {% else %}
@@ -44,7 +44,7 @@
                                 {% if media.file %}
                                 <dt>{% trans "Download" %}</dt>
                                 <dd>
-                                    <a href="{% url telemeta-collection-related-download collection.public_id media.id %}">
+                                    <a href="{% url "telemeta-collection-related-download" collection.public_id media.id %}">
                                      {{ media.file|get_filename }}
                                     </a>
                                 </dd>
@@ -56,7 +56,7 @@
                             <td style="padding-bottom: 1em;">
                                 {% if media.is_image %}
                                 {% if media.file %}
-                                <a href="{% url telemeta-collection-related collection.public_id media.id %}">
+                                <a href="{% url "telemeta-collection-related" collection.public_id media.id %}">
                                 {% thumbnail media.file "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
diff --git a/telemeta/templates/telemeta/inc/dublincore.html b/telemeta/templates/telemeta/inc/dublincore.html
index 0256d1bc..82389c34 100644
--- a/telemeta/templates/telemeta/inc/dublincore.html
+++ b/telemeta/templates/telemeta/inc/dublincore.html
@@ -9,16 +9,16 @@
         <dd>
         {% if element.related|is_item or element.related|is_collection or element.related|is_resource %}
             {% if element.related|is_item %}
-            <a href="{% url telemeta-item-dublincore element.related.public_id %}">{{ element.value }}</a>
+            <a href="{% url "telemeta-item-dublincore" element.related.public_id %}">{{ element.value }}</a>
             {% endif %}
             {% if element.related|is_collection %}
-            <a href="{% url telemeta-collection-dublincore element.related.public_id %}">{{ element.value }}</a>
+            <a href="{% url "telemeta-collection-dublincore" element.related.public_id %}">{{ element.value }}</a>
             {% endif %}
             {% if element.related|is_corpus %}
-            <a href="{% url telemeta-resource-dublincore "corpus" element.related.public_id %}">{{ element.value }}</a>
+            <a href="{% url "telemeta-resource-dublincore" "corpus" element.related.public_id %}">{{ element.value }}</a>
             {% endif %}
             {% if element.related|is_fonds %}
-            <a href="{% url telemeta-resource-dublincore "fonds" element.related.public_id %}">{{ element.value }}</a>
+            <a href="{% url "telemeta-resource-dublincore" "fonds" element.related.public_id %}">{{ element.value }}</a>
             {% endif %}
         {% else %}
             {{ element.value }}
diff --git a/telemeta/templates/telemeta/inc/mediaitem_list.html b/telemeta/templates/telemeta/inc/mediaitem_list.html
index 6adf0d81..0b1a65d6 100644
--- a/telemeta/templates/telemeta/inc/mediaitem_list.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_list.html
@@ -25,7 +25,7 @@
 {% for item in items %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
     <td class="highlight">
-        <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
+        <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
     </td>
     <td>
         {{ item.code|default:item.old_code }}
@@ -46,7 +46,7 @@
     </td>
     <td align="center">
         {% if item.file %}
-         <a href="{% url telemeta-item-detail item.public_id %}">
+         <a href="{% url "telemeta-item-detail" item.public_id %}">
           <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" /></a>
         {% endif %}
     </td>
diff --git a/telemeta/templates/telemeta/inc/mediaitem_related.html b/telemeta/templates/telemeta/inc/mediaitem_related.html
index 51f58dcd..9b2a980e 100644
--- a/telemeta/templates/telemeta/inc/mediaitem_related.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_related.html
@@ -28,7 +28,7 @@
                                             {{ media.url|get_filename }}</a>
                                         {% endif %}
                                     {% else %}
-                                        <a href="{% url telemeta-item-related item.public_id media.id %}" target="_blank">
+                                        <a href="{% url "telemeta-item-related" item.public_id media.id %}" target="_blank">
                                         {% if media.title %}
                                             {{ media.title }}</a>
                                         {% else %}
@@ -44,7 +44,7 @@
                                 {% if media.file %}
                                 <dt>{% trans "Download" %}</dt>
                                 <dd>
-                                    <a href="{% url telemeta-item-related-download item.public_id media.id %}">
+                                    <a href="{% url "telemeta-item-related-download" item.public_id media.id %}">
                                      {{ media.file|get_filename }}
                                     </a>
                                 </dd>
@@ -55,7 +55,7 @@
                             <td style="padding-bottom: 1em;">
                                 {% if media.is_image %}
                                 {% if media.file %}
-                                <a href="{% url telemeta-item-related item.public_id media.id %}">
+                                <a href="{% url "telemeta-item-related" item.public_id media.id %}">
                                 {% thumbnail media.file "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
diff --git a/telemeta/templates/telemeta/inc/module_revisions.html b/telemeta/templates/telemeta/inc/module_revisions.html
index a8d503ad..40f8d259 100644
--- a/telemeta/templates/telemeta/inc/module_revisions.html
+++ b/telemeta/templates/telemeta/inc/module_revisions.html
@@ -4,10 +4,10 @@
    <div class="module">
 
     {% block rss_title %}
-      <a href="{% url telemeta-rss %}">
+      <a href="{% url "telemeta-rss" %}">
       <img src="{{ STATIC_URL }}telemeta/images/rss.png" alt="rss" style="vertical-align:middle" />
       <h3>{% trans title %}</h3></a>
-      <a href="{% url telemeta-rss %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
+      <a href="{% url "telemeta-rss" %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
     {% endblock rss_title %}
 
     <div class="vscroll">
@@ -24,24 +24,24 @@
         <td>
         {% if r.element %}
             {% if r.revision.element_type == "corpus" or r.revision.element_type == "fonds"%}
-            <a href="{% url telemeta-resource-detail r.revision.element_type r.element.public_id %}">{{ r.element.title }}</a>
+            <a href="{% url "telemeta-resource-detail" r.revision.element_type r.element.public_id %}">{{ r.element.title }}</a>
             {% endif %}
             {% if r.revision.element_type == "collection" %}
-            <a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element.title }}</a>
+            <a href="{% url "telemeta-collection-detail" r.element.public_id %}">{{ r.element.title }}</a>
             {% endif %}
             {% if r.revision.element_type == "item" %}
-            <a href="{% url telemeta-item-detail r.element.public_id %}">
+            <a href="{% url "telemeta-item-detail" r.element.public_id %}">
             {% if r.element.title != '' %}{{ r.element.title }}{% else %}{{ r.element.collection.title }} - {{ r.element.track }}{% endif %}</a>
             {% endif %}
             {% if r.revision.element_type == "marker" %}
-            <a href="{% url telemeta-item-detail-marker r.element.public_id %}">{{ r.element.title }}</a>
+            <a href="{% url "telemeta-item-detail-marker" r.element.public_id %}">{{ r.element.title }}</a>
             {% endif %}
         {% else %}
             {% trans "deleted" %}
         {% endif %}
         </td>
         <td>{{ r.revision.element_type }}</td>
-        <td>{% if r.revision.user %}<a href="{% url telemeta-profile-detail r.revision.user.username %}">{{ r.revision.user.username }}</a>{% endif %}</td>
+        <td>{% if r.revision.user %}<a href="{% url "telemeta-profile-detail" r.revision.user.username %}">{{ r.revision.user.username }}</a>{% endif %}</td>
       </tr>
     {% endfor %}
     </table>
diff --git a/telemeta/templates/telemeta/inc/module_searches.html b/telemeta/templates/telemeta/inc/module_searches.html
index d6c4f17d..21726789 100644
--- a/telemeta/templates/telemeta/inc/module_searches.html
+++ b/telemeta/templates/telemeta/inc/module_searches.html
@@ -15,7 +15,7 @@
     {% for s in searches %}
      <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
         <td>{{ s.date }}</td>
-        <td><a href="{% url telemeta-search-items %}?{{s.criteria.all|build_pattern_string|build_query_string}}">
+        <td><a href="{% url "telemeta-search-items" %}?{{s.criteria.all|build_pattern_string|build_query_string}}">
             {% for c in s.criteria.all %}
                 <li>{% trans c.key %} : {{ c.value}}</li>
             {% endfor %}
diff --git a/telemeta/templates/telemeta/inc/module_user_revisions.html b/telemeta/templates/telemeta/inc/module_user_revisions.html
index e066fcc8..4acaacd5 100644
--- a/telemeta/templates/telemeta/inc/module_user_revisions.html
+++ b/telemeta/templates/telemeta/inc/module_user_revisions.html
@@ -3,9 +3,9 @@
 {% load i18n %}
 
 {% block rss_title %}
-<a href="{% url telemeta-user-rss user.username %}">
+<a href="{% url "telemeta-user-rss" user.username %}">
 <img src="{{ STATIC_URL }}telemeta/images/rss.png" alt="rss" style="vertical-align:middle" />
 <h3>{% trans title %}</h3></a>
-<a href="{% url telemeta-user-rss user.username %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
+<a href="{% url "telemeta-user-rss" user.username %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
 {% endblock rss_title %}
 
diff --git a/telemeta/templates/telemeta/inc/resource_list.html b/telemeta/templates/telemeta/inc/resource_list.html
index a5226c3d..6506f956 100644
--- a/telemeta/templates/telemeta/inc/resource_list.html
+++ b/telemeta/templates/telemeta/inc/resource_list.html
@@ -18,7 +18,7 @@
 {% for resource in resources %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
     <td class="highlight">
-        <a href="{% url telemeta-resource-detail type resource.public_id %}">{{ resource.title }}</a>
+        <a href="{% url "telemeta-resource-detail" type resource.public_id %}">{{ resource.title }}</a>
     </td>
     <td>{{ resource.descriptions }}</td>
     <td>{{ resource.code }}</td>
diff --git a/telemeta/templates/telemeta/inc/resource_related.html b/telemeta/templates/telemeta/inc/resource_related.html
index 13546051..4905aedc 100644
--- a/telemeta/templates/telemeta/inc/resource_related.html
+++ b/telemeta/templates/telemeta/inc/resource_related.html
@@ -28,7 +28,7 @@
                                             {{ media.url|get_filename }}</a>
                                         {% endif %}
                                     {% else %}
-                                        <a href="{% url telemeta-resource-related type resource.code media.id %}">
+                                        <a href="{% url "telemeta-resource-related" type resource.code media.id %}">
                                         {% if media.title %}
                                             {{ media.title }}</a>
                                         {% else %}
@@ -44,7 +44,7 @@
                                 {% if media.file %}
                                 <dt>{% trans "Download" %}</dt>
                                 <dd>
-                                    <a href="{% url telemeta-resource-related-download type resource.code media.id %}">
+                                    <a href="{% url "telemeta-resource-related-download" type resource.code media.id %}">
                                      {{ media.file|get_filename }}
                                     </a>
                                 </dd>
@@ -56,7 +56,7 @@
                             <td style="padding-bottom: 1em;">
                                 {% if media.is_image %}
                                   {% if media.file %}
-                                  <a href="{% url telemeta-resource-related type resource.code media.id %}">
+                                  <a href="{% url "telemeta-resource-related" type resource.code media.id %}">
                                    {% thumbnail media.file "x200" as im %}
                                     <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                    {% endthumbnail %}
diff --git a/telemeta/templates/telemeta/inc/user_list.html b/telemeta/templates/telemeta/inc/user_list.html
index a82240a9..8874bc07 100644
--- a/telemeta/templates/telemeta/inc/user_list.html
+++ b/telemeta/templates/telemeta/inc/user_list.html
@@ -12,7 +12,7 @@
    </thead><tbody>
     {% for user in users %}
     <tr>
-     <td><a href="{% url telemeta-profile-detail user.username %}">{{user.username}}</a></td>
+     <td><a href="{% url "telemeta-profile-detail" user.username %}">{{user.username}}</a></td>
      <td>{{ user.first_name }}</td>
      <td>{{ user.last_name }}</td>
      <td><a href="mailto:{{ user.email }}">{{ user.email }}</a></td>
diff --git a/telemeta/templates/telemeta/instrument_alias_edit.html b/telemeta/templates/telemeta/instrument_alias_edit.html
index 163b2999..cb3b35a2 100644
--- a/telemeta/templates/telemeta/instrument_alias_edit.html
+++ b/telemeta/templates/telemeta/instrument_alias_edit.html
@@ -9,7 +9,7 @@
 
 {% block tabcontents %}
  <form class="addnew" id="_addinstru" method="POST"
-        action="{% url telemeta-instrument-alias-add %}">{% csrf_token %}
+        action="{% url "telemeta-instrument-alias-add" %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Add entry" %}</legend>
    <div class="field">
@@ -24,7 +24,7 @@
   </fieldset>
  </form>
  {% if instruments %}
- <form id="_updateinstru" method="POST" action="{% url telemeta-instrument-alias-update %}">{% csrf_token %}
+ <form id="_updateinstru" method="POST" action="{% url "telemeta-instrument-alias-update" %}">{% csrf_token %}
   <table class="listing">
    <thead>
     <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th></tr>
@@ -32,7 +32,7 @@
     {% for record in instruments %}
     <tr>
      <td><input type="checkbox" name="sel" value="{{record.id}}" /></td>
-     <td><a href="{% url telemeta-instrument-alias-record-edit record.id %}">
+     <td><a href="{% url "telemeta-instrument-alias-record-edit" record.id %}">
         {{record.name}}</a></td>
     </tr>
     {% endfor %}
diff --git a/telemeta/templates/telemeta/instrument_alias_edit_value.html b/telemeta/templates/telemeta/instrument_alias_edit_value.html
index 5a7d485c..17a5e0ed 100644
--- a/telemeta/templates/telemeta/instrument_alias_edit_value.html
+++ b/telemeta/templates/telemeta/instrument_alias_edit_value.html
@@ -4,7 +4,7 @@
 {% block extra_javascript %}
 <script type="text/javascript">
 $(document).ready(function(){
-    InitChatWindow("{% url jqchat_ajax room.id %}", null);
+    InitChatWindow("{% url "jqchat_ajax" room.id %}", null);
     });
 </script>
 {% endblock extra_javascript %}
@@ -23,7 +23,7 @@ $(document).ready(function(){
 
  <h4>{% trans "Instruments" %}</h4>
  <form class="mod" id="addinstru" method="post"
-    action="{% url telemeta-instrument-alias-record-update instrument.id %}">{% csrf_token %}
+    action="{% url "telemeta-instrument-alias-record-update" instrument.id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Modify an entry" %}</legend>
    <div class="field">
@@ -34,14 +34,14 @@ $(document).ready(function(){
    <div class="buttons">
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('addinstru').submit(); return false;">{% trans "Save" %}</a>
-        <a href="{% url telemeta-instrument-alias-edit %}"
+        <a href="{% url "telemeta-instrument-alias-edit" %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    </div>
   </fieldset>
  </form>
 
 <form class="mod" id="replinstru" method="post"
-    action="{% url telemeta-instrument-alias-record-replace instrument.id %}">{% csrf_token %}
+    action="{% url "telemeta-instrument-alias-record-replace" instrument.id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Replace by" %}</legend>
    <div class="field">
@@ -56,7 +56,7 @@ $(document).ready(function(){
    <div class="buttons">
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('replinstru').submit(); return false;">{% trans "Replace" %}</a>
-        <a href="{% url telemeta-instrument-alias-edit %}"
+        <a href="{% url "telemeta-instrument-alias-edit" %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    </div>
   </fieldset>
diff --git a/telemeta/templates/telemeta/instrument_edit.html b/telemeta/templates/telemeta/instrument_edit.html
index 46ceb864..c6024045 100644
--- a/telemeta/templates/telemeta/instrument_edit.html
+++ b/telemeta/templates/telemeta/instrument_edit.html
@@ -9,7 +9,7 @@
 
 {% block tabcontents %}
  <form class="addnew" id="_addinstru" method="POST"
-        action="{% url telemeta-instrument-add %}">{% csrf_token %}
+        action="{% url "telemeta-instrument-add" %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Add entry" %}</legend>
    <div class="field">
@@ -24,7 +24,7 @@
   </fieldset>
  </form>
  {% if instruments %}
- <form id="_updateinstru" method="POST" action="{% url telemeta-instrument-update %}">{% csrf_token %}
+ <form id="_updateinstru" method="POST" action="{% url "telemeta-instrument-update" %}">{% csrf_token %}
   <table class="listing">
    <thead>
     <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th></tr>
@@ -32,7 +32,7 @@
     {% for record in instruments %}
     <tr>
      <td><input type="checkbox" name="sel" value="{{record.id}}" /></td>
-     <td><a href="{% url telemeta-instrument-record-edit record.id %}">
+     <td><a href="{% url "telemeta-instrument-record-edit" record.id %}">
         {{record.name}}</a></td>
     </tr>
     {% endfor %}
diff --git a/telemeta/templates/telemeta/instrument_edit_value.html b/telemeta/templates/telemeta/instrument_edit_value.html
index 8c2de01b..d85d0238 100644
--- a/telemeta/templates/telemeta/instrument_edit_value.html
+++ b/telemeta/templates/telemeta/instrument_edit_value.html
@@ -4,7 +4,7 @@
 {% block extra_javascript %}
 <script type="text/javascript">
 $(document).ready(function(){
-    InitChatWindow("{% url jqchat_ajax room.id %}", null);
+    InitChatWindow("{% url "jqchat_ajax" room.id %}", null);
     });
 </script>
 {% endblock extra_javascript %}
@@ -23,7 +23,7 @@ $(document).ready(function(){
 
  <h4>{% trans "Instruments" %}</h4>
  <form class="mod" id="addinstru" method="post"
-    action="{% url telemeta-instrument-record-update instrument.id %}">{% csrf_token %}
+    action="{% url "telemeta-instrument-record-update" instrument.id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Modify an entry" %}</legend>
    <div class="field">
@@ -34,14 +34,14 @@ $(document).ready(function(){
    <div class="buttons">
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('addinstru').submit(); return false;">{% trans "Save" %}</a>
-        <a href="{% url telemeta-instrument-edit %}"
+        <a href="{% url "telemeta-instrument-edit" %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    </div>
   </fieldset>
  </form>
 
 <form class="mod" id="replinstru" method="post"
-    action="{% url telemeta-instrument-record-replace instrument.id %}">{% csrf_token %}
+    action="{% url "telemeta-instrument-record-replace" instrument.id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Replace by" %}</legend>
    <div class="field">
@@ -56,7 +56,7 @@ $(document).ready(function(){
    <div class="buttons">
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('replinstru').submit(); return false;">{% trans "Replace" %}</a>
-        <a href="{% url telemeta-instrument-edit %}"
+        <a href="{% url "telemeta-instrument-edit" %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    </div>
   </fieldset>
diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html
index 6bf5b053..a8716ab0 100644
--- a/telemeta/templates/telemeta/lists.html
+++ b/telemeta/templates/telemeta/lists.html
@@ -53,8 +53,8 @@
             <td style="border-bottom:1px solid #6A0307;color:#6A0307;font-size: 100%">{{ playlist.playlist.title }}</td>
             <td style="width:86ex; padding-right: 0; border-bottom:1px solid #6A0307; text-align:right">
             <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlistUtils.showEdit(this, this.id); return false;" class="component_icon button icon_edit">{% trans "Edit" %}</a>
-                <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a>
-                <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a>
+                <a href="{% url "telemeta-playlist-csv-export" playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a>
+                <a href="{% url "telemeta-playlist-csv-export" playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a>
                 <a href="#" id="{{playlist.playlist.public_id}}" onclick="if(confirm(gettrans('delete the playlist permanently?'))){playlistUtils.remove(this.id);};return false;" class="component_icon button icon_cancel">{% trans "Delete" %}</a>
             </td>
         </tr>
@@ -78,16 +78,16 @@
         <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
             <td>
                 {% if resource.type == "item" and not resource.element == None %}
-                <a href="{% url telemeta-item-detail resource.element.public_id %}">{{ resource.element }}</a>
+                <a href="{% url "telemeta-item-detail" resource.element.public_id %}">{{ resource.element }}</a>
                 {% endif %}
                 {% if resource.type == "collection" and not resource.element == None %}
-                <a href="{% url telemeta-collection-detail resource.element.public_id %}">{% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %}</a>
+                <a href="{% url "telemeta-collection-detail" resource.element.public_id %}">{% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %}</a>
                 {% endif %}
                 {% if resource.type == "marker" and not resource.element == None  %}
-                <a href="{% url telemeta-item-detail-marker resource.element.public_id %}">{{ resource.element }}</a>
+                <a href="{% url "telemeta-item-detail-marker" resource.element.public_id %}">{{ resource.element }}</a>
                 {% endif %}
                 {% if resource.type == "corpus" or resource.type == "fonds" %}
-                <a href="{% url telemeta-resource-detail resource.type resource.element.public_id %}">{{ resource.element.title }}</a>
+                <a href="{% url "telemeta-resource-detail" resource.type resource.element.public_id %}">{{ resource.element.title }}</a>
                 {% endif %}
                 {% if resource.element == None %}{% trans "deleted" %}{% endif %}
             </td>
diff --git a/telemeta/templates/telemeta/login.html b/telemeta/templates/telemeta/login.html
index c5819b39..28aa0a53 100644
--- a/telemeta/templates/telemeta/login.html
+++ b/telemeta/templates/telemeta/login.html
@@ -18,7 +18,7 @@ $(document).ready(function() {
 {% if form.errors %}
 <p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>
 {% endif %}
-<form class="login" id="_loginForm" method="post" action="{% url telemeta-login %}">{% csrf_token %}
+<form class="login" id="_loginForm" method="post" action="{% url "telemeta-login" %}">{% csrf_token %}
 <p>
 {{ form.username.label_tag }}
 {{ form.username }}<br />
@@ -27,6 +27,6 @@ $(document).ready(function() {
 </p>
 <a href="#" class="component_icon button icon_login" style="float: right;" onclick="document.getElementById('_loginForm').submit(); return false;">{% trans "Sign in" %}</a>
 <input type="hidden" name="next" value="{{ next }}" />
-<span style="align: right; font-weight: bold;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span>
+<span style="align: right; font-weight: bold;"><a href="{% url "telemeta-password-reset" %}">{% trans "Password forgotten" %} ?</a></span>
 </form>
 {% endblock %}
diff --git a/telemeta/templates/telemeta/mediaitem_add.html b/telemeta/templates/telemeta/mediaitem_add.html
index 3a252d3a..faa28035 100644
--- a/telemeta/templates/telemeta/mediaitem_add.html
+++ b/telemeta/templates/telemeta/mediaitem_add.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block title_buttons %}
-      <a href="{% url telemeta-items %}"
+      <a href="{% url "telemeta-items" %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     {% if perms.telemeta.add_mediaitem %}
       <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</a>
@@ -46,7 +46,7 @@
        {% endfor %}
        </table>
        <div align="center" style="margin-top:3ex;">
-        <a href="{% url telemeta-items %}"
+        <a href="{% url "telemeta-items" %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         {% if perms.telemeta.add_mediaitem %}
         <a href="#" class="component_icon button icon_save"
diff --git a/telemeta/templates/telemeta/mediaitem_copy.html b/telemeta/templates/telemeta/mediaitem_copy.html
index bde5909d..59a9a0d0 100644
--- a/telemeta/templates/telemeta/mediaitem_copy.html
+++ b/telemeta/templates/telemeta/mediaitem_copy.html
@@ -13,7 +13,7 @@
 
 {% block title_buttons %}
 <div class="fixedWidthAsPlayer">
-    <a href="{% url telemeta-items %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    <a href="{% url "telemeta-items" %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     {% if perms.telemeta.add_mediaitem %}
     <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_mediaItemCopyForm').submit();},300); return false;">{% trans "Save" %}</a>
     {% endif %}
@@ -55,7 +55,7 @@
        {% endfor %}
        </table>
        <div align="center" style="margin-top:3ex;">
-         <a href="{% url telemeta-items %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+         <a href="{% url "telemeta-items" %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
          <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img2').style.display='inline'; setTimeout(function(){d.getElementById('_mediaItemCopyForm').submit();},300); return false;">{% trans "Save" %}</a>
         <img id="wait-img2" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
        </div>
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 1affc7be..69fd31a8 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -40,18 +40,18 @@
         {% block graphers %}
         var visualizers = {};
         {% for v in visualizers %}
-            visualizers["{{v.name}}"] = "{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}";
+            visualizers["{{v.name}}"] = "{% url 'telemeta-item-visualize' item.public_id v.id 'WIDTH' 'HEIGHT' %}";
         {% endfor %}
         {% endblock graphers %}
 
         {% if user.is_superuser %}
-             loadPlayer('{% url telemeta-item-analyze-xml item.public_id %}',
-              "{% url telemeta-item-export item.public_id,"mp3" %}", undefined, '{{item.id}}', visualizers,
+             loadPlayer('{% url "telemeta-item-analyze-xml" item.public_id %}',
+              "{% url "telemeta-item-export" item.public_id 'mp3' %}", undefined, '{{item.id}}', visualizers,
               CURRENT_USER_NAME,  //undefined if !user.is_authenticated
               true); //true because superuser
         {% else %}
-           loadPlayer('{% url telemeta-item-analyze-xml item.public_id %}',
-             "{% url telemeta-item-export item.public_id,"mp3" %}", undefined, '{{item.id}}', visualizers,
+           loadPlayer('{% url "telemeta-item-analyze-xml" item.public_id %}',
+             "{% url "telemeta-item-export" item.public_id 'mp3' %}", undefined, '{{item.id}}', visualizers,
              CURRENT_USER_NAME,  //undefined if !user.is_authenticated
              false); //false because not superuser
         {% endif %}
@@ -86,20 +86,20 @@
 
 {% block title %}
 <img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" />
-Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
+Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
 {% endblock %}
 
 {% block title_buttons %}
 <div class="fixedWidthAsPlayer">
     {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
-    <a href="{% url telemeta-item-edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
-    <a href="{% url telemeta-item-copy item.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
+    <a href="{% url "telemeta-item-edit" item.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
+    <a href="{% url "telemeta-item-copy" item.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
     {% endif %}
     {% if user.is_authenticated %}
     <a id="_add_to_playlist" href='#' class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
     {% endif %}
-    <a href="{% url telemeta-item-detail previous %}" class="component_icon button icon_previous">{% trans "Previous" %}</a>
-    <a href="{% url telemeta-item-detail next %}" class="component_icon button icon_next">{% trans "Next" %}</a>
+    <a href="{% url "telemeta-item-detail" previous %}" class="component_icon button icon_previous">{% trans "Previous" %}</a>
+    <a href="{% url "telemeta-item-detail" next %}" class="component_icon button icon_next">{% trans "Next" %}</a>
 </div>
 {% endblock %}
 
@@ -129,7 +129,7 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
     <div>
     <video id="my_video_1" class="video-js vjs-default-skin" width="362" height="240" controls preload="auto" data-setup="{}">
         <!-- Hello Chrome and Firefox (and Opera?) -->
-        <source src="{% url telemeta-item-export item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" />
+        <source src="{% url "telemeta-item-export" item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" />
         </video>
         <!--<div id="videotime"></div>-->
     </div>
@@ -171,7 +171,7 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
         <div class="exporter">
             <p><img src="{{ STATIC_URL }}telemeta/images/download.png" alt="download" style="vertical-align:middle" /> {% trans "Download:" %}
                 {% for format in export_formats %}
-                <a href="{% url telemeta-item-export item.public_id,format.extension %}">
+                <a href="{% url "telemeta-item-export" item.public_id format.extension %}">
                     <img src="{{ STATIC_URL }}telemeta/images/{{ format.extension }}.png" style="vertical-align:middle" alt="{{ format.extension }}" /></a>
                 {% endfor %}</p>
         </div>
@@ -182,7 +182,7 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
 
     <div id="rightcol">
         <div id="no-sound-access">
-            {% trans "You don't have access to the media of this item." %} {% trans "Please contact the administrators to get more rights." %} <a href="{% url telemeta-flatpage 'legal_notices' %}" target="_blank">{% trans "Click here" %}</a>
+            {% trans "You don't have access to the media of this item." %} {% trans "Please contact the administrators to get more rights." %} <a href="{% url "telemeta-flatpage" 'legal_notices' %}" target="_blank">{% trans "Click here" %}</a>
         </div>
     </div>
 
@@ -197,14 +197,14 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
             {% dl_field item "alt_title" %}
             {% dl_field item "collector" placeholder %}
             <dt>{% field_label item "collection" %}</dt>
-            <dd><a href="{% url telemeta-collection-detail item.collection.public_id %}">{{ item.collection }}</a></dd>
+            <dd><a href="{% url "telemeta-collection-detail" item.collection.public_id %}">{{ item.collection }}</a></dd>
             <dt>{% trans "Recording date" %}</dt>
 
             <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd>
 
             {% if last_revision %}
             <dt>{% trans "Last modification" %}</dt>
-            <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
+            <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url "telemeta-profile-detail" last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
             {% endif %}
 
         </dl>
@@ -342,9 +342,9 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
 {% endblock %}
 
 {% block delete %}
-<a href="{% url telemeta-item-dublincore item.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
+<a href="{% url "telemeta-item-dublincore" item.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
- <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"
+ <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url "telemeta-item-delete" item.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
 {% endblock %}
diff --git a/telemeta/templates/telemeta/mediaitem_detail_dc.html b/telemeta/templates/telemeta/mediaitem_detail_dc.html
index 95f07b8c..896dd6db 100644
--- a/telemeta/templates/telemeta/mediaitem_detail_dc.html
+++ b/telemeta/templates/telemeta/mediaitem_detail_dc.html
@@ -14,9 +14,9 @@
 {% endif %}
 
 {% block delete %}
-<a class="component_icon button icon_previous" style="float:left;margin-top:0.5em;margin-bottom:1em" href="{% url telemeta-item-detail item.public_id %}">{% trans "Normal View" %}</a>
+<a class="component_icon button icon_previous" style="float:left;margin-top:0.5em;margin-bottom:1em" href="{% url "telemeta-item-detail" item.public_id %}">{% trans "Normal View" %}</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
- <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"
+ <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url "telemeta-item-delete" item.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
 {% endblock %}
diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index 00c59f72..a40fffdf 100644
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -8,7 +8,7 @@
 
 {% block title_buttons %}
 <div class="fixedWidthAsPlayer">
-    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    <a href="{% url "telemeta-item-detail" item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     {% if perms.telemeta.change_mediaitem %}
     <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
     {% endif %}
@@ -51,16 +51,16 @@
     {% if form.prefix == "item" and forloop.last %}
     <tr>
       <td style="padding-top: 1em">{% trans "Keywords" %}:</td>
-      <td style="padding-top: 1em"><a href="{% url telemeta-item-keywords_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %} {% trans "keywords" %}</a></td>
+      <td style="padding-top: 1em"><a href="{% url "telemeta-item-keywords_edit" item.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %} {% trans "keywords" %}</a></td>
     </tr>
     <tr>
       <td style="padding-top: 1em">{% trans "Performance" %}:</td>
-      <td style="padding-top: 1em"><a href="{% url telemeta-item-performances_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "performance"%}</a></td>
+      <td style="padding-top: 1em"><a href="{% url "telemeta-item-performances_edit" item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "performance"%}</a></td>
     </tr>
 
     <tr>
       <td style="padding-top: 1em">{% trans "Related media" %}:</td>
-      <td style="padding-top: 1em"><a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
+      <td style="padding-top: 1em"><a href="{% url "telemeta-item-related_edit" item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
     </tr>
     {% endif %}
     {% endfor %}
@@ -68,7 +68,7 @@
     </table>
     <hr />
     <div align="center" style="margin-top:3ex;">
-    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    <a href="{% url "telemeta-item-detail" item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     {% if perms.telemeta.change_mediaitem %}
     <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img2').style.display='inline';  setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
     {% endif %}
diff --git a/telemeta/templates/telemeta/mediaitem_keywords_edit.html b/telemeta/templates/telemeta/mediaitem_keywords_edit.html
index b3ee6bce..31aceadf 100644
--- a/telemeta/templates/telemeta/mediaitem_keywords_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_keywords_edit.html
@@ -9,7 +9,7 @@
     <img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
   {% endblock %}
   {% block title_buttons %}
-   <a href="{% url telemeta-item-edit item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+   <a href="{% url "telemeta-item-edit" item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
    <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
   {% endblock %}
 
@@ -36,7 +36,7 @@
     {% endfor %}
 
       <div align="center">
-        <a href="{% url telemeta-item-detail item.public_id %}"
+        <a href="{% url "telemeta-item-detail" item.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html
index d0da3526..6abe3237 100644
--- a/telemeta/templates/telemeta/mediaitem_list.html
+++ b/telemeta/templates/telemeta/mediaitem_list.html
@@ -9,12 +9,12 @@
 {% endblock %}
 
 {% block title_buttons %}
-    <a href="{% url telemeta-items %}" class="component_icon button icon_filter">{% trans "All" %}</a>
-    <a href="{% url telemeta-items-unpublished %}" class="component_icon button icon_filter">{% trans "Unpublished" %}</a>
-    <a href="{% url telemeta-items-published %}" class="component_icon button icon_filter">{% trans "Published" %}</a>
-    <a href="{% url telemeta-items-sound %}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
+    <a href="{% url "telemeta-items" %}" class="component_icon button icon_filter">{% trans "All" %}</a>
+    <a href="{% url "telemeta-items-unpublished" %}" class="component_icon button icon_filter">{% trans "Unpublished" %}</a>
+    <a href="{% url "telemeta-items-published" %}" class="component_icon button icon_filter">{% trans "Published" %}</a>
+    <a href="{% url "telemeta-items-sound" %}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}
-      <a href="{% url telemeta-item-add %}" class="component_icon button icon_add">{% trans "Add" %}</a>
+      <a href="{% url "telemeta-item-add" %}" class="component_icon button icon_add">{% trans "Add" %}</a>
     {% endif %}
 {% endblock %}
 
diff --git a/telemeta/templates/telemeta/mediaitem_performances_edit.html b/telemeta/templates/telemeta/mediaitem_performances_edit.html
index ab0d0227..45cfeb4c 100644
--- a/telemeta/templates/telemeta/mediaitem_performances_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_performances_edit.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block title_buttons %}
- <a href="{% url telemeta-item-edit item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="{% url "telemeta-item-edit" item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
  <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editPerformanceForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
 
@@ -40,7 +40,7 @@
        <br />
     {% endfor %}
       <div align="center">
-        <a href="{% url telemeta-item-detail item.public_id %}"
+        <a href="{% url "telemeta-item-detail" item.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editPerformanceForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
diff --git a/telemeta/templates/telemeta/mediaitem_player.html b/telemeta/templates/telemeta/mediaitem_player.html
index 01bfab08..e75944b0 100644
--- a/telemeta/templates/telemeta/mediaitem_player.html
+++ b/telemeta/templates/telemeta/mediaitem_player.html
@@ -30,7 +30,7 @@
             </div>
         </div>
        <div>
-        <span style="font-size:65%; float:left">{% organization %} - Item : <a href="{% url telemeta-item-detail item.public_id %}" target="_blank">{% if item.code %}{{ item.code }}{% else %}{{ item.old_code }}{% endif %}</a></span>
+        <span style="font-size:65%; float:left">{% organization %} - Item : <a href="{% url "telemeta-item-detail" item.public_id %}" target="_blank">{% if item.code %}{{ item.code }}{% else %}{{ item.old_code }}{% endif %}</a></span>
         <span style="font-size:65%; float:right"><a href="http://telemeta.org" target="_blank">Telemeta</a> powered</span>
        </div>
     </div>
diff --git a/telemeta/templates/telemeta/mediaitem_player_contour.html b/telemeta/templates/telemeta/mediaitem_player_contour.html
index 5d6f1045..fedc8855 100644
--- a/telemeta/templates/telemeta/mediaitem_player_contour.html
+++ b/telemeta/templates/telemeta/mediaitem_player_contour.html
@@ -25,7 +25,7 @@
 {% block graphers %}
         //initializing the visualizers to be passed to the player
         var visualizers = {};
-        visualizers["{{visualizer_id}}"] = "{% url telemeta-item-visualize item.public_id,visualizer_id,"WIDTH","HEIGHT" %}";
+        visualizers["{{visualizer_id}}"] = "{% url "telemeta-item-visualize" item.public_id,visualizer_id,"WIDTH","HEIGHT" %}";
 {% endblock graphers %}
 
 {% block title %}{% endblock %}
diff --git a/telemeta/templates/telemeta/mediaitem_related_edit.html b/telemeta/templates/telemeta/mediaitem_related_edit.html
index 8714b215..619a6177 100644
--- a/telemeta/templates/telemeta/mediaitem_related_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_related_edit.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block title_buttons %}
- <a href="{% url telemeta-item-edit item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="{% url "telemeta-item-edit" item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
  <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaItemRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
 
@@ -36,7 +36,7 @@
        <br />
     {% endfor %}
       <div align="center">
-        <a href="{% url telemeta-item-detail item.public_id %}"
+        <a href="{% url "telemeta-item-detail" item.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaItemRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
diff --git a/telemeta/templates/telemeta/mediaitem_xspf.xml b/telemeta/templates/telemeta/mediaitem_xspf.xml
index f899cbec..6d9da33e 100644
--- a/telemeta/templates/telemeta/mediaitem_xspf.xml
+++ b/telemeta/templates/telemeta/mediaitem_xspf.xml
@@ -5,9 +5,9 @@
     <track>
       <title>{{ item }}</title>
       <meta rel="type">mp3</meta>
-      <location>http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %}</location>
+      <location>http://{{ host }}{% url "telemeta-item-export" item.public_id,"mp3" %}</location>
       <duration>{{ item.get_duration|mul:1000 }}</duration>
-      <info>http://{{ host }}{% url telemeta-item-detail item.public_id %}</info>
+      <info>http://{{ host }}{% url "telemeta-item-detail" item.public_id %}</info>
     </track>
 {% endblock %}
 
diff --git a/telemeta/templates/telemeta/profile_detail.html b/telemeta/templates/telemeta/profile_detail.html
index 48dab507..16218314 100644
--- a/telemeta/templates/telemeta/profile_detail.html
+++ b/telemeta/templates/telemeta/profile_detail.html
@@ -69,10 +69,10 @@
     </div>
 
     {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
-    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
+    <a href="{% url "telemeta-profile-edit" usr.username %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
     {%  endif %}
     {% if user.is_authenticated and user.username == usr.username %}
-    <a href="{% url telemeta-password-change %}" class="component_icon button icon_login">{% trans "Change password" %}</a>
+    <a href="{% url "telemeta-password-change" %}" class="component_icon button icon_login">{% trans "Change password" %}</a>
     {%  endif %}
 
   </div>
diff --git a/telemeta/templates/telemeta/profile_edit.html b/telemeta/templates/telemeta/profile_edit.html
index d0e6f96f..afaa1f8c 100644
--- a/telemeta/templates/telemeta/profile_edit.html
+++ b/telemeta/templates/telemeta/profile_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title_buttons %}
- <a href="{% url telemeta-profile-detail usr.username %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="{% url "telemeta-profile-detail" usr.username %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
 {% endblock %}
 
 {% block content %}
@@ -26,7 +26,7 @@
         {% endfor %}
         </table>
         <div align="center">
-         <a href="{% url telemeta-profile-detail usr.username %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+         <a href="{% url "telemeta-profile-detail" usr.username %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
          <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('_editUserProfileForm').submit(); return false;">{% trans "Save" %}</a>
         </div>
diff --git a/telemeta/templates/telemeta/registration/password_change_done.html b/telemeta/templates/telemeta/registration/password_change_done.html
index 075a6855..fa371374 100644
--- a/telemeta/templates/telemeta/registration/password_change_done.html
+++ b/telemeta/templates/telemeta/registration/password_change_done.html
@@ -1,6 +1,6 @@
 {% extends "telemeta/base.html" %}
 {% load i18n %}
-{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
+{% block userlinks %}{% url "django-admindocs-docroot" as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 
 {% block title %}<br />{% trans 'Password change successful' %}{% endblock %}
 
diff --git a/telemeta/templates/telemeta/registration/password_change_form.html b/telemeta/templates/telemeta/registration/password_change_form.html
index 79274dbb..dd9b9259 100644
--- a/telemeta/templates/telemeta/registration/password_change_form.html
+++ b/telemeta/templates/telemeta/registration/password_change_form.html
@@ -1,7 +1,7 @@
 {% extends "telemeta/base.html" %}
 {% load i18n adminmedia %}
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
-{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
+{% block userlinks %}{% url "django-admindocs-docroot" as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
 
 {% block title %}<br />{% trans 'Password change' %}{% endblock %}
 
diff --git a/telemeta/templates/telemeta/registration/password_reset_email.html b/telemeta/templates/telemeta/registration/password_reset_email.html
index f97d2768..e7fbaceb 100644
--- a/telemeta/templates/telemeta/registration/password_reset_email.html
+++ b/telemeta/templates/telemeta/registration/password_reset_email.html
@@ -5,7 +5,7 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url telemeta-password-reset-confirm uidb36=uid token=token %}
+{{ protocol }}://{{ domain }}{% url "telemeta-password-reset-confirm" uidb36=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
 
diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index b411caac..3ffb30d1 100644
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -34,16 +34,16 @@ jQuery(document).ready(function(){
 {% block title %}
     <img src="{{ STATIC_URL }}telemeta/images/{{ type }}.png" style="vertical-align:middle" />
     {{ type|capitalize }} :
-    <a href="{% url telemeta-resource-detail type resource.public_id %}">{{ resource.title }}</a>
+    <a href="{% url "telemeta-resource-detail" type resource.public_id %}">{{ resource.title }}</a>
 {% endblock %}
 
 {% block title_buttons %}
   <div class="fixedWidthAsPlayer">
     {% if perms.telemeta.change_mediacorpus or perms.telemeta.change_mediafonds %}
-      <a href="{% url telemeta-resource-edit type resource.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
+      <a href="{% url "telemeta-resource-edit" type resource.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
     {% endif %}
     {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
-      <a href="{% url telemeta-resource-copy type resource.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
+      <a href="{% url "telemeta-resource-copy" type resource.public_id %}" class="component_icon button icon_copy">{% trans "Copy" %}</a>
     {% endif %}
     {% if user.is_authenticated %}
     <a href="#" id ="_add_to_playlist" class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
@@ -68,11 +68,11 @@ jQuery(document).ready(function(){
               {% endfor %}
               {% for parent in parents %}
               <dt>{% trans parent.element_type|capitalize %}</dt>
-              <dd><a href="{% url telemeta-resource-detail parent.element_type parent.public_id %}">{{ parent.title }}</a></dd>
+              <dd><a href="{% url "telemeta-resource-detail" parent.element_type parent.public_id %}">{{ parent.title }}</a></dd>
                {% endfor %}
               {% if last_revision %}
                <dt>{% trans "Last modification" %}</dt>
-               <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
+               <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url "telemeta-profile-detail" last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
               {% endif %}
             </dl>
 
@@ -98,9 +98,9 @@ jQuery(document).ready(function(){
 {% endblock %}
 
 {% block delete %}
-<a href="{% url telemeta-resource-dublincore type resource.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
+<a href="{% url "telemeta-resource-dublincore" type resource.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaresource %}
- <a href="#" onclick="if(confirm(gettrans('delete the resource permanently?'))){window.location.href='{% url telemeta-resource-delete type resource.public_id %}';};return false;"
+ <a href="#" onclick="if(confirm(gettrans('delete the resource permanently?'))){window.location.href='{% url "telemeta-resource-delete" type resource.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
 {% endblock %}
diff --git a/telemeta/templates/telemeta/resource_detail_dc.html b/telemeta/templates/telemeta/resource_detail_dc.html
index ec5c0754..98e31a59 100644
--- a/telemeta/templates/telemeta/resource_detail_dc.html
+++ b/telemeta/templates/telemeta/resource_detail_dc.html
@@ -11,9 +11,9 @@
 {% endblock %}
 
 {% block delete %}
- <a class="component_icon button icon_previous" style="float:left;margin-top:0.5em;margin-bottom:1em" href="{% url telemeta-resource-detail type resource.public_id %}">{% trans "Normal View" %}</a>
+ <a class="component_icon button icon_previous" style="float:left;margin-top:0.5em;margin-bottom:1em" href="{% url "telemeta-resource-detail" type resource.public_id %}">{% trans "Normal View" %}</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaresource %}
- <a href="#" onclick="if(confirm(gettrans('delete the resource permanently?'))){window.location.href='{% url telemeta-resource-delete type resource.public_id %}';};return false;"
+ <a href="#" onclick="if(confirm(gettrans('delete the resource permanently?'))){window.location.href='{% url "telemeta-resource-delete" type resource.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
 {% endblock %}
diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html
index fab6631e..d3499e8c 100644
--- a/telemeta/templates/telemeta/resource_edit.html
+++ b/telemeta/templates/telemeta/resource_edit.html
@@ -6,7 +6,7 @@
 <img src="{{ STATIC_URL }}telemeta/images/{{ type }}.png" style="vertical-align:middle" /> {{ type }} : {{ resource }}
 {% endblock %}
 {% block title_buttons %}
-    <a href="{% url telemeta-resource-detail type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    <a href="{% url "telemeta-resource-detail" type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
     <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
     {% endif %}
@@ -29,11 +29,11 @@
        {% endfor %}
       <tr>
           <td style="padding-top: 1em">{% trans "Related media" %}:</td>
-          <td style="padding-top: 1em"><a href="{% url telemeta-resource-related_edit type resource.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
+          <td style="padding-top: 1em"><a href="{% url "telemeta-resource-related_edit" type resource.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
       </tr>
        </table>
         <div align="center" style="margin-top:3ex;">
-         <a href="{% url telemeta-resource-detail type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+         <a href="{% url "telemeta-resource-detail" type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
          {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
          <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
          {% endif %}
diff --git a/telemeta/templates/telemeta/resource_list.html b/telemeta/templates/telemeta/resource_list.html
index 3f3f2a2a..feda1ae1 100644
--- a/telemeta/templates/telemeta/resource_list.html
+++ b/telemeta/templates/telemeta/resource_list.html
@@ -10,7 +10,7 @@
 
 {% block title_buttons %}
     {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
-      <a href="{% url telemeta-resource-add type %}" class="component_icon button icon_add">{% trans "Add" %}</a>
+      <a href="{% url "telemeta-resource-add" type %}" class="component_icon button icon_add">{% trans "Add" %}</a>
     {% endif %}
 {% endblock %}
 
diff --git a/telemeta/templates/telemeta/resource_related_edit.html b/telemeta/templates/telemeta/resource_related_edit.html
index 8e41764a..d787dcec 100644
--- a/telemeta/templates/telemeta/resource_related_edit.html
+++ b/telemeta/templates/telemeta/resource_related_edit.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block title_buttons %}
- <a href="{% url telemeta-resource-detail type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="{% url "telemeta-resource-detail" type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
  <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
 
@@ -36,7 +36,7 @@
        <br />
     {% endfor %}
       <div align="center">
-        <a href="{% url telemeta-resource-detail type resource.public_id %}"
+        <a href="{% url "telemeta-resource-detail" type resource.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
diff --git a/telemeta/templates/telemeta/search_criteria.html b/telemeta/templates/telemeta/search_criteria.html
index 41fbe26a..3477c004 100644
--- a/telemeta/templates/telemeta/search_criteria.html
+++ b/telemeta/templates/telemeta/search_criteria.html
@@ -32,7 +32,7 @@ function update_period(source, from_field, to_field) {
 }
 
 $(document).ready(function () {
-    $('#location').autocomplete('{% url telemeta-complete-location %}', {
+    $('#location').autocomplete('{% url "telemeta-complete-location" %}', {
         max: 20,
         formatResult: function(data) {
             return data[0].replace(/ *\([0-9]+.*\) *$/, '');
@@ -64,7 +64,7 @@ $(document).ready(function() {
 {% endblock %}
 
 {% block content %}
-<form action="{% url telemeta-search %}" id="searchform">{% csrf_token %}
+<form action="{% url "telemeta-search" %}" id="searchform">{% csrf_token %}
 <fieldset>
 
     <p>
diff --git a/telemeta/templates/telemeta/search_results.html b/telemeta/templates/telemeta/search_results.html
index 0d6ce317..e2e662ef 100644
--- a/telemeta/templates/telemeta/search_results.html
+++ b/telemeta/templates/telemeta/search_results.html
@@ -10,12 +10,12 @@
 
 {% block title_buttons %}
     {% ifequal type 'items' %}
-     <a href="{% url telemeta-search-items %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a>
-     <a href="{% url telemeta-search-items %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
+     <a href="{% url "telemeta-search-items" %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a>
+     <a href="{% url "telemeta-search-items" %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
     {% endifequal %}
     {% ifequal type 'collections' %}
-     <a href="{% url telemeta-search-collections %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a>
-     <a href="{% url telemeta-search-collections %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
+     <a href="{% url "telemeta-search-collections" %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a>
+     <a href="{% url "telemeta-search-collections" %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a>
     {% endifequal %}
 {% endblock %}
 
@@ -64,7 +64,7 @@
 {% endif %}
 
 {% ifequal type 'items' %}
-<p><b>Items ({{items_num}}) | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a></b></p>
+<p><b>Items ({{items_num}}) | <a href="{% url "telemeta-search-collections" %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url "telemeta-search-corpus" %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url "telemeta-search-fonds" %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a></b></p>
   {% with object_list as items %}
    <div class="fullpage">
       {% include "telemeta/inc/mediaitem_list.html" %}
@@ -73,7 +73,7 @@
 {% endifequal %}
 
 {% ifequal type 'collections' %}
-<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | Collections ({{collections_num}}) | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a>
+<p><b><a href="{% url "telemeta-search-items" %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | Collections ({{collections_num}}) | <a href="{% url "telemeta-search-corpus" %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url "telemeta-search-fonds" %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a>
   </b></p>
   {% with object_list as collections %}
    <div class="fullpage">
@@ -83,12 +83,12 @@
 {% endifequal %}
 
 {% if type == 'corpus' %}
-<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | Corpus ({{corpus_num}}) | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a>
+<p><b><a href="{% url "telemeta-search-items" %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url "telemeta-search-collections" %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | Corpus ({{corpus_num}}) | <a href="{% url "telemeta-search-fonds" %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a>
 </b></p>
 {% endif %}
 
 {% if type == 'fonds' %}
-<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | Fonds ({{fonds_num}})
+<p><b><a href="{% url "telemeta-search-items" %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url "telemeta-search-collections" %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url "telemeta-search-corpus" %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | Fonds ({{fonds_num}})
 </b></p>
 {% endif %}
 
diff --git a/telemeta/urls.py b/telemeta/urls.py
index deb519b2..a38d0f9b 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -34,9 +34,10 @@
 # Authors: Olivier Guilyardi <olivier@samalyse.com>
 #          Guillaume Pellerin <yomguy@parisson.com>
 
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from django.conf import settings
-from django.views.generic.simple import redirect_to
+from django.views.generic import RedirectView
+from django.views.generic.list import ListView
 from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFonds
 from telemeta.views import HomeView, AdminView, CollectionView, ItemView, \
                             InstrumentView, InstrumentAliasView, PlaylistView, ProfileView, GeoView, \
@@ -78,10 +79,10 @@ urlpatterns = patterns('',
     url(r'^$', home_view.home, name="telemeta-home"),
 
     # items
-    url(r'^archives/items/$', 'django.views.generic.list_detail.object_list',
-        dict(all_items, paginate_by=20, template_name="telemeta/mediaitem_list.html"),
+    url(r'^archives/items/$', ListView.as_view(queryset=MediaItem.objects.enriched().order_by('code', 'old_code')),
+        dict(paginate_by=20, template_name="telemeta/mediaitem_list.html"),
         name="telemeta-items"),
-    url(r'^archives/items_sound/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/items_sound/$', ListView.as_view(),
         dict(all_items_sound, paginate_by=20, template_name="telemeta/mediaitem_list.html"), name="telemeta-items-sound"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/$', item_view.item_detail,
         name="telemeta-item-detail"),
@@ -128,21 +129,20 @@ urlpatterns = patterns('',
     # Markers
     url(r'^archives/markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"),
     # FIXME: need all paths
-    url(r'^items/(?P<path>[A-Za-z0-9._-s/]+)/$', redirect_to, {'url': '/archives/items/%(path)s/', 'permanent': False}, name="telemeta-item-redir"),
-    url(r'^archives/items_unpublished/$', 'django.views.generic.list_detail.object_list',
+    url(r'^items/(?P<path>[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(), {'url': '/archives/items/%(path)s/', 'permanent': False}, name="telemeta-item-redir"),
+    url(r'^archives/items_unpublished/$', ListView.as_view(),
         dict(all_items_unpublished, paginate_by=20, template_name="telemeta/mediaitem_list.html"), name="telemeta-items-unpublished"),
-    url(r'^archives/items_published/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/items_published/$', ListView.as_view(),
         dict(all_items_published, paginate_by=20, template_name="telemeta/mediaitem_list.html"), name="telemeta-items-published"),
 
     # collections
-    url(r'^archives/collections/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/collections/$', ListView.as_view(),
         dict(all_collections, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections"),
-    url(r'^archives/collections_unpublished/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/collections_unpublished/$', ListView.as_view(),
         dict(all_collections_unpublished, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-unpublished"),
-    url(r'^archives/collections_published/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/collections_published/$', ListView.as_view(),
         dict(all_collections_published, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-published"),
-    url(r'^archives/collections/?page=(?P<page>[0-9]+)$',
-        'django.views.generic.list_detail.object_list',
+    url(r'^archives/collections/?page=(?P<page>[0-9]+)$', ListView.as_view(),
         dict(all_collections, paginate_by=20)),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/$', collection_view.collection_detail,
         dict(template="telemeta/collection_detail.html"), name="telemeta-collection-detail"),
@@ -169,19 +169,19 @@ urlpatterns = patterns('',
     url(r'^archives/collections/(?P<collection_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/download/$', collection_view.related_media_collection_download, name="telemeta-collection-related-download"),
 
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/related_edit/$', collection_view.related_media_edit,  dict(template='telemeta/collection_related_edit.html'), name="telemeta-collection-related_edit"),
-    url(r'^archives/collections_sound/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/collections_sound/$', ListView.as_view(),
         dict(all_collections_sound, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-sound"),
     # FIXME: need all paths
-    url(r'^collections/(?P<path>[A-Za-z0-9._-s/]+)/$', redirect_to, {'url': '/archives/collections/%(path)s/', 'permanent': False}, name="telemeta-collection-redir"),
+    url(r'^collections/(?P<path>[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(), {'url': '/archives/collections/%(path)s/', 'permanent': False}, name="telemeta-collection-redir"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/package/$', CollectionPackageView.as_view(),
         name="telemeta-collection-package"),
     # RESOURCES
     # Corpus list
-    url(r'^archives/corpus/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/corpus/$', ListView.as_view(),
         dict(all_corpus, paginate_by=20, template_name="telemeta/resource_list.html", extra_context={'type':'corpus'}), name="telemeta-corpus"),
 
     # Fonds list
-    url(r'^archives/fonds/$', 'django.views.generic.list_detail.object_list',
+    url(r'^archives/fonds/$', ListView.as_view(),
         dict(all_fonds, paginate_by=20, template_name="telemeta/resource_list.html", extra_context={'type':'fonds'}), name="telemeta-fonds"),
 
     # Generic resource
@@ -351,7 +351,7 @@ urlpatterns = patterns('',
     # JSON RPC
     url(r'json/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'),
     # for the graphical browser/web console only, omissible
-    # url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"),
+    #url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"),
 
     # Playlists
     url(r'^playlists/(?P<public_id>[a-zA-Z0-9]+)/(?P<resource_type>[a-zA-Z0-9]+)/csv/$', playlist_view.playlist_csv_export, name="telemeta-playlist-csv-export"),
diff --git a/telemeta/views/core.py b/telemeta/views/core.py
index 21d637b5..c86cf177 100644
--- a/telemeta/views/core.py
+++ b/telemeta/views/core.py
@@ -55,7 +55,6 @@ from django import template
 from django.http import HttpResponse, HttpResponseRedirect
 from django.http import Http404
 from django.shortcuts import render_to_response, redirect, get_object_or_404
-from django.views.generic import list_detail
 from django.views.generic import *
 from django.conf import settings
 from django.contrib import auth
@@ -263,4 +262,4 @@ def get_room(content_type=None, id=None, name=None):
     else:
         room = rooms[0]
     return room
-    
+
-- 
2.39.5