Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/ZeusWPI/Foodbot

Browse source
This commit is contained in:
Wout Schellaert 2015-05-13 13:35:14 +02:00
commit 3aa16e2690
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/templates/order.html
View file

@ -10,7 +10,7 @@
{% if order.can_close(current_user.id) -%} {% if order.can_close(current_user.id) -%}
<a class="btn btn-danger pull-right" href="{{ url_for('.close_order', id=order.id) }}">Close</a><br/> <a class="btn btn-danger pull-right" href="{{ url_for('.close_order', id=order.id) }}">Close</a><br/>
{%- endif %}</h3> {%- endif %}</h3>
courrier: {{ order.courrier.username }} courier: {{ order.courrier.username }}
{% if order.courrier == None and not current_user.is_anonymous() %} {% if order.courrier == None and not current_user.is_anonymous() %}
<a href="{{ url_for('.volunteer', id=order.id) }}" class="btn btn-primary btn-sm">Volunteer</a> <a href="{{ url_for('.volunteer', id=order.id) }}" class="btn btn-primary btn-sm">Volunteer</a>
{% endif %} {% endif %}
@ -79,4 +79,4 @@
<script type="text/javascript"> <script type="text/javascript">
$('.select').select2(); $('.select').select2();
</script> </script>
{% endblock %} {% endblock %}