Prepare for django 1.5

requirements.pip

@@ -1,4 +1,4 @@
-Django==1.4.5
+Django==1.5.1
 South==0.7.6
 django-leaflet-storage==0.2.0
 django_compressor==1.2

umap/templates/leaflet_storage/map_list.html

@@ -3,7 +3,7 @@
 {% for map_inst in maps %}
 <div class="col _35">
     {% map_fragment map_inst %}
-    <div class="tintbox"><strong>{{ map_inst.name }}</strong> — {% if map_inst.description %}«{{ map_inst.description }}» {% endif %}<em>{% if map_inst.owner %}{% trans "Cured by" %} <a href="{% url user_maps map_inst.owner.username %}">{{ map_inst.owner }}</a></em>{% endif %} — <a href="{{ map_inst.get_absolute_url }}">{% trans "See this map!" %}</a></div>
+    <div class="tintbox"><strong>{{ map_inst.name }}</strong> — {% if map_inst.description %}«{{ map_inst.description }}» {% endif %}<em>{% if map_inst.owner %}{% trans "Cured by" %} <a href="{% url 'user_maps' map_inst.owner.username %}">{{ map_inst.owner }}</a></em>{% endif %} — <a href="{{ map_inst.get_absolute_url }}">{% trans "See this map!" %}</a></div>
 </div>
 {% endfor %}
 {% if maps.has_next %}

umap/templates/leaflet_storage/map_update_settings.html

@@ -1,6 +1,6 @@
 {% load umap_tags i18n %}
 <h3>{% trans "Map settings" %}</h3>
-<form action="{% url map_update_settings map.pk %}" method="post" id="map_edit">
+<form action="{% url 'map_update_settings' map.pk %}" method="post" id="map_edit">
     {% csrf_token %}
     {% for field in form %}
         <div class="formbox">

umap/templates/leaflet_storage/map_update_tilelayers.html

@@ -1,6 +1,6 @@
 {% load leaflet_storage_tags i18n %}
 <h3>{% trans "Choose your tilelayer" %}</h3>
-<form action="{% url map_update_tilelayers map.pk %}" method="post" id="map_edit">
+<form action="{% url 'map_update_tilelayers' map.pk %}" method="post" id="map_edit">
     {% csrf_token %}
     {% for tilelayer in tilelayers %}
         <div class="col _6 pile">

umap/templates/registration/login.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 
 <h5>{% trans "Please choose a provider" %}</h5>
 

umap/templates/umap/content.html

@@ -21,7 +21,7 @@
 
 {% block content %}
 <div class="col _35">
-  <form action="{% url search %}" method="GET">
+  <form action="{% url 'search' %}" method="GET">
   <div class="part _29">
     <input name="q" type="search" placeholder="{% trans 'Search maps' %}" value="{{ q|default:"" }}" />
   </div>

umap/templates/umap/navigation.html

@@ -9,14 +9,14 @@
   <section class="part _20 c25_16">
     <ul>
       {% if user.is_authenticated %}
-        <li><a href="{% url user_maps user.username %}">{% trans "My maps" %} ({{ user }})</a></li>
+        <li><a href="{% url 'user_maps' user.username %}">{% trans "My maps" %} ({{ user }})</a></li>
       {% else %}
-        <li><a href="{% url login %}" class="login">{% trans "Log in" %} / {% trans "Sign in" %}</a></li>
+        <li><a href="{% url 'login' %}" class="login">{% trans "Log in" %} / {% trans "Sign in" %}</a></li>
       {% endif %}
-      <li><a href="{% url about %}">{% trans "About" %}</a></li>
+      <li><a href="{% url 'about' %}">{% trans "About" %}</a></li>
       <li class="c25_hide"><a href="mailto:yb@fluv.io">{% trans "Feedback" %}</a></li>
       {% if user.is_authenticated %}
-        <li><a href="{% url logout %}" class="logout">{% trans "Log out" %}</a></li>
+        <li><a href="{% url 'logout' %}" class="logout">{% trans "Log out" %}</a></li>
       {% endif %}
     </ul>
   </section>
@@ -24,7 +24,7 @@
   <section class="right">
     <ul>
       <li class="has-button _5 c20_wide">
-        <a href="{% url map_add %}" data-listen-form="map_edit" class="button create-map">
+        <a href="{% url 'map_add' %}" data-listen-form="map_edit" class="button create-map">
           {% trans "Create a map" %}
         </a>
       </li>

umap/templates/umap/search_bar.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <div class="col _35">
-  <form action="{% url search %}" method="GET">
+  <form action="{% url 'search' %}" method="GET">
   <div class="part _29 c30_24 c25_19 c20_14 c17_11">
     <input name="q" type="search" placeholder="{% trans 'Search maps' %}" value="{{ q|default:"" }}" />
   </div>