From 599c62e4e77aaa4898b9ba690e39b1102ac09a71 Mon Sep 17 00:00:00 2001 From: etienne Date: Sat, 6 Dec 2008 01:21:48 +0000 Subject: Highlight prefered choice - Open/close a poll - Css modification --- templates/vote.html | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'templates/vote.html') diff --git a/templates/vote.html b/templates/vote.html index e000bc9..803813e 100644 --- a/templates/vote.html +++ b/templates/vote.html @@ -2,9 +2,10 @@ {% load i18n %} {% block content %} -

{{poll_type_name}} - {{poll_name}}

-{% if error %}

{{ error }}

{% endif %} -

{{poll_desc}}

+

{{poll_type_name}} - {{poll.name}}

+{% if error %}

{{ error }}

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

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

{% endif %} +

{{ poll.description }}

@@ -20,13 +21,13 @@ {% for vote in voter.votes %}{%endfor%} - {%else%} + {%else%} {% for vote in voter.votes %}{%endfor%} {%if not current_voter_id%} + {% if poll.open %} {%for choice in choices%}{%endfor%} {%endif%} + {%endif%} - {% for choice in choices %} + {% for choice in choices %}{{choice.sum}} {% endfor %}
{% if vote.choice.available or vote.value %} - {% ifequal poll_type 'P' %} + {% ifequal poll.type 'P' %} {% endifequal %} - {% ifequal poll_type 'O' %} + {% ifequal poll.type 'O' %} {% endifequal %} - {% ifequal poll_type 'B' %} + {% ifequal poll.type 'B' %} {% trans "Edit" %}{% if poll.open %}{% trans "Edit" %}{%else%} {%endif%} {{voter.user.name}} - {%ifequal poll_type 'B'%} + {%ifequal poll.type 'B'%} {%for VOT in VOTE%} {%ifequal VOT.0 vote.value%}{{VOT.1.1}}{%endifequal%}{%endfor%} {%else%} @@ -52,16 +53,17 @@ {%endifequal%}
{% if choice.available %} - {% ifequal poll_type 'P' %} + {% ifequal poll.type 'P' %} {% endifequal %} - {% ifequal poll_type 'O' %} + {% ifequal poll.type 'O' %} {% endifequal %} - {% ifequal poll_type 'B' %} + {% ifequal poll.type 'B' %} @@ -72,17 +74,20 @@
{% trans "Sum" %}{{choice.sum}}
+ {% if poll.open %} + {% endif %}

- {% trans "Remain informed of poll evolution:" %} {%trans "Syndication"%} + {% trans "Remain informed of poll evolution:" %} {%trans "Syndication"%}
{% endblock %} -- cgit v1.2.3