Merge branch 'UTC' into 'master'

[motion.git] / templates / single_motion.html

diff --git a/templates/single_motion.html b/templates/single_motion.html
index 7fd1e25a98d63d06da17ad438647f619150762b7..585e1170d79a8a42cf8a4f477c75f0bf3ec1935f 100644 (file)
--- a/templates/single_motion.html
+++ b/templates/single_motion.html
@@ -4,20 +4,32 @@ Motion: {{motion.name}}
 {%- endblock %}
 {% block body %}
 {%- include 'motion.html' %}
+{%- if votes %}
+<div class="panel panel-info" id="votes">
+  <div class="panel-heading">
+    Motion Votes
+  </div>
+  <div class="panel-body">
+    {%- for row in votes %}
+    <div>{{row.email}}: {{row.result}}</div>
+    {%- endfor %}
+  </div>
+</div>
+{%- endif %}
 {%- if motion.running %}
 {%- if may_vote %}
-<form action="/motion/{{motion.id}}/vote" method="POST">
+<form action="/motion/{{motion.identifier}}/vote" method="POST">
 {%- for vote in ['yes','no','abstain'] %}
 <button type="submit" class="btn btn-{{ 'success' if vote == motion.result else 'primary' }}" name="vote" value="{{vote}}" id="vote-{{vote}}">{{vote}}</button>
 {%- endfor %}
 </form>
 {%- endif %}
 {%- if may_cancel %}
-<form action="/motion/{{motion.id}}/cancel" method="POST" class="form-inline">
-<input type="text" name="reason" class="form-control" required="yes">
+<form action="/motion/{{motion.identifier}}/cancel" method="POST" class="form-inline">
+<input type="text" placeholder="cancelation reason" name="reason" class="form-control" required="yes">
 <button type="submit" class="btn btn-danger">Cancel</button>
 </form>
 {%- endif %}
 {%- endif %}
-<a href="/?start={{motion.id}}#motion-{{motion.id}}">Back</a>
+<a href="/?start={{motion.id}}#motion-{{motion.id}}" class="btn btn-primary">Back</a>
 {%- endblock %}