From d06cfaa02e78090401815e77695bdd48a1c84ccd Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Fri, 13 Jul 2018 11:22:28 +0200
Subject: [PATCH] Add a field macro to the event creation form

---
 calsocial/templates/_macros.html       | 21 +++++++++++++
 calsocial/templates/event-details.html |  5 ++-
 calsocial/templates/event-edit.html    | 43 ++++++++------------------
 calsocial/templates/first-steps.html   | 12 ++-----
 calsocial/templates/profile-edit.html  | 12 ++-----
 calsocial/templates/registration.html  | 24 +++-----------
 calsocial/templates/user-settings.html |  6 ++--
 7 files changed, 49 insertions(+), 74 deletions(-)
 create mode 100644 calsocial/templates/_macros.html

diff --git a/calsocial/templates/_macros.html b/calsocial/templates/_macros.html
new file mode 100644
index 0000000..633314d
--- /dev/null
+++ b/calsocial/templates/_macros.html
@@ -0,0 +1,21 @@
+{% macro field(field, inline=false) %}
+    {% if field.errors %}
+        {% for error in field.errors %}
+{{ error }}
+        {% endfor %}
+<br>
+    {% endif %}
+    {% if field.widget.input_type != 'checkbox' %}
+{{ field.label }}
+    {% endif %}
+{{ field }}
+    {% if field.widget.input_type == 'checkbox' %}
+{{ field.label }}
+    {% endif %}
+{% if not inline %}
+<br>
+{% endif %}
+    {% if field.description %}
+{{ field.description }}
+    {% endif %}
+{% endmacro %}
diff --git a/calsocial/templates/event-details.html b/calsocial/templates/event-details.html
index 26dff7b..d6bd2ba 100644
--- a/calsocial/templates/event-details.html
+++ b/calsocial/templates/event-details.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% from '_macros.html' import field %}
 
 {% block content %}
 <h1>
@@ -28,9 +29,7 @@
 <form method="post">
     {{ form.hidden_tag() }}
 
-    {{ form.invitee.errors }}
-    {{ form.invitee.label }}
-    {{ form.invitee}}
+    {{ field(form.invitee, inline=true) }}
 
     <button type="submit">{% trans %}Invite{% endtrans %}</button>
 </form>
diff --git a/calsocial/templates/event-edit.html b/calsocial/templates/event-edit.html
index 831526f..483f2c0 100644
--- a/calsocial/templates/event-edit.html
+++ b/calsocial/templates/event-edit.html
@@ -1,41 +1,24 @@
 {% extends 'base.html' %}
+{% from '_macros.html' import field %}
 
 {% block content %}
+<h2>Create event</h2>
 <form method="post">
     {{ form.hidden_tag() }}
 
-    {{ form.errors }}
+    {% if form.errors %}
+        {% for error in form.errors %}
+    {{ error }}
+        {% endfor %}
     <br>
+    {% endif %}
 
-    {{ form.title.errors }}
-    {{ form.title.label }}
-    {{ form.title }}
-    <br>
-
-    {{ form.time_zone.errors }}
-    {{ form.time_zone.label }}
-    {{ form.time_zone }}
-    <br>
-
-    {{ form.start_time.errors }}
-    {{ form.start_time.label }}
-    {{ form.start_time }}
-    <br>
-
-    {{ form.end_time.errors }}
-    {{ form.end_time.label }}
-    {{ form.end_time }}
-    <br>
-
-    {{ form.all_day.errors }}
-    {{ form.all_day.label }}
-    {{ form.all_day }}
-    <br>
-
-    {{ form.description.errors }}
-    {{ form.description.label }}
-    {{ form.description }}
-    <br>
+    {{ field(form.title) }}
+    {{ field(form.time_zone) }}
+    {{ field(form.start_time) }}
+    {{ field(form.end_time) }}
+    {{ field(form.all_day) }}
+    {{ field(form.description) }}
 
     <button type="submit">{% trans %}Save{% endtrans %}</button>
     <a href="{{ url_for('hello') }}">Cancel</a>
diff --git a/calsocial/templates/first-steps.html b/calsocial/templates/first-steps.html
index faf6249..f534cf7 100644
--- a/calsocial/templates/first-steps.html
+++ b/calsocial/templates/first-steps.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% from '_macros.html' import field %}
 
 {% block content %}
 <h1>{% trans %}First steps{% endtrans %}</h1>
@@ -13,17 +14,10 @@
     {{ form.hidden_tag() }}
 
     <p>
-        {{ form.display_name.errors }}
-        {{ form.display_name.label }}
-        {{ form.display_name }}<br>
-        {{ form.display_name.description }}
+        {{ field(form.display_name) }}
     </p>
-
     <p>
-        {{ form.time_zone.errors }}
-        {{ form.time_zone.label }}
-        {{ form.time_zone }}<br>
-        {{ form.time_zone.description }}
+        {{ field(form.time_zone) }}
     </p>
 
     <button type="submit">{% trans %}Save{% endtrans %}</button>
diff --git a/calsocial/templates/profile-edit.html b/calsocial/templates/profile-edit.html
index 0953be4..6d54c04 100644
--- a/calsocial/templates/profile-edit.html
+++ b/calsocial/templates/profile-edit.html
@@ -1,4 +1,5 @@
 {% extends 'settings-base.html' %}
+{% from '_macros.html' import field %}
 
 {% block content %}
 {{ super() }}
@@ -7,15 +8,8 @@
     {{ form.hidden_tag() }}
     {{ form.errors }}
 
-    {{ form.display_name.errors }}
-    {{ form.display_name.label }}
-    {{ form.display_name }}
-    <br>
-
-    {{ form.locked.errors }}
-    {{ form.locked.label }}
-    {{ form.locked}}
-    <br>
+    {{ field(form.display_name) }}
+    {{ field(form.locked) }}
 
     <button type="submit">{% trans %}Save{% endtrans %}</button>
 </form>
diff --git a/calsocial/templates/registration.html b/calsocial/templates/registration.html
index 95f3977..2cc7c0a 100644
--- a/calsocial/templates/registration.html
+++ b/calsocial/templates/registration.html
@@ -1,29 +1,15 @@
 {% extends 'base.html' %}
+{% from '_macros.html' import field %}
 
 {% block content %}
 <form method="post">
     {{ form.errors }}
     {{ form.hidden_tag() }}
 
-    {{ form.username.errors }}
-    {{ form.username.label }}
-    {{ form.username }}
-    <br>
-
-    {{ form.email.errors }}
-    {{ form.email.label }}
-    {{ form.email }}
-    <br>
-
-    {{ form.password.errors }}
-    {{ form.password.label }}
-    {{ form.password }}
-    <br>
-
-    {{ form.password_retype.errors }}
-    {{ form.password_retype.label }}
-    {{ form.password_retype }}
-    <br>
+    {{ field(form.username) }}
+    {{ field(form.email) }}
+    {{ field(form.password) }}
+    {{ field(form.password_retype) }}
 
     <button type="submit">{% trans %}Register{% endtrans %}</button>
 </form>
diff --git a/calsocial/templates/user-settings.html b/calsocial/templates/user-settings.html
index 5141f07..a7d8d11 100644
--- a/calsocial/templates/user-settings.html
+++ b/calsocial/templates/user-settings.html
@@ -1,4 +1,5 @@
 {% extends 'settings-base.html' %}
+{% from '_macros.html' import field %}
 
 {% block content %}
 {{ super() }}
@@ -9,10 +10,7 @@
     {{ form.errors }}
     <br>
 
-    {{ form.timezone.errors }}
-    {{ form.timezone.label }}
-    {{ form.timezone}}
-    <br>
+    {{ field(form.timezone) }}
 
     <button type="submit">{% trans %}Save{% endtrans %}</button>
     <a href="{{ url_for('hello') }}">Cancel</a>