X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=templates%2Fmotion.html;h=edc637a28e82d3dee6aa3f4713c690e914c319ff;hb=4cfc1bb07644043d1e223178a98ea47f6a61d338;hp=6609d20920c455f4323e9cbd3213781d97eb6666;hpb=fab51f8d9723fb7095b5f3c4f1af59ad93049fb1;p=motion.git

diff --git a/templates/motion.html b/templates/motion.html
index 6609d20..edc637a 100644
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -1,19 +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="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>Posed: {{motion.posed|timestamp}}</div>
-      <div>Votes until: {{motion.deadline|timestamp}}</div></div>
+      <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 %}