Merge branch 'css' into 'master'

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index 6609d20920c455f4323e9cbd3213781d97eb6666..2f0d6b7769f7352d3219305ad0250517a2f4c1e8 100644 (file)
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,19 +1,32 @@
-<div class="motion panel panel-default" 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' }})
+<div class="motion card" id="motion-{{motion.id}}">
+  <div class="motion-title card-heading 
+  {%- if motion.running %} bg-light
+{%- elif motion.canceled %} text-white bg-warning
+{%- elif motion.yes is defined %}{% if motion.yes != None and motion.no != None and motion.yes > motion.no %} text-white bg-success{% else %} text-white bg-danger{% endif %}
+{%- else %} bg-light{%- endif -%}
+">
+    <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>
+  <div class="card-body">
+    <p>{{motion.content|markdown}}</p>
 {%- if motion.yes or motion.no or motion.abstain %}
     <p>
 {%- for vote in ['yes', 'no', 'abstain'] %}
 {{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 %}