X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=templates%2Fsingle_motion.html;h=61611adf1468151d0485800717371d9eb1aaa031;hb=f3cf764d5e9ab3f2fa1327dc5db02de90fd91434;hp=7fd1e25a98d63d06da17ad438647f619150762b7;hpb=ac0f15d9acff6b20fb432946e5bcad54b8d7e2a7;p=motion.git

diff --git a/templates/single_motion.html b/templates/single_motion.html
index 7fd1e25..61611ad 100644
--- a/templates/single_motion.html
+++ b/templates/single_motion.html
@@ -1,23 +1,64 @@
 {% extends "base.html" %}
 {% block title -%}
-Motion: {{motion.name}}
+{{_('Motion')}}: {{motion.name}}
 {%- endblock %}
 {% block body %}
 {%- include 'motion.html' %}
+{%- if votes %}
+<div class="motion card" id="votes">
+  <div class="card-heading text-white bg-info">
+    {{_('Motion Votes')}}
+  </div>
+  <div class="card-body">
+    {%- for row in votes %}
+    <div>{{row.email}}: {{row.result}}{%- if row.proxyemail %} : {_('given by')}} {{row.proxyemail}}{%- endif %}</div>
+    {%- endfor %}
+  </div>
+</div>
+{%- endif %}
+
 {%- if motion.running %}
+
 {%- if may_vote %}
-<form action="/motion/{{motion.id}}/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>
+<div class="panel panel-info" id="votes">
+  <div class="panel-body">
+<h3>{{_('My vote')}}</h3>
+{%- if proxyname %}
+{{_('Given by %(pn)s', pn=proxyname[0][0])}}
+
+{%- endif %}
+<form action="/motion/{{motion.identifier}}/vote/{{g.voter}}" 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)|capitalize}}</button>
+{%- endfor %}
+</form>
+
+{%- for p in proxyvote %}
+<h3>{{_('Vote for %(email)s', email=p.email)}}</h3>
+{%- if p.owneremail and p.result%}
+{{_('Voted by %(email)s', email=p.owneremail)}}
+{%- endif %}
+<form action="/motion/{{motion.identifier}}/vote/{{p.voter_id}}" method="POST">
+{%- for vote in ['yes', 'no', 'abstain'] %}
+<button type="submit" class="btn btn-{{ 'success' if vote == p.result else 'primary' }}" name="vote" value="{{vote}}" id="vote-{{vote}}">{{_(vote)|capitalize}}</button>
 {%- endfor %}
 </form>
+{%- endfor %}
 {%- 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">
-<button type="submit" class="btn btn-danger">Cancel</button>
+<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" name="cancel" value="cancel" id="cancel">{{_('Cancel')}}</button></br>
+</form>
+{%- endif %}
+{%- if may_finish %}
+<form action="/motion/{{motion.identifier}}/finish" method="POST" class="form-inline">
+<button type="submit" class="btn btn-danger" name="finish" value="finish" id="finish">{{_('Finish')}}</button></br>
 </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 %}
+  </div>
+</div>