1 files changed, 10 insertions, 9 deletions
diff --git a/templates/vote.html b/templates/vote.html
index 803813e..21b8a0d 100644
--- a/templates/vote.html
+++ b/templates/vote.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block content %}
- <h2>{{poll_type_name}} - {{poll.name}}</h2>
+ <h2>{%if poll.category %}{{poll.category.name}} - {%endif%}{{poll.name}}</h2>
 {% 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 }}</p>
@@ -14,6 +14,7 @@
   <td class='simple'></td>
   {% for choice in choices %}<th>{{choice.name}}{% if choice.limit %} ({% trans "max" %} {{choice.limit}}){%endif%}</th>
  {% endfor %}</tr>
+ {% if not hide_vote %}
  {% for voter in voters %}<tr{% if voter.highlight %} class='highlighted_voter'{% endif %}>
  {% ifequal current_voter_id voter.id %}
   <input type='hidden' name='voter' value='{{voter.id}}'/>
@@ -52,8 +53,8 @@
   {%endfor%}
   {%endifequal%}
  </tr>{%endfor%}
- {%if not current_voter_id%}
- {% if poll.open %}
+ {%endif%}
+ {%if not current_voter_id%}{% if poll.open %}
  <tr>
   <td class='simple'></td>
   <td><input type='text' name='author_name'/></td>
@@ -73,13 +74,12 @@
   {% endif %}
   </td>{%endfor%}
  </tr>
- {%endif%}
- {%endif%}
- <tr id='sum'>
+ {%endif%}{%endif%}
+ {% if not hide_vote %}<tr id='sum'>
   <td class='simple'></td><th>{% trans "Sum" %}</th>
   {% for choice in choices %}<td{%if choice.highlight %} class='highlight'{%endif%}>{{choice.sum}}</td>
   {% endfor %}
- </tr>
+ </tr>{%endif%}
  </table>
  {% if poll.open %}
  <input type='submit' value='{%if current_voter_id%}{% trans "Edit" %}{%else%}{% trans "Participate" %}{%endif%}'/>
@@ -87,7 +87,8 @@
  </div>
  <hr class='spacer'/>
  </form>
- <div id='syndication'>
-  {% trans "Remain informed of poll evolution:" %} <a href="/papillon/feeds/poll/{{poll.base_url}}/">{%trans "Syndication"%}</a>
+ <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="http://{{root_url}}feeds/poll/{{poll.base_url}}/">{%trans "Syndication"%}</a></p>{%endif%}
  </div>
 {% endblock %}