add: display active user name

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index 6609d20920c455f4323e9cbd3213781d97eb6666..10dddcc59ac263abfe0718e1eb9e9d7806e3072e 100644 (file)
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,10 +1,15 @@
 <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' }})
+    <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 class="date">
-      <div>Posed: {{motion.posed|timestamp}}</div>
+      <div>Posed: {{motion.posed|timestamp}} by {{motion.poser}}</div>
+{%- if motion.canceled != None %}
+      <div>Canceled: {{motion.canceled|timestamp}} by {{motion.canceler}}</div></div>
+{%- else %}
       <div>Votes until: {{motion.deadline|timestamp}}</div></div>
+{%- endif %}
   </div>
   <div class="panel-body">
     <p>{{motion.content}}</p>
@@ -14,6 +19,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 %}