From 818a4291f9576c1ce37d72d77f5dd178a5964305 Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Sun, 7 Jun 2020 15:00:09 +0200
Subject: [PATCH] layout

---
 templates/_macros.html                        | 28 +++++++++++++++++++
 templates/_messages.html                      |  9 ++++++
 templates/layout.html                         |  8 ++++--
 templates/security/change_password.html       |  4 +--
 templates/security/forgot_password.html       |  6 ++--
 templates/security/login_user.html            |  8 +++---
 templates/security/register_user.html         |  8 +++---
 templates/security/reset_password.html        |  6 ++--
 templates/security/send_confirmation.html     |  6 ++--
 templates/security/send_login.html            |  6 ++--
 templates/security/two_factor_setup.html      |  6 ++--
 .../security/two_factor_verify_code.html      |  6 ++--
 .../security/two_factor_verify_password.html  |  4 +--
 templates/security/us_setup.html              |  4 +--
 templates/security/us_signin.html             |  6 ++--
 templates/security/us_verify.html             |  6 ++--
 templates/security/verify.html                |  4 +--
 17 files changed, 82 insertions(+), 43 deletions(-)
 create mode 100644 templates/_macros.html
 create mode 100644 templates/_messages.html

diff --git a/templates/_macros.html b/templates/_macros.html
new file mode 100644
index 0000000..f3111f1
--- /dev/null
+++ b/templates/_macros.html
@@ -0,0 +1,28 @@
+{% macro render_field_with_errors(field) %}
+  <p>
+    {{ field.label }} {{ field(**kwargs)|safe }}
+    {% if field.errors %}
+      <ul>
+      {% for error in field.errors %}
+        <li>{{ error }}</li>
+      {% endfor %}
+      </ul>
+    {% endif %}
+  </p>
+{% endmacro %}
+
+{% macro render_field(field) %}
+  <p>{{ field(**kwargs)|safe }}</p>
+{% endmacro %}
+
+{% macro render_field_errors(field) %}
+  <p>
+    {% if field and field.errors %}
+      <ul>
+      {% for error in field.errors %}
+        <li>{{ error }}</li>
+      {% endfor %}
+      </ul>
+    {% endif %}
+  </p>
+{% endmacro %}
diff --git a/templates/_messages.html b/templates/_messages.html
new file mode 100644
index 0000000..dabc7b5
--- /dev/null
+++ b/templates/_messages.html
@@ -0,0 +1,9 @@
+{%- with messages = get_flashed_messages(with_categories=true) -%}
+  {% if messages %}
+    <ul class="flashes">
+    {% for category, message in messages %}
+      <li class="{{ category }}">{{ message }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+{%- endwith %}
diff --git a/templates/layout.html b/templates/layout.html
index c245155..80b57eb 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -45,7 +45,6 @@
           </button>
           <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
               <div class="navbar-nav">
-                  <a class="nav-item nav-link" href="{{ url_for('home') }}">Home</a>
 
                 {% if current_user.is_authenticated %}
                   <li class="nav-item dropdown">
@@ -61,8 +60,8 @@
                   </li>
 
                 {% else %}
-                  <a class="nav-item nav-link" href="{{ url_for('security.login') }}">Login</a>
-                  <a class="nav-item nav-link" href="{{ url_for('security.register') }}">Register</a>
+                  <a class="nav-item nav-link" href="{{ url_for('security.login') }}">Anmelden</a>
+                  <a class="nav-item nav-link" href="{{ url_for('security.register') }}">Registrieren</a>
                 {% endif %}
 
               </div>
@@ -71,6 +70,9 @@
       {%- endblock navbar %}
 
       <div class="body-content">
+
+          {% include "_messages.html" %}
+
           {% block content -%}
           {%- endblock content %}
       </div>
diff --git a/templates/security/change_password.html b/templates/security/change_password.html
index ee32e1f..ff4a008 100644
--- a/templates/security/change_password.html
+++ b/templates/security/change_password.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-{% include "security/_messages.html" %}
+
 <h1>{{ _('Change password') }}</h1>
 <form action="{{ url_for_security('change_password') }}" method="POST" name="change_password_form">
   {{ change_password_form.hidden_tag() }}
diff --git a/templates/security/forgot_password.html b/templates/security/forgot_password.html
index c6dafe5..4fa1f99 100644
--- a/templates/security/forgot_password.html
+++ b/templates/security/forgot_password.html
@@ -1,13 +1,13 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-{% include "security/_messages.html" %}
+
 <h1>{{ _('Send password reset instructions') }}</h1>
 <form action="{{ url_for_security('forgot_password') }}" method="POST" name="forgot_password_form">
   {{ forgot_password_form.hidden_tag() }}
   {{ render_field_with_errors(forgot_password_form.email) }}
   {{ render_field(forgot_password_form.submit) }}
 </form>
-{% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/login_user.html b/templates/security/login_user.html
index 2c17b33..d688b5c 100644
--- a/templates/security/login_user.html
+++ b/templates/security/login_user.html
@@ -1,9 +1,9 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field, render_field_errors %}
+{% from "_macros.html" import render_field_with_errors, render_field, render_field_errors %}
 
 {% block content %}
-{% include "security/_messages.html" %}
-<h1>{{ _('Login') }}</h1>
+
+<h1>Anmelden</h1>
 <form action="{{ url_for_security('login') }}" method="POST" name="login_user_form">
   {{ login_user_form.hidden_tag() }}
   {{ render_field_with_errors(login_user_form.email) }}
@@ -12,5 +12,5 @@
   {{ render_field_errors(login_user_form.csrf_token) }}
   {{ render_field(login_user_form.submit) }}
 </form>
-{% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/register_user.html b/templates/security/register_user.html
index 7a5304a..4e2841f 100644
--- a/templates/security/register_user.html
+++ b/templates/security/register_user.html
@@ -1,9 +1,9 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-{% include "security/_messages.html" %}
-<h1>{{ _('Register') }}</h1>
+
+<h1>Registrieren</h1>
 <form action="{{ url_for_security('register') }}" method="POST" name="register_user_form">
   {{ register_user_form.hidden_tag() }}
   {{ render_field_with_errors(register_user_form.email) }}
@@ -13,5 +13,5 @@
   {% endif %}
   {{ render_field(register_user_form.submit) }}
 </form>
-{% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/reset_password.html b/templates/security/reset_password.html
index 498a62b..40fcf41 100644
--- a/templates/security/reset_password.html
+++ b/templates/security/reset_password.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-{% include "security/_messages.html" %}
+
 <h1>{{ _('Reset password') }}</h1>
 <form action="{{ url_for_security('reset_password', token=reset_password_token) }}" method="POST" name="reset_password_form">
   {{ reset_password_form.hidden_tag() }}
@@ -10,5 +10,5 @@
   {{ render_field_with_errors(reset_password_form.password_confirm) }}
   {{ render_field(reset_password_form.submit) }}
 </form>
-{% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/send_confirmation.html b/templates/security/send_confirmation.html
index 799783a..83d1de7 100644
--- a/templates/security/send_confirmation.html
+++ b/templates/security/send_confirmation.html
@@ -1,13 +1,13 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-{% include "security/_messages.html" %}
+
 <h1>{{ _('Resend confirmation instructions') }}</h1>
 <form action="{{ url_for_security('send_confirmation') }}" method="POST" name="send_confirmation_form">
   {{ send_confirmation_form.hidden_tag() }}
   {{ render_field_with_errors(send_confirmation_form.email) }}
   {{ render_field(send_confirmation_form.submit) }}
 </form>
-{% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/send_login.html b/templates/security/send_login.html
index 2f97115..d3b274c 100644
--- a/templates/security/send_login.html
+++ b/templates/security/send_login.html
@@ -1,13 +1,13 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-{% include "security/_messages.html" %}
+
 <h1>{{ _('Login') }}</h1>
 <form action="{{ url_for_security('login') }}" method="POST" name="send_login_form">
   {{ send_login_form.hidden_tag() }}
   {{ render_field_with_errors(send_login_form.email) }}
   {{ render_field(send_login_form.submit) }}
 </form>
-{% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/two_factor_setup.html b/templates/security/two_factor_setup.html
index d5dee84..77a6672 100644
--- a/templates/security/two_factor_setup.html
+++ b/templates/security/two_factor_setup.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field, render_field_no_label, render_field_errors %}
+{% from "_macros.html" import render_field_with_errors, render_field, render_field_no_label, render_field_errors %}
 
 {% block content %}
-    {% include "security/_messages.html" %}
+
     <h1>{{ _("Two-factor authentication adds an extra layer of security to your account") }}</h1>
     <h2>{{ _("In addition to your username and password, you'll need to use a code that we will send you") }}</h2>
     <form action="{{ url_for_security("two_factor_setup") }}" method="POST" name="two_factor_setup_form">
@@ -34,5 +34,5 @@
         {{ render_field_with_errors(two_factor_verify_code_form.code) }}
         {{ render_field(two_factor_verify_code_form.submit) }}
     </form>
-    {% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/two_factor_verify_code.html b/templates/security/two_factor_verify_code.html
index f2c2b1f..96c1f3e 100644
--- a/templates/security/two_factor_verify_code.html
+++ b/templates/security/two_factor_verify_code.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-    {% include "security/_messages.html" %}
+
     <h1>{{ _("Two-factor Authentication") }}</h1>
     <h2>{{ _("Please enter your authentication code") }}</h2>
     <form action="{{ url_for_security("two_factor_token_validation") }}" method="POST"
@@ -22,5 +22,5 @@
         {% endif %}
         {{ render_field(two_factor_rescue_form.submit) }}
     </form>
-    {% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/two_factor_verify_password.html b/templates/security/two_factor_verify_password.html
index beb33fa..be1808f 100644
--- a/templates/security/two_factor_verify_password.html
+++ b/templates/security/two_factor_verify_password.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-    {% include "security/_messages.html" %}
+
     <h1>{{ _("Please Enter Your Password") }}</h1>
     <form action="{{ url_for_security("two_factor_verify_password") }}" method="POST"
           name="two_factor_verify_password_form">
diff --git a/templates/security/us_setup.html b/templates/security/us_setup.html
index 0f027b4..24ec5a8 100644
--- a/templates/security/us_setup.html
+++ b/templates/security/us_setup.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field, render_field_errors %}
+{% from "_macros.html" import render_field_with_errors, render_field, render_field_errors %}
 
 {% block content %}
-    {% include "security/_messages.html" %}
+
     <h1>{{ _("Setup Unified Sign In options") }}</h1>
     <form action="{{ url_for_security("us_setup") }}" method="POST"
           name="us_setup_form">
diff --git a/templates/security/us_signin.html b/templates/security/us_signin.html
index 140e3d7..436df1f 100644
--- a/templates/security/us_signin.html
+++ b/templates/security/us_signin.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field, render_field_errors %}
+{% from "_macros.html" import render_field_with_errors, render_field, render_field_errors %}
 
 {% block content %}
-    {% include "security/_messages.html" %}
+
     <h1>{{ _("Sign In") }}</h1>
       <form action="{{ url_for_security("us_signin") }}" method="POST"
           name="us_signin_form">
@@ -25,5 +25,5 @@
         {{ render_field(us_signin_form.submit_send_code, formaction=url_for_security('us_signin_send_code')) }}
       {% endif %}
       </form>
-  {% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/us_verify.html b/templates/security/us_verify.html
index b61a0d5..8b38853 100644
--- a/templates/security/us_verify.html
+++ b/templates/security/us_verify.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field, render_field_errors %}
+{% from "_macros.html" import render_field_with_errors, render_field, render_field_errors %}
 
 {% block content %}
-    {% include "security/_messages.html" %}
+
     <h1>{{ _("Please re-authenticate") }}</h1>
       <form action="{{ url_for_security("us_verify") }}{% if 'next' in request.args %}?next={{ request.args.next|urlencode }}{% endif %}" method="POST"
           name="us_verify_form">
@@ -23,5 +23,5 @@
         {{ render_field(us_verify_form.submit_send_code, formaction=send_code_to) }}
       {% endif %}
       </form>
-  {% include "security/_menu.html" %}
+
 {% endblock %}
diff --git a/templates/security/verify.html b/templates/security/verify.html
index 5313956..a1859a1 100644
--- a/templates/security/verify.html
+++ b/templates/security/verify.html
@@ -1,8 +1,8 @@
 {% extends "layout.html" %}
-{% from "security/_macros.html" import render_field_with_errors, render_field %}
+{% from "_macros.html" import render_field_with_errors, render_field %}
 
 {% block content %}
-    {% include "security/_messages.html" %}
+
     <h1>{{ _("Please Enter Your Password") }}</h1>
     <form action="{{ url_for_security("verify") }}{% if 'next' in request.args %}?next={{ request.args.next|urlencode }}{% endif %}" method="POST"
           name="verify_form">