jlusiardi/rollerverbrauch
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 12 Wiki Activity

Merge branch 'master' into user_handling

Browse Source 
Conflicts:
	app/main.py
	app/requirements.txt
This commit is contained in:
Joachim Lusiardi
2016-04-18 21:43:01 +02:00
parent 6ed4110ce9 1d449cb0ab
commit 2e0fc3b772
7 changed files with 84 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/templates/layout.html
View File

@@ -7,6 +7,25 @@
{% endif %}
{%- endmacro %}
{% macro render_field_with_errors(field) %}
<div class="form-group">
<label class="col-sm-6 control-label">
{{ field.label }}
</label>
<div class="col-sm-2">
{{ field(**kwargs)|safe }}
{% if field.errors %}
<p class='error'>
{% for error in field.errors %}
{{ error }}
{% endfor %}
</p>
{% endif %}
</div>
</div>
{% endmacro %}
<!doctype html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang=""> <![endif]-->
@@ -69,7 +88,6 @@
{% endblock %}
</div>
</div>
{{ current_user.email }}
</body>
</html>

5
app/templates/login_required.html
View File

@@ -1,5 +0,0 @@
{% extends "layout.html" %}
{% block body %}
Please authorize yourself!
{% endblock %}

48
app/templates/newPitStopForm.html
View File

@@ -1,43 +1,13 @@
{% extends "layout.html" %}
{% block body %}
<form class='form-horizontal' id='createPitStop' action="{{ url_for('create_pit_stop') }}" method='post'>
<!-- Text input-->
<div class="form-group {% if data.error['date'] %}has-error{% endif %}">
<label class="col-sm-2 control-label" for="date">Date of Pitstop</label>
<div class="col-sm-10">
<input class="form-control" id="date" name="date" placeholder="" required="" type="date" value='{{ data.last.date }}' />
<p class='error'>{{ data.error['date'] }}</p>
</div>
</div>
<!-- Text input-->
<div class="form-group {% if data.error['odometer'] %}has-error{% endif %}">
<label class="col-sm-2 control-label" for="odometer">Odometer (km)</label>
<div class="col-sm-10">
<input class="form-control" id="odometer" name="odometer" placeholder="" type="number" value='{{ data.last.odometer }}' />
<p class='error'>{{ data.error['odometer'] }}</p>
</div>
</div>
<!-- Text input-->
<div class="form-group {% if data.error['litres'] %}has-error{% endif %}">
<label class="col-sm-2 control-label" for="litres">Litres (l)</label>
<div class="col-sm-10">
<input class="form-control" id="litres" name="litres" placeholder="" type="number" step='0.1' value='{{ data.last.litres }}' />
<p class='error'>{{ data.error['litres'] }}</p>
</div>
</div>
<!-- Button (Double) -->
<div class="form-group">
<div class="controls">
<button id="buttonLogId" name="buttonLogId" class="btn btn-success" onclick="document.getElementById('create_pit_stop').submit();">Log Pitstop</button>
<button id="buttonAbortId" name="buttonAbortId" class="btn btn-warning" onclick="window.location.href='{{ url_for('get_pit_stops') }}'" type="button" >Abort</button>
</div>
</div>
<form class='form-horizontal' method="POST">
{{ form.hidden_tag() }}
{{ render_field_with_errors(form.date) }}
{{ render_field_with_errors(form.odometer) }}
{{ render_field_with_errors(form.litres) }}
<input type="submit" value="Go">
</form>
{% endblock %}
{% endblock %}

1
app/templates/security/login_user.html
View File

@@ -2,7 +2,6 @@
{% from "security/_macros.html" import render_field_with_errors, render_field %}
{% block body %}
{% include "security/_messages.html" %}
<form class='form-horizontal' action="{{ url_for_security('login') }}" method="POST" name="login_user_form">
{{ login_user_form.hidden_tag() }}
{{ render_field_with_errors(login_user_form.email) }}