X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Fvotes.html;h=ddb3ce0aad756662cae24bd50ca07625d8662d34;hb=cbc81a0257e8e461a254c89ce34adc60ae3e9a42;hp=d770c2ba4b25b492170a6bee7bc9ab030172fe1d;hpb=07a7e13f132e72a1586da7a55423abfdbd8d623f;p=cavote.git

diff --git a/templates/votes.html b/templates/votes.html
index d770c2b..ddb3ce0 100644
--- a/templates/votes.html
+++ b/templates/votes.html
@@ -4,27 +4,39 @@ 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>
+      <div class="span5">
+        <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>
+            {% 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>Groupe : {{ vote.rolename }}</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>
-  </article>
+  </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 %}