X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Fvotes.html;h=5f715619c2dd5d4dbddcc68cdc3ec851ec0af01c;hb=HEAD;hp=ef54cbb7e8b56bdad42a0ad2fc7260cc4e77bdc3;hpb=f43f9263fc772dd9efcaeb62eff129d847ff9e86;p=cavote.git

diff --git a/templates/votes.html b/templates/votes.html
index ef54cbb..5f71561 100644
--- a/templates/votes.html
+++ b/templates/votes.html
@@ -10,31 +10,28 @@ Liste des votes
         <h3><a href="{{ url_for('vote', idvote=vote.voteid) }}">{{ vote.title }}</a></h3>
         <div class="row">
           <div class="span4">
-            {% 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 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>
-            {% 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 %}
           </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>
+      <div class="span3 description">
+      {% 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 %}