Merge branch 'translation' into 'master'

[motion.git] / templates / motion.html

diff --git a/templates/motion.html b/templates/motion.html
index 687d2a30505a1250c5819ad4c1ac59c297232c6d..edc637a28e82d3dee6aa3f4713c690e914c319ff 100644 (file)
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,17 +1,37 @@
-<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' }})
-    <div class="date"><div>Posed: {{motion.posed}}</div><div>Votes until: {{motion.deadline}}</div></div>
+<div class="motion card" id="motion-{{motion.id}}">
+  <div class="motion-title card-heading 
+  {%- if motion.running %} alert-light
+{%- elif motion.canceled %} alert-warning
+{%- elif motion.yes is defined %}{% if motion.yes != None and motion.no != None and motion.yes > motion.no %} alert-success{% else %} alert-danger{% endif %}
+{%- else %} bg-light{%- endif -%}
+">
+    <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># {{motion.identifier}}
+{%- if singlemotion == False %}
+    <a class="btn btn-primary" href="/motion/{{motion.identifier}}" role="button">{{ _('Vote') if motion.running else _('Result') }}</a>
+{%- endif %}
+    </div>
+    <div class="date">
+      <div>{{_('Proposed')}}: {{_('%(dt)s (UTC) by %(user)s', dt=motion.posed|timestamp, user=motion.poser)}}</div>
+{%- if motion.canceled != None %}
+      <div>{{_('Canceled')}}: {{_('%(dt)s (UTC) by %(user)s', dt=motion.canceled|timestamp, user=motion.poser)}}</div>
+{%- else %}
+      <div>{{_('Votes until')}}: {{_('%(dt)s (UTC)', dt=motion.deadline|timestamp)}}</div>
+{%- endif %}
+     </div>
   </div>
-  <div class="panel-body">
-    <p>{{motion.content}}</p>
+  <div class="card-body">
+    <p>{{motion.content|markdown}}</p>
 {%- if motion.yes or motion.no or motion.abstain %}
     <p>
 {%- for vote in ['yes', 'no', 'abstain'] %}
-{{vote|capitalize}} <span class="badge">{{motion[vote]}}</span><br>
+{{_(vote)|capitalize}} <span class="badge badge-pill badge-secondary">{{motion[vote]}}</span><br>
 {%- endfor %}
     </p>
+{%- endif %}
+{%- if motion.canceled != None %}
+    <p>{{_('Cancelation reason')}}: {{motion.cancelation_reason}}</p>
 {%- endif %}
   </div>
 {%- block content %}{% endblock %}