X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Fvote.html;h=c7874209dd5904b57bae9efe353bf9e4da81d61b;hb=f43f9263fc772dd9efcaeb62eff129d847ff9e86;hp=b6ea499c9451c3a9de94ed03f23af98a16d590b5;hpb=0b580c50a8568e6927e1914d2408c296a9b30823;p=cavote.git

diff --git a/templates/vote.html b/templates/vote.html
index b6ea499..c787420 100644
--- a/templates/vote.html
+++ b/templates/vote.html
@@ -3,7 +3,6 @@
 <div class="row">
 <div class="span9">
 <h2 class='page-header'>{{ vote.title }}</h2>
-
 {% if not vote.is_transparent %}
 <div class="alert alert-info">Ce sondage n'est pas transparent, vous ne pouvez pas voir les votes des autres.</div>
 {% endif %}
@@ -15,7 +14,9 @@
       {% for choice in choices %}
       <th>{{ choice.name }}</th>
       {% endfor %}
+      {% if 'user' in session %}
       <th></th>
+      {% endif %}
     </tr>
   </thead>
 
@@ -30,7 +31,9 @@
       {% else %}
       <td class="no"></td>{% endif %}
       {% endfor %}
-      <td>{% if 'user' in session and user.userid == session.user.id %}<a href="{{ url_for('vote_deletechoices', idvote=vote.id, iduser=session.user.id) }}" class="btn btn-mini btn-danger" title="Supprimer"><i class="icon-remove icon-white"></a>{% endif %}</td>
+      {% if 'user' in session %}
+      <td>{% if user.userid == session.user.id %}<a href="{{ url_for('vote_deletechoices', idvote=vote.id, iduser=session.user.id) }}" class="btn btn-mini btn-danger" title="Supprimer"><i class="icon-remove icon-white"></a>{% endif %}</td>
+      {% endif %}
     </tr>
   {% endif %}
   {% endfor %}
@@ -41,11 +44,11 @@
       <th><input type='text' name="username" value='{{ session.user.name }}' disabled /></th>
       {% if vote.is_multiplechoice %}
       {% for choice in choices %}
-      <td><input type='checkbox' name="{{ choice.id }}" /></td>
+      <td><input type='checkbox' name="{{ choice.id }}" value="{{ choice.id }}" /></td>
       {% endfor %}
       {% else %}
       {% for choice in choices %}
-      <td><input type='radio' name="{{ choice.id }}" /></td>
+      <td><input type='radio' name="choice" value="{{ choice.id }}" /></td>
       {% endfor %}
       {% endif %}
       <td><input type="submit" class="btn btn-primary" value="OK" /></td>
@@ -61,7 +64,9 @@
       {% for choice in choices %}
       <td>{{ choice.nb }}</td>
       {% endfor %}
+      {% if 'user' in session %}
       <td></td>
+      {% endif %}
     </tr>
   {% endif %}
   </tfoot>
@@ -70,6 +75,15 @@
 
 <div class="span3">
 <h3>Informations</h3>
+{% if vote.nb_votes == 0 %}
+<div class="progress progress-striped progress-danger">
+  <div class="bar" style="width: 100%;"><strong>{{ vote.nb_votes }} / {{ vote.max_votes }}</strong></div>
+</div>
+{% else %}
+<div class="progress progress-striped {% if vote.nb_votes == vote.max_votes %}progress-success{% endif %}">
+  <div class="bar" style="width: {{ vote.percent }}%;"><strong>{{ vote.nb_votes }} / {{ vote.max_votes }}</strong></div>
+</div>
+{% endif %}
 <dl class="dl-horizontal">
   <dt>Publié par <dd><code>maethor</code>
   <dt>Début le <dd><code>{{ vote.date_begin }}</code>