Merge branch 'not_empty' into 'master'

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index f0d28bd27b1d86250b4a584f4255f0745955dd8c..a363c0e75ef433ede3469058369d949995595b50 100644 (file)
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,21 +1,31 @@
-<div class="motion panel panel-default" id="motion-{{motion.id}}">
-  <div class="motion-title panel-heading">
-    <a href="/motion/{{motion.id}}" class="anchor">#</a>
+<div class="motion card" id="motion-{{motion.id}}">
+  <div class="motion-title card-heading 
+  {%- if motion.running %} alert-light
+{%- elif motion.canceled %} alert-warning
+{%- elif motion.yes is defined %}{% if motion.yes != None and motion.no != None and motion.yes > motion.no %} alert-success{% else %} alert-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># {{motion.identifier}}
+{%- if singlemotion == False %}
+    <a class="btn btn-primary" href="/motion/{{motion.identifier}}" role="button">{{ 'Vote' if motion.running else 'Result' }}</a>
+{%- endif %}
+    </div>
     <div class="date">
-      <div>Posed: {{motion.posed|timestamp}} by {{motion.poser}}</div>
+      <div>Proposed: {{motion.posed|timestamp}} (UTC) by {{motion.poser}}</div>
 {%- if motion.canceled != None %}
-      <div>Canceled: {{motion.canceled|timestamp}} by {{motion.canceler}}</div></div>
+      <div>Canceled: {{motion.canceled|timestamp}} (UTC) by {{motion.canceler}}</div></div>
 {%- else %}
-      <div>Votes until: {{motion.deadline|timestamp}}</div></div>
+      <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>
+{{vote|capitalize}} <span class="badge badge-pill badge-secondary">{{motion[vote]}}</span><br>
 {%- endfor %}
     </p>
 {%- endif %}