Users can see waiting votes, votes can be terminated

[cavote.git] / templates / votes.html

diff --git a/templates/votes.html b/templates/votes.html
index d770c2b..e52b94b 100644 (file)
--- a/templates/votes.html
+++ b/templates/votes.html
@@ -4,17 +4,17 @@ Liste des votes
 {% endblock %}
 {% block body %}
   {% for vote in votes %}
-  <article>
+  <div>
     <div class="row well">
       <div class="span4">
-        <h3><a href="{{ url_for('vote', idvote=vote.id) }}">{{ vote.title }}</a></h3>
-        <div class="progress progress-striped">
-          <div class="bar" style="width: 60{{ vote.percent }}%;"></div>
+        <h3><a href="{{ url_for('vote', idvote=vote.voteid) }}">{{ vote.title }}</a></h3>
+        <div class="progress progress-striped {% if vote.nb_votes == vote.max_votes %}progress-success{% endif %}">
+          <div class="bar" style="width: {{ vote.percent }}%;"></div>
         </div>
       </div>
       <div class="span3">
         <h4>Deadline : {{ vote.date_end }} </h4>
-        <h4>Groupe : {{ vote.rolename }}</h4>
+        <h4>Groupe : {{ vote.groupname }}</h4>
         <h4>Categorie : {{ vote.category }}</h4>
       </div>
       <div class="span3">
@@ -23,7 +23,7 @@ Liste des votes
       {{ vote.description|safe }}
       </p>
     </div>
-  </article>
+  </div>
   {% else %}
   <div class="alert">Il n'y a pas encore de votes. Désolé.</div>
   {% endfor %}