Merge branch 'UTC' into 'master'

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index bcead1fc573ae89ec89326a2b3874b049ef0d9a6..b0fb70da64ed7e155a34e378c6a2e9ecceec1751 100644 (file)
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,7 +1,7 @@
 <div class="motion panel
 {%- if motion.running %} panel-default
 {%- elif motion.canceled %} panel-warning
-{%- elif motion.yes is defined %}{% if motion.yes > motion.no %} panel-success{% else %} panel-danger{% endif %}
+{%- 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">
@@ -9,11 +9,11 @@
     <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}} 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">