X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Fvote.html;h=8d6e9dd8ad231ad05d07ce7cb04631603fc97d03;hb=e3913800e8bccbdc364b7f54d28a8d8efcfa2e1b;hp=47b1d298c97532f446d0c6fd63685a92bc3d232b;hpb=9a0891ac3f5ae69cd1e276931401516b3213df4c;p=cavote.git

diff --git a/templates/vote.html b/templates/vote.html
index 47b1d29..8d6e9dd 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>
 
@@ -26,11 +27,13 @@
       <th>{% if 'user' in session and user.userid == session.user.id %}<i class="icon-user"></i>{% endif %} {{ user.username }}</th>
       {% for choice in choices %}
       {% if choice.id in user.choices %}
-      <td class="yes">OUI</td>
+      <td class="yes"><i class="icon-ok icon-white"></i></td>
       {% 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">X</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 %}
@@ -39,7 +42,7 @@
     <form class="form-inline" action="{{ url_for('vote', idvote=vote.id) }}" method="post">
     <tr>
       <th><input type='text' name="username" value='{{ session.user.name }}' disabled /></th>
-      {% if vote.is_multiple %}
+      {% if vote.is_multiplechoice %}
       {% for choice in choices %}
       <td><input type='checkbox' name="{{ choice.id }}" /></td>
       {% endfor %}
@@ -61,7 +64,9 @@
       {% for choice in choices %}
       <td>{{ choice.nb }}</td>
       {% endfor %}
+      {% if 'user' in 'session' %}
       <td></td>
+      {% endif %}
     </tr>
   {% endif %}
   </tfoot>
@@ -70,11 +75,15 @@
 
 <div class="span3">
 <h3>Informations</h3>
+<strong>Avancement : </strong> {{ vote.nb_votes }} / {{ vote.max_votes }}
+<div class="progress progress-striped {% if vote.nb_votes == vote.max_votes %}progress-success{% endif %}">
+  <div class="bar" style="width: {{ vote.percent }}%;"></div>
+</div>
 <dl class="dl-horizontal">
   <dt>Publié par <dd><code>maethor</code>
   <dt>Début le <dd><code>{{ vote.date_begin }}</code>
   <dt>Deadline le <dd><code>{{ vote.date_end }}</code>
-  <dt>Groupe <dd><code>{{ vote.rolename }}</code>
+  <dt>Groupe <dd><code>{{ vote.groupname }}</code>
   <dt>Catégorie <dd><code>{{ vote.category }}</code>
 </dl>
 <dl>