Merge branch 'django-1.5' of https://github.com/Trim/papillon into v0.5

1 files changed, 4 insertions, 4 deletions

diff --git a/papillon/templates/edit.html b/papillon/templates/edit.html
index 2f77a7e..647700d 100644
--- a/papillon/templates/edit.html
+++ b/papillon/templates/edit.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block fullscript %}
-<script type="text/javascript" src="{%url admin_i18n%}"></script>
+<script type="text/javascript" src="{% url 'admin_i18n' %}"></script>
 <script type="text/javascript" src="{{admin_url}}js/core.js"></script>
 <script type="text/javascript" src="{{admin_url}}js/admin/RelatedObjectLookups.js"></script>
 {{ form.media }}
@@ -16,7 +16,7 @@
   <tr>
    <td><label>{% trans "Poll url" %}</label></td>
    <td>
-<a href='{% url poll poll.base_url%}'>{{ base_url }}</a>
+<a href="{% url 'poll' poll.base_url %}">{{ base_url }}</a>
    </td>
    <td class='form_description'><p>
 {% trans "Copy this address and send it to voters who want to participate to this poll" %}
@@ -25,7 +25,7 @@
   <tr>
    <td><label>{% trans "Administration url" %}</label></td>
    <td>
-<a href='{% url edit poll.admin_url %}'>{{ edit_url }}</a>
+<a href="{% url 'edit' poll.admin_url %}">{{ edit_url }}</a>
    </td>
    <td class='form_description'><p>
    {% trans "Address to modify the current poll" %}
@@ -34,7 +34,7 @@
   <tr>
    <td><label>{% trans "Choices administration url" %}</label></td>
    <td>
-<a href='{% url edit_choices_admin poll.admin_url %}'>{{choices_url }}</a>
+<a href="{% url 'edit_choices_admin' poll.admin_url %}">{{choices_url }}</a>
    </td>
    <td class='form_description'><p>
    {% trans "Address to modify choices of the current poll." %}