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

Revert "Merge branch 'master' of github.com:ZeusWPI/Haldis"

Browse source 
This reverts commit 28fa1b7592, reversing
changes made to b14671413c.
This commit is contained in:
Charlotte Van Petegem 2022-10-27 21:23:13 +02:00
parent 28fa1b7592
commit 202d5d3e7a
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 54 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/templates/order.html
View file

@ -155,8 +155,7 @@
<div class="box" id="order_info"> <div class="box" id="order_info">
<h3>Order information</h3> <h3>Order information</h3>
<div class="row"> <dl>
<dl class="col-md-10 col-lg-8">
<div> <div>
<dt>Order opens</dt> <dt>Order opens</dt>
<dd>{{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}</dd> <dd>{{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}</dd>
@ -198,14 +197,9 @@
{% endif %} {% endif %}
</dd> </dd>
</div> </div>
</dl> </dl>
<div class="col-md-2 col-lg-4"> <div>
<img src="https://dsa.ugent.be/api/verenigingen/{{ order.association }}/logo" class="img-responsive align-top" style="max-width:200px;width:100%">
</div>
</div>
{% if order.can_close(current_user.id) -%} {% if order.can_close(current_user.id) -%}
<form action="{{ url_for('order_bp.close_order', order_slug=order.slug) }}" method="post" style="display:inline"> <form action="{{ url_for('order_bp.close_order', order_slug=order.slug) }}" method="post" style="display:inline">
<input type="submit" class="btn btn-danger" value="Close"></input> <input type="submit" class="btn btn-danger" value="Close"></input>
@ -214,7 +208,7 @@
{% if courier_or_admin %} {% if courier_or_admin %}
<a class="btn" href="{{ url_for('order_bp.order_edit', order_slug=order.slug) }}">Edit</a> <a class="btn" href="{{ url_for('order_bp.order_edit', order_slug=order.slug) }}">Edit</a>
{%- endif %} {%- endif %}
</div>
</div> </div>
<div class="box" id="how_to_order"> <div class="box" id="how_to_order">

9
app/templates/utils.html
View file

@ -1,17 +1,14 @@
{% macro render_order(order) -%} {% macro render_order(order) -%}
<div class="row order_row"> <div class="row order_row">
<div class="col-md-6 col-lg-6 order_data"> <div class="col-md-8 col-lg-9 order_data">
<h5>{{ order.location_name }}</h5> <h5>{{ order.location_name }}</h5>
<b class="amount_of_orders">{{ order.items.count() }} items ordered for {{ order.association }}</b></p> <b class="amount_of_orders">{{ order.items.count() }} items ordered</b></p>
<p class="time_data"> <p class="time_data">
{% if order.stoptime %} {% if order.stoptime %}
<span><b>Closes </b>{{ order.stoptime.strftime("%H:%M") }}</span>{{ order.stoptime|countdown }} <span><b>Closes </b>{{ order.stoptime.strftime("%H:%M") }}</span>{{ order.stoptime|countdown }}
{% else %}open{% endif %}<br/> {% else %}open{% endif %}<br/>
</div> </div>
<div class="col-md-3 col-lg-3"> <div class="col-md-4 col-lg-3 expand_button_wrapper">
<img src="https://dsa.ugent.be/api/verenigingen/{{ order.association }}/logo" class="img-responsive align-bottom" style="max-width:200px;width:100%">
</div>
<div class="col-md-3 col-lg-3 expand_button_wrapper">
<a class="btn btn-primary btn-block align-bottom expand_button" href="{{ url_for('order_bp.order_from_slug', order_slug=order.slug) }}">Expand</a> <a class="btn btn-primary btn-block align-bottom expand_button" href="{{ url_for('order_bp.order_from_slug', order_slug=order.slug) }}">Expand</a>
</div> </div>
</div> </div>