diff --git a/templates/base.html.tera b/templates/base.html.tera index ec2d4d2..cbca953 100644 --- a/templates/base.html.tera +++ b/templates/base.html.tera @@ -10,17 +10,19 @@ Ruderassistent - ASKÖ Ruderverein Donau Linz - {%if loggedin_user %} + {% if loggedin_user %} {{ macros::header(loggedin_user=loggedin_user) }} - {%endif%} + {% endif %}
{% block content %}{% endblock content %}
- {%if loggedin_user %} + {% if loggedin_user %} {% include "includes/footer" %} - {%endif%} + {% endif %} + {% include "dynamics/sidebar" %} + diff --git a/templates/boatdamages.html.tera b/templates/boatdamages.html.tera index e60cb93..3d29f28 100644 --- a/templates/boatdamages.html.tera +++ b/templates/boatdamages.html.tera @@ -56,5 +56,4 @@ -{% include "dynamics/sidebar" %} {% endblock content%} diff --git a/templates/includes/book.html.tera b/templates/includes/book.html.tera new file mode 100644 index 0000000..941c987 --- /dev/null +++ b/templates/includes/book.html.tera @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index 72cc855..acd5ea2 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -13,31 +13,31 @@ {% include "includes/question-icon" %} FAQs - {% if loggedin_user.is_admin%} - - Bootsschaden - Bootsschaden - - - {% endif %} {% if loggedin_user.is_admin %} - - STATS - Logbuch - - - LOGBUCH HISTORY - Logbuch History - - - LOGBUCH - Logbuch - - - BOATS - Bootsverwaltung - - + + {% include "includes/book" %} + Logbuch + + diff --git a/templates/index.html.tera b/templates/index.html.tera index 4645ceb..c08f113 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -293,8 +293,6 @@ -{% include "dynamics/sidebar" %} - {% if loggedin_user.is_cox %} {% include "forms/trip" %} {% endif %} diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera index 8150a6d..95715da 100644 --- a/templates/kiosk.html.tera +++ b/templates/kiosk.html.tera @@ -38,7 +38,5 @@ -{% include "dynamics/sidebar" %} - {% endblock content%} diff --git a/templates/log.html.tera b/templates/log.html.tera index a70b636..7e21ffe 100644 --- a/templates/log.html.tera +++ b/templates/log.html.tera @@ -42,7 +42,5 @@ - {% include "dynamics/sidebar" %} - {% endblock content%}