upd: allow markdown text in motion content

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index bcead1fc573ae89ec89326a2b3874b049ef0d9a6..87b3e417e636bd4a5c2748ad7b4b1572a5be9a8f 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">
@@ -17,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'] %}