X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Fvotes.html;h=7b01e67d1bee58415f682f8a89332e34c00b376b;hb=61a11c1aae7ed1ded0116b2e1e1fe3323ab7db6b;hp=e52b94b0317e4f522527ba8cd87e9d5f679f13a5;hpb=e3913800e8bccbdc364b7f54d28a8d8efcfa2e1b;p=cavote.git

diff --git a/templates/votes.html b/templates/votes.html
index e52b94b..7b01e67 100644
--- a/templates/votes.html
+++ b/templates/votes.html
@@ -6,25 +6,32 @@ Liste des votes
   {% for vote in votes %}
   <div>
     <div class="row well">
-      <div class="span4">
+      <div class="span5">
         <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 class="row">
+          <div class="span4">
+            <div class="progress progress-striped progress-{% if  vote.nb_votes > 0 and vote.nb_votes / vote.max_votes >= vote.quorum %}success{% else %}danger{% endif %}">
+              <div class="bar" style="width: {{ vote.percent }}%;">
+                <strong>{{ vote.nb_votes }} vote{{ 's' if vote.nb_votes > 1 else '' }} / {{ vote.max_votes }} ({{ vote.percent }}%)</strong></div>
+            </div>
+          </div>
         </div>
       </div>
       <div class="span3">
-        <h4>Deadline : {{ vote.date_end }} </h4>
+        <h4>Échéance : {{ vote.date_end }} </h4>
         <h4>Groupe : {{ vote.groupname }}</h4>
         <h4>Categorie : {{ vote.category }}</h4>
       </div>
       <div class="span3">
-      <h4>Notes</h4>
+      {% if vote.description %}
+      <h4>Description</h4>
       <p>
-      {{ vote.description|safe }}
+      {{ vote.description }}
       </p>
+      {% endif %}
     </div>
   </div>
   {% else %}
-  <div class="alert">Il n'y a pas encore de votes. Désolé.</div>
+  <div class="alert">Il n'y a pas encore de vote. Désolé.</div>
   {% endfor %}
 {% endblock %}