Merge branch 'master' into user_handling

Conflicts: app/main.py app/requirements.txt
2016-04-18 21:43:01 +02:00
parent 6ed4110ce9 1d449cb0ab
commit 2e0fc3b772
7 changed files with 84 additions and 110 deletions
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -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>