X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=templates%2Fmotion.html;h=b0fb70da64ed7e155a34e378c6a2e9ecceec1751;hb=1aa987d0d2f2c0a82b5bc0bbfe89eb1646b297a7;hp=6609d20920c455f4323e9cbd3213781d97eb6666;hpb=fab51f8d9723fb7095b5f3c4f1af59ad93049fb1;p=motion.git

diff --git a/templates/motion.html b/templates/motion.html
index 6609d20..b0fb70d 100644
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,10 +1,20 @@
-<div class="motion panel panel-default" id="motion-{{motion.id}}">
+<div class="motion panel
+{%- if motion.running %} panel-default
+{%- elif motion.canceled %} panel-warning
+{%- elif motion.yes is defined %}{% if motion.yes != None and motion.no != None and motion.yes > motion.no %} panel-success{% else %} panel-danger{% endif %}
+{%- else %} panel-default{%- endif -%}
+" id="motion-{{motion.id}}">
   <div class="motion-title panel-heading">
-    <a href="/motion/{{motion.id}}" class="anchor">#</a>
-    <span class="title-text">{{motion.name}}</span> ({{ 'Running' if motion.running else 'Finished' }})
+    <span class="title-text">{{motion.name}}</span> ({{ 'Running' if motion.running else ('Canceled' if motion.canceled != None else 'Finished') }})
+    <span class="motion-type">{{motion.type}}</span>
+    <div># <a href="/motion/{{motion.identifier}}" class="anchor">{{motion.identifier}}</a></div>
     <div class="date">
-      <div>Posed: {{motion.posed|timestamp}}</div>
-      <div>Votes until: {{motion.deadline|timestamp}}</div></div>
+      <div>Proposed: {{motion.posed|timestamp}} (UTC) by {{motion.poser}}</div>
+{%- if motion.canceled != None %}
+      <div>Canceled: {{motion.canceled|timestamp}} (UTC) by {{motion.canceler}}</div></div>
+{%- else %}
+      <div>Votes until: {{motion.deadline|timestamp} (UTC)}</div></div>
+{%- endif %}
   </div>
   <div class="panel-body">
     <p>{{motion.content}}</p>
@@ -14,6 +24,9 @@
 {{vote|capitalize}} <span class="badge">{{motion[vote]}}</span><br>
 {%- endfor %}
     </p>
+{%- endif %}
+{%- if motion.canceled != None %}
+    <p>Cancelation reason: {{motion.cancelation_reason}}</p>
 {%- endif %}
   </div>
 {%- block content %}{% endblock %}