Merge branch 'motion_close' into 'master'

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index 2f0d6b7769f7352d3219305ad0250517a2f4c1e8..a363c0e75ef433ede3469058369d949995595b50 100644 (file)
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,13 +1,17 @@
 <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 %}
+  {%- 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># <a href="/motion/{{motion.identifier}}" class="anchor">{{motion.identifier}}</a></div>
+    <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>Proposed: {{motion.posed|timestamp}} (UTC) by {{motion.poser}}</div>
 {%- if motion.canceled != None %}
@@ -21,7 +25,7 @@
 {%- 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 %}