Make whitespace match convention
Convention according to our EditorConfig.
This commit is contained in:
parent
172d5d1e08
commit
b44d34003d
53 changed files with 6623 additions and 6620 deletions
|
@ -8,6 +8,9 @@ end_of_line = lf
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
indent_style = tab
|
indent_style = tab
|
||||||
|
|
||||||
[*.py]
|
[*.py,*.py.*]
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|
||||||
|
[*.el]
|
||||||
|
indent_style = space
|
||||||
|
|
2
app/static/css/bootstrap.min.css
vendored
2
app/static/css/bootstrap.min.css
vendored
|
@ -1,4 +1,4 @@
|
||||||
* bootswatch v3.3.4+1
|
/* bootswatch v3.3.4+1
|
||||||
* Homepage: http://bootswatch.com
|
* Homepage: http://bootswatch.com
|
||||||
* Copyright 2012-2015 Thomas Park
|
* Copyright 2012-2015 Thomas Park
|
||||||
* Licensed under MIT
|
* Licensed under MIT
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
const init = () =>{
|
const init = () =>{
|
||||||
document.cookie.split('; ').forEach(itCookie = cookie =>{ //I know that this is a shitty way of fixing things... But I'll try to fix it in the future.
|
document.cookie.split('; ').forEach(itCookie = cookie =>{ // TODO (Arnhoudt) Fix shitty way of doing things
|
||||||
if(cookie.split("=")[0] == "theme" && cookie.split("=")[1] == "darkmode"){
|
if(cookie.split("=")[0] == "theme" && cookie.split("=")[1] == "darkmode"){
|
||||||
document.querySelector(".toggleDarkmode").innerHTML = "<a>Enter lightmode</a>"
|
document.querySelector(".toggleDarkmode").innerHTML = "<a>Enter lightmode</a>"
|
||||||
document.querySelector(".toggleDarkmode").id = "lightmode";
|
document.querySelector(".toggleDarkmode").id = "lightmode";
|
||||||
|
|
|
@ -76,7 +76,7 @@ Haldis - {{ active_page|capitalize }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<footer>
|
<footer>
|
||||||
<hr>
|
<hr/>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="footerWrapper">
|
<div class="footerWrapper">
|
||||||
<div class="pull-left">Made with ❤ by <a href="http://zeus.ugent.be">Zeus WPI</a></div>
|
<div class="pull-left">Made with ❤ by <a href="http://zeus.ugent.be">Zeus WPI</a></div>
|
||||||
|
|
|
@ -55,16 +55,12 @@
|
||||||
<script src="{{ url_for('static', filename='js/leaflet.js')}}"></script>
|
<script src="{{ url_for('static', filename='js/leaflet.js')}}"></script>
|
||||||
<script src="{{ url_for('static', filename='js/map.js' ) }}"></script>
|
<script src="{{ url_for('static', filename='js/map.js' ) }}"></script>
|
||||||
<script>
|
<script>
|
||||||
let locations = [];
|
let locations = [{
|
||||||
|
|
||||||
loc = {
|
|
||||||
"address": "{{location.address}}",
|
"address": "{{location.address}}",
|
||||||
"name": "{{location.name}}",
|
"name": "{{location.name}}",
|
||||||
"url": "{{location.website}}",
|
"url": "{{location.website}}",
|
||||||
"center": true,
|
"center": true,
|
||||||
};
|
}];
|
||||||
locations.push(loc);
|
|
||||||
|
|
||||||
loadmap(locations);
|
loadmap(locations);
|
||||||
</script>
|
</script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -21,17 +21,14 @@
|
||||||
<script src="{{ url_for('static', filename='js/map.js' ) }}"></script>
|
<script src="{{ url_for('static', filename='js/map.js' ) }}"></script>
|
||||||
<script>
|
<script>
|
||||||
let locations = [];
|
let locations = [];
|
||||||
let loc = {};
|
|
||||||
|
|
||||||
{% for loc in locations -%}
|
{% for loc in locations -%}
|
||||||
{% if loc.address %}
|
{% if loc.address %}
|
||||||
loc = {
|
locations.push({
|
||||||
"address": "{{loc.address}}",
|
"address": "{{loc.address}}",
|
||||||
"name": "{{loc.name}}",
|
"name": "{{loc.name}}",
|
||||||
"url": "{{ url_for('general_bp.location', location_id=loc.id) }}"
|
"url": "{{ url_for('general_bp.location', location_id=loc.id) }}"
|
||||||
};
|
});
|
||||||
locations.push(loc);
|
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
|
|
|
@ -53,8 +53,8 @@
|
||||||
{{ util.render_form_field_errors(form.dish_id) }}
|
{{ util.render_form_field_errors(form.dish_id) }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input type="hidden" name="form_for_dish" value="{{ dish.id }}" />
|
|
||||||
{% if dish and dish.choices %}
|
{% if dish and dish.choices %}
|
||||||
|
<input type="hidden" name="form_for_dish" value="{{ dish.id }}" />
|
||||||
{% for (choice_type, choice) in dish.choices %}
|
{% for (choice_type, choice) in dish.choices %}
|
||||||
<div class="form-group select2-container select2">
|
<div class="form-group select2-container select2">
|
||||||
<label class="control-label" for="choice_{{ choice.id }}">{{ choice.name }}</label><br/>
|
<label class="control-label" for="choice_{{ choice.id }}">{{ choice.name }}</label><br/>
|
||||||
|
@ -109,14 +109,18 @@
|
||||||
<td>{{ item.get_name() }}</td>
|
<td>{{ item.get_name() }}</td>
|
||||||
<td><span title="{{ item.comment if item.comment }}">{{ item.dish_name }}{{ "*" if item.comment }}</span></td>
|
<td><span title="{{ item.comment if item.comment }}">{{ item.dish_name }}{{ "*" if item.comment }}</span></td>
|
||||||
<td>{{ item.price|euro }}</td>
|
<td>{{ item.price|euro }}</td>
|
||||||
{% if courier_or_admin %}<td>{% if not item.paid %}
|
{% if courier_or_admin %}
|
||||||
|
<td>
|
||||||
|
{% if not item.paid %}
|
||||||
<form action="{{ url_for('order_bp.item_paid', order_id=order.id, item_id=item.id) }}" method="post" style="display:inline">
|
<form action="{{ url_for('order_bp.item_paid', order_id=order.id, item_id=item.id) }}" method="post" style="display:inline">
|
||||||
<input type="submit" class="btn btn-xs btn-primary" value="Pay"></input>
|
<input type="submit" class="btn btn-xs btn-primary" value="Pay"></input>
|
||||||
</form>
|
</form>
|
||||||
{% else %} <span class="glyphicon glyphicon-chevron-down"></span>
|
{% else %} <span class="glyphicon glyphicon-chevron-down"></span>
|
||||||
{% endif %}</td>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<td>{% if item.can_delete(order.id, current_user.id, session.get('anon_name', '')) -%}
|
</td>
|
||||||
|
{% endif %}
|
||||||
|
<td>
|
||||||
|
{% if item.can_delete(order.id, current_user.id, session.get('anon_name', '')) -%}
|
||||||
<form action="{{ url_for('order_bp.delete_item', order_id=order.id, item_id=item.id) }}" method="post" style="display:inline">
|
<form action="{{ url_for('order_bp.delete_item', order_id=order.id, item_id=item.id) }}" method="post" style="display:inline">
|
||||||
<button class="btn btn-link" type="submit"><span class="glyphicon glyphicon-remove"></span></button>
|
<button class="btn btn-link" type="submit"><span class="glyphicon glyphicon-remove"></span></button>
|
||||||
</form>
|
</form>
|
||||||
|
@ -158,11 +162,17 @@
|
||||||
<td>{{ key }}</td>
|
<td>{{ key }}</td>
|
||||||
<td>{{ value["total"]|euro }}</td>
|
<td>{{ value["total"]|euro }}</td>
|
||||||
<td>{{ value["to_pay"]|euro }}</td>
|
<td>{{ value["to_pay"]|euro }}</td>
|
||||||
{% if courier_or_admin %}<td>{% if not value["to_pay"] == 0 %}
|
{% if courier_or_admin %}
|
||||||
|
<td>
|
||||||
|
{% if not value["to_pay"] == 0 %}
|
||||||
<form action="{{ url_for('order_bp.items_user_paid', order_id=order.id, user_name=key) }}" method="post" style="display:inline">
|
<form action="{{ url_for('order_bp.items_user_paid', order_id=order.id, user_name=key) }}" method="post" style="display:inline">
|
||||||
<input type="submit" class="btn btn-xs btn-primary" value="Pay"></input>
|
<input type="submit" class="btn btn-xs btn-primary" value="Pay"></input>
|
||||||
</form>
|
</form>
|
||||||
{% else %} <span class="glyphicon glyphicon-chevron-down"></span> {% endif %}</td>{% endif %}
|
{% else %}
|
||||||
|
<span class="glyphicon glyphicon-chevron-down"></span>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -54,7 +54,6 @@
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block styles -%}
|
{% block styles -%}
|
||||||
|
|
|
@ -69,7 +69,6 @@
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block styles -%}
|
{% block styles -%}
|
||||||
|
|
Loading…
Reference in a new issue