- <a href="/motion/{{motion.id}}" class="anchor">#</a>
- <span class="title-text">{{motion.name}}</span> ({{ 'Running' if motion.running else 'Finished' }})
- <div class="date"><div>Posed: {{motion.posed}}</div><div>Votes until: {{motion.deadline}}</div></div>
+ <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>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 %}