9 files changed, 31 insertions, 31 deletions
diff --git a/papillon/templates/base.html b/papillon/templates/base.html
index b673f24..5da20fb 100644
--- a/papillon/templates/base.html
+++ b/papillon/templates/base.html
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
- <link rel="stylesheet" href="{{root_url}}static/styles.css" />
+ <link rel="stylesheet" href="{{media_url}}styles.css" />
  <title>{% block title %}Papillon{% endblock %}</title>
  {% block fullscript %}{% endblock %}
 </head>
@@ -13,7 +13,7 @@
 <span id='languages'>{% for language in languages%}<a href='?language={{language.0}}'>{{language.1}}</a>{% endfor %}</span>
 </div>
 <div id="top">
- <h1><a href='{{root_url}}'>Papillon</a></h1>
+ <h1><a href='{% url index %}'>Papillon</a></h1>
 </div>
 <div id="content">
 {% block content %}{% endblock %}
diff --git a/papillon/templates/category.html b/papillon/templates/category.html
index 55aa084..f38743a 100644
--- a/papillon/templates/category.html
+++ b/papillon/templates/category.html
@@ -8,7 +8,7 @@
 {% if polls %}<h2>{%trans "Polls"%}</h2>{%endif%}
 {% for poll in polls %}
 <div class='poll-description'>
- <p><a href='{{root_url}}poll/{{poll.base_url}}'>{{poll.name}}</a></p>
+ <p><a href='{% url poll poll.base_url%}'>{{poll.name}}</a></p>
  <p>{{poll.description|safe}}</p>
 </div>
 {% endfor %}
diff --git a/papillon/templates/create.html b/papillon/templates/create.html
index 7c3d2b3..224ae78 100644
--- a/papillon/templates/create.html
+++ b/papillon/templates/create.html
@@ -9,7 +9,7 @@
 
 {% block content %}
  <h2>{% trans "New poll" %}</h2>
-<form action="" method="post">
+<form action="." method="post">
 <table class='new_poll'>
   {% for field in form %}
   {% if field.is_hidden %}
diff --git a/papillon/templates/edit.html b/papillon/templates/edit.html
index 7ef4f14..b2b38a5 100644
--- a/papillon/templates/edit.html
+++ b/papillon/templates/edit.html
@@ -3,20 +3,20 @@
 {% load i18n %}
 
 {% block fullscript %}
-<script type="text/javascript" src="{{root_url}}admin/jsi18n/"></script>
-<script type="text/javascript" src="{{root_url}}media/js/core.js"></script>
-<script type="text/javascript" src="{{root_url}}media/js/admin/RelatedObjectLookups.js"></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 }}
 {% endblock %}
 
 {% block content %}
  <h2>{% trans "Edit poll" %}</h2>
-<form action="" method="post">
+<form action="." method="post">
 <table class='new_poll'>
   <tr>
    <td><label>{% trans "Poll url" %}</label></td>
    <td>
-<a href='{{root_url}}poll/{{poll.base_url}}'>{{root_url}}poll/{{poll.base_url}}</a>
+<a href='{% url poll poll.base_url%}'>{% url poll poll.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='{{root_url}}edit/{{poll.admin_url}}'>{{root_url}}edit/{{poll.admin_url}}</a>
+<a href='{% url edit poll.admin_url %}'>{% url edit poll.admin_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='{{root_url}}editChoicesAdmin/{{poll.admin_url}}'>{{root_url}}editChoicesAdmin/{{poll.admin_url}}</a>
+<a href='{% url edit_choices_admin poll.admin_url %}'>{% url edit_choices_admin poll.admin_url %}</a>
    </td>
    <td class='form_description'><p>
    {% trans "Address to modify choices of the current poll." %}
diff --git a/papillon/templates/editChoices.html b/papillon/templates/editChoices.html
index 1082d30..7e059a8 100644
--- a/papillon/templates/editChoices.html
+++ b/papillon/templates/editChoices.html
@@ -3,7 +3,7 @@
 
 <h2>{% trans "New choice" %}</h2>
 {%if form_new_choice.errors %} <p class='error'>{{form_new_choice.errors}}</p>{%endif%}
-<form action="{{admin_url}}" method="post">
+<form action="." method="post">
 {{form_new_choice.poll}}
 {{form_new_choice.order}}
 <table class='new_poll'>
diff --git a/papillon/templates/editChoicesAdmin.html b/papillon/templates/editChoicesAdmin.html
index b04b0ec..6510dcc 100644
--- a/papillon/templates/editChoicesAdmin.html
+++ b/papillon/templates/editChoicesAdmin.html
@@ -3,9 +3,9 @@
 {% load i18n %}
 
 {% block fullscript %}
-<script type="text/javascript" src="{{root_url}}admin/jsi18n/"></script>
-<script type="text/javascript" src="{{root_url}}media/js/core.js"></script>
-<script type="text/javascript" src="{{root_url}}media/js/admin/RelatedObjectLookups.js"></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_new_choice.media }}
 {% endblock %}
 
@@ -14,7 +14,7 @@
 {% blocktrans %}As long as no options were added to the poll, it will not be available.{% endblocktrans %}
 </p>{% else %}
 <h2>{% trans "Complete/Finalise the poll" %}</h2>
-<p><a href='{{root_url}}edit/{{poll.admin_url}}'><button>{% trans "Next"%}</button></a></p>
+<p><a href='{% url edit poll.admin_url%}'><button>{% trans "Next"%}</button></a></p>
 {% endif %}
 {% include 'editChoices.html' %}
 {% if choices %}
@@ -27,7 +27,7 @@
    <th>{% trans "Delete?"%}</th>
   </tr>
   {% for choice in choices %}
- <form action="" method="post">
+ <form action="." method="post">
   {{choice.form.poll}}{{choice.form.order}}<tr>
    {%if not poll.dated_choices%}<td><a href='?up_choice={{choice.id}}' class='arrow'>+</a>
    / <a href='?down_choice={{choice.id}}' class='arrow'>-</a></td>{%endif%}
diff --git a/papillon/templates/editChoicesUser.html b/papillon/templates/editChoicesUser.html
index 0d2b2c1..47d6a52 100644
--- a/papillon/templates/editChoicesUser.html
+++ b/papillon/templates/editChoicesUser.html
@@ -3,14 +3,14 @@
 {% load i18n %}
 
 {% block fullscript %}
-<script type="text/javascript" src="{{root_url}}admin/jsi18n/"></script>
-<script type="text/javascript" src="{{root_url}}media/js/core.js"></script>
-<script type="text/javascript" src="{{root_url}}media/js/admin/RelatedObjectLookups.js"></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_new_choice.media }}
 {% endblock %}
 
 {% block content %}
- <p><a href="{{root_url}}poll/{{poll.base_url}}/">{%trans "Return to the poll"%}</a></p>
+ <p><a href="{% url poll poll.base_url %}">{%trans "Return to the poll"%}</a></p>
 <h2>{% trans "Choices" %}</h2>
 {% if choices %}<table class='new_poll'>
   <tr>
diff --git a/papillon/templates/main.html b/papillon/templates/main.html
index 49088f0..f27a97b 100644
--- a/papillon/templates/main.html
+++ b/papillon/templates/main.html
@@ -3,20 +3,20 @@
 
 {% block content %}
 {% if error %}<p class='error'>{{error}}</p>{%endif%}
-<h2><a href='create'>{%trans "Create a poll"%}</a></h2>
+<h2><a href='{% url create%}'>{%trans "Create a poll"%}</a></h2>
 <p>{% trans "Create a new sondage for take a decision, find a date for a meeting, etc." %} <a href='create'>{% trans "It's here!" %}</a></p>
 
 {% if polls %}<h2>{%trans "Public polls"%}</h2>{%endif%}
 {% for poll in polls %}
 <div class='poll-description'>
- <p><a href='poll/{{poll.base_url}}'>{{poll.name}}</a></p>
+ <p><a href='{% url poll poll.base_url%}'>{{poll.name}}</a></p>
  <p>{{poll.description|safe}}</p>
 </div>
 {% endfor %}
 
 {% if categories %}<h2>{%trans "Categories"%}</h2>{% endif %}
 {% for category in categories %}
-<h3><a href='category/{{category.id}}'>{{category.name}}</a></h3>
+<h3><a href='{% url category category.id%}'>{{category.name}}</a></h3>
 {% endfor %}
 
 {% endblock %}
diff --git a/papillon/templates/vote.html b/papillon/templates/vote.html
index 94d1898..dc384f5 100644
--- a/papillon/templates/vote.html
+++ b/papillon/templates/vote.html
@@ -3,9 +3,9 @@
 {% load get_range %}
 
 {% block fullscript %}
-<script type="text/javascript" src="{{root_url}}admin/jsi18n/"></script>
-<script type="text/javascript" src="{{root_url}}media/js/core.js"></script>
-<script type="text/javascript" src="{{root_url}}media/js/admin/RelatedObjectLookups.js"></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_comment.media }}
 {% endblock %}
 
@@ -14,7 +14,7 @@
 {% if error %}<p class='alert'>{{ error }}</p>{% endif %}
 {% if not poll.open %}<p class='alert'>{% trans "The current poll is closed."%}</p>{% endif %}
  <p>{{ poll.description|safe }}</p>
- <form method='post' action='{{base_url}}'>
+ <form method='post' action='.'>
  <div id='poll_table'>
  <table id='poll'>
  <tr>
@@ -119,15 +119,15 @@
  <hr class='spacer'/>
  </form>
  {%if poll.opened_admin%}
- <p><a href="{{root_url}}editChoicesUser/{{poll.base_url}}/">{%trans "Add a new choice to this poll?"%}</a></p>{%endif%}
+ <p><a href="{% url edit_choices_user poll.base_url %}">{%trans "Add a new choice to this poll?"%}</a></p>{%endif%}
  <div class='footnote'>
  {%if hide_vote%}<p>{% trans "You have already vote? You are enough wise not to be influenced by other votes? You can display result by clicking" %} <a href='?display_result=1'>{% trans "here" %}</a>.</p>{%else%}
- <p>{% trans "Remain informed of poll evolution:" %} <a href="{{root_url}}feeds/poll/{{poll.base_url}}/">{%trans "syndication"%}</a></p>{%endif%}
+ <p>{% trans "Remain informed of poll evolution:" %} <a href="../../feeds/poll/{{poll.base_url}}">{%trans "syndication"%}</a></p>{%endif%}
  </div>
 {%if not hide_vote%}
 <h3>{%trans "Comments"%}</h3>
 <div class='comments'>
- {%if poll.open%}<form method='post' action='{{base_url}}'>
+ {%if poll.open%}<form method='post' action='.'>
  <table class='comment'>
   <tr>
    <td><label for='comment_author'>{% trans "Author name" %}</label></td>