upd: allow markdown text in motion content

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index f0d28bd27b1d86250b4a584f4255f0745955dd8c..87b3e417e636bd4a5c2748ad7b4b1572a5be9a8f 100644 (file)
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,7 +1,13 @@
-<div class="motion panel panel-default" id="motion-{{motion.id}}">
+<div class="motion panel
+{%- if motion.running %} panel-default
+{%- elif motion.canceled %} panel-warning
+{%- 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">
-    <a href="/motion/{{motion.id}}" class="anchor">#</a>
     <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>Posed: {{motion.posed|timestamp}} by {{motion.poser}}</div>
 {%- if motion.canceled != None %}
@@ -11,7 +17,7 @@
 {%- endif %}
   </div>
   <div class="panel-body">
-    <p>{{motion.content}}</p>
+    <p>{{motion.content|markdown}}</p>
 {%- if motion.yes or motion.no or motion.abstain %}
     <p>
 {%- for vote in ['yes', 'no', 'abstain'] %}