From e41e52768085a81b1b5d48f5f0583b6449179fa8 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 25 Oct 2011 00:17:19 +0200 Subject: Correct hard link in templates and views (closes #309) --- papillon/templates/base.html | 4 ++-- papillon/templates/category.html | 2 +- papillon/templates/create.html | 2 +- papillon/templates/edit.html | 14 +++++++------- papillon/templates/editChoices.html | 2 +- papillon/templates/editChoicesAdmin.html | 10 +++++----- papillon/templates/editChoicesUser.html | 8 ++++---- papillon/templates/main.html | 6 +++--- papillon/templates/vote.html | 14 +++++++------- 9 files changed, 31 insertions(+), 31 deletions(-) (limited to 'papillon/templates') 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"> - + {% block title %}Papillon{% endblock %} {% block fullscript %}{% endblock %} @@ -13,7 +13,7 @@ {% for language in languages%}{{language.1}}{% endfor %}
-

Papillon

+

Papillon

{% 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 %}

{%trans "Polls"%}

{%endif%} {% for poll in polls %}
-

{{poll.name}}

+

{{poll.name}}

{{poll.description|safe}}

{% 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 %}

{% trans "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 %} - - - + + + {{ form.media }} {% endblock %} {% block content %}

{% trans "Edit poll" %}

- +
-{{root_url}}poll/{{poll.base_url}} +{% url poll poll.base_url%}

{% trans "Copy this address and send it to voters who want to participate to this poll" %} @@ -25,7 +25,7 @@

-{{root_url}}edit/{{poll.admin_url}} +{% url edit poll.admin_url %}

{% trans "Address to modify the current poll" %} @@ -34,7 +34,7 @@

-{{root_url}}editChoicesAdmin/{{poll.admin_url}} +{% url edit_choices_admin poll.admin_url %}

{% 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 @@

{% trans "New choice" %}

{%if form_new_choice.errors %}

{{form_new_choice.errors}}

{%endif%} - + {{form_new_choice.poll}} {{form_new_choice.order}} 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 %} - - - + + + {{ 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 %}

{% else %}

{% trans "Complete/Finalise the poll" %}

-

+

{% endif %} {% include 'editChoices.html' %} {% if choices %} @@ -27,7 +27,7 @@ {% for choice in choices %} - + {{choice.form.poll}}{{choice.form.order}} {%if not poll.dated_choices%}{%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 %} - - - + + + {{ form_new_choice.media }} {% endblock %} {% block content %} -

{%trans "Return to the poll"%}

+

{%trans "Return to the poll"%}

{% trans "Choices" %}

{% if choices %}
{% trans "Delete?"%}
+ / -
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 %}

{{error}}

{%endif%} -

{%trans "Create a poll"%}

+

{%trans "Create a poll"%}

{% trans "Create a new sondage for take a decision, find a date for a meeting, etc." %} {% trans "It's here!" %}

{% if polls %}

{%trans "Public polls"%}

{%endif%} {% for poll in polls %}
-

{{poll.name}}

+

{{poll.name}}

{{poll.description|safe}}

{% endfor %} {% if categories %}

{%trans "Categories"%}

{% endif %} {% for category in categories %} -

{{category.name}}

+

{{category.name}}

{% 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 %} - - - + + + {{ form_comment.media }} {% endblock %} @@ -14,7 +14,7 @@ {% if error %}

{{ error }}

{% endif %} {% if not poll.open %}

{% trans "The current poll is closed."%}

{% endif %}

{{ poll.description|safe }}

- +
@@ -119,15 +119,15 @@
{%if poll.opened_admin%} -

{%trans "Add a new choice to this poll?"%}

{%endif%} +

{%trans "Add a new choice to this poll?"%}

{%endif%}
{%if hide_vote%}

{% trans "You have already vote? You are enough wise not to be influenced by other votes? You can display result by clicking" %} {% trans "here" %}.

{%else%} -

{% trans "Remain informed of poll evolution:" %} {%trans "syndication"%}

{%endif%} +

{% trans "Remain informed of poll evolution:" %} {%trans "syndication"%}

{%endif%}
{%if not hide_vote%}

{%trans "Comments"%}

- {%if poll.open%}
+ {%if poll.open%}
-- cgit v1.2.3