Restructure modals and base template

This commit is contained in:
Patrick Jentsch
2023-11-13 15:53:14 +01:00
parent ff1bcb40f3
commit 9487aa7a60
20 changed files with 19 additions and 69 deletions

View File

@@ -16,16 +16,16 @@
{% block styles %}
{{ super() }}
{% include "_styles.html.j2" %}
{% include "_base/styles.html.j2" %}
{% endblock styles %}
{% block navbar %}
{% include "_navbar.html.j2" %}
{% include "_base/navbar.html.j2" %}
{% endblock navbar %}
{% block sidenav %}
{% if current_user.is_authenticated %}
{% include "_sidenav.html.j2" %}
{% include "_base/sidenav.html.j2" %}
{% endif %}
{% endblock sidenav %}
@@ -34,23 +34,17 @@
{% block page_content %}{% endblock page_content %}
<div id="modals">
{% block modals %}
{% include "main/_manual_modal.html.j2" %}
{# {% if current_user.is_authenticated %}
{% include "_roadmap.html.j2" %}
{% endif %} #}
{% if current_user.is_authenticated and not current_user.terms_of_use_accepted %}
{% include "_terms_of_use_modal.html.j2" %}
{% endif %}
{% include "_base/modals.html.j2" %}
{% endblock modals %}
</div>
{% endblock main %}
{% block footer_attribs %} class="page-footer primary-variant-color"{% endblock footer_attribs %}
{% block footer %}
{% include "_footer.html.j2" %}
{% include "_base/footer.html.j2" %}
{% endblock footer %}
{% block scripts %}
{{ super() }}
{% include "_scripts.html.j2" %}
{% include "_base/scripts.html.j2" %}
{% endblock scripts %}