From 9ea524a4c4e5bd05dff2c97deb1415c5c5d2df92 Mon Sep 17 00:00:00 2001 From: Maxim Stewart Date: Mon, 9 Nov 2020 19:33:27 -0600 Subject: [PATCH] updating blocks and metas --- src/core/templates/error.html | 4 - src/core/templates/layout.html | 103 ++++++++++++----------- src/core/templates/pages/index.html | 16 +++- src/core/templates/pages/login.html | 12 ++- src/core/templates/pages/protected.html | 12 ++- src/core/templates/pages/react-page.html | 16 +++- src/core/templates/pages/register.html | 12 ++- 7 files changed, 115 insertions(+), 60 deletions(-) diff --git a/src/core/templates/error.html b/src/core/templates/error.html index 73b9d43..678c5b7 100644 --- a/src/core/templates/error.html +++ b/src/core/templates/error.html @@ -8,7 +8,3 @@ {% endblock body_content_additional %} - -{% block scripts %} - -{% endblock scripts %} diff --git a/src/core/templates/layout.html b/src/core/templates/layout.html index f62a07e..1decdc8 100644 --- a/src/core/templates/layout.html +++ b/src/core/templates/layout.html @@ -1,10 +1,19 @@ +{% block header %} - - - - + {% block header_meta %} + + + + + + + + {% block header_meta_additional %} + {% endblock header_meta_additional %} + {% endblock %} + {% if title %} {{title}} {% else %} @@ -40,61 +49,61 @@ {% endblock header_scripts_additional %} {% endblock %} +{% endblock %} - {{title}} Background Logo + {% block body_header %} + {{title}} Background Logo + {% include "body-header.html" %} -{% block body_header %} - {% include "body-header.html" %} + {% block body_header_additional %} + {% endblock body_header_additional%} + {% endblock %} - {% block body_header_additional %} - {% endblock body_header_additional%} -{% endblock %} - - -{% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} -
- {% for category, message in messages %} -
  • {{ message }}
    • - {% endfor %} -
    - {% endif %} -{% endwith %} + + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} +
    + {% for category, message in messages %} +
  • {{ message }}
    • + {% endfor %} +
    + {% endif %} + {% endwith %} -
    -{% block body_content %} - {% block body_content_additional %} - {% endblock body_content_additional%} -{% endblock %} -
    +
    + {% block body_content %} + {% block body_content_additional %} + {% endblock body_content_additional%} + {% endblock %} +
    -{% block body_footer %} - {% include "body-footer.html" %} + {% block body_footer %} + {% include "body-footer.html" %} - {% block body_footer_additional %} - {% endblock body_footer_additional%} -{% endblock %} + {% block body_footer_additional %} + {% endblock body_footer_additional%} + {% endblock %} -{% block body_scripts %} - - - - + {% block body_scripts %} + + + + - - - + + + - - - + + + - - {% block body_scripts_additional %} - {% endblock body_scripts_additional%} -{% endblock %} + + {% block body_scripts_additional %} + {% endblock body_scripts_additional%} + {% endblock %} diff --git a/src/core/templates/pages/index.html b/src/core/templates/pages/index.html index 8b7ed1c..a012318 100644 --- a/src/core/templates/pages/index.html +++ b/src/core/templates/pages/index.html @@ -1,9 +1,19 @@ {% extends "layout.html" %} +{% block header_meta_additional %} +{% endblock header_meta_additional %} + +{% block header_css_additional %} +{% endblock header_css_additional %} + +{% block header_scripts_additional %} +{% endblock header_scripts_additional %} + + {% block body_header_additional %} {% endblock body_header_additional %} -{% block body_content %} +{% block body_content_additional %}
    @@ -14,12 +24,12 @@
    -{% endblock body_content %} - +{% endblock body_content_additional %} {% block body_footer_additional %} {% endblock body_footer_additional %} + {% block body_scripts_additional %} diff --git a/src/core/templates/pages/login.html b/src/core/templates/pages/login.html index 5afcda1..fd467d8 100644 --- a/src/core/templates/pages/login.html +++ b/src/core/templates/pages/login.html @@ -1,5 +1,15 @@ {% extends "layout.html" %} +{% block header_meta_additional %} +{% endblock header_meta_additional %} + +{% block header_css_additional %} +{% endblock header_css_additional %} + +{% block header_scripts_additional %} +{% endblock header_scripts_additional %} + + {% block body_header_additional %} {% endblock body_header_additional %} @@ -48,9 +58,9 @@ {% endblock body_content_additional %} - {% block body_footer_additional %} {% endblock body_footer_additional %} + {% block body_scripts_additional %} {% endblock body_scripts_additional %} diff --git a/src/core/templates/pages/protected.html b/src/core/templates/pages/protected.html index 8aa12f5..ad7155c 100644 --- a/src/core/templates/pages/protected.html +++ b/src/core/templates/pages/protected.html @@ -1,5 +1,15 @@ {% extends "layout.html" %} +{% block header_meta_additional %} +{% endblock header_meta_additional %} + +{% block header_css_additional %} +{% endblock header_css_additional %} + +{% block header_scripts_additional %} +{% endblock header_scripts_additional %} + + {% block body_header_additional %} {% endblock body_header_additional %} @@ -11,10 +21,10 @@ {% endblock body_content_additional %} - {% block body_footer_additional %} {% endblock body_footer_additional %} + {% block body_scripts_additional %} diff --git a/src/core/templates/pages/react-page.html b/src/core/templates/pages/react-page.html index 68248a4..8cdfeda 100644 --- a/src/core/templates/pages/react-page.html +++ b/src/core/templates/pages/react-page.html @@ -1,17 +1,27 @@ {% extends "layout.html" %} +{% block header_meta_additional %} +{% endblock header_meta_additional %} + +{% block header_css_additional %} +{% endblock header_css_additional %} + +{% block header_scripts_additional %} +{% endblock header_scripts_additional %} + + {% block body_header_additional %} {% endblock body_header_additional %} -{% block body_content %} +{% block body_content_additional %}
    -{% endblock body_content %} - +{% endblock body_content_additional %} {% block body_footer_additional %} {% endblock body_footer_additional %} + {% block body_scripts_additional %} diff --git a/src/core/templates/pages/register.html b/src/core/templates/pages/register.html index 3ed65a2..ac3aa5f 100644 --- a/src/core/templates/pages/register.html +++ b/src/core/templates/pages/register.html @@ -1,5 +1,15 @@ {% extends "layout.html" %} +{% block header_meta_additional %} +{% endblock header_meta_additional %} + +{% block header_css_additional %} +{% endblock header_css_additional %} + +{% block header_scripts_additional %} +{% endblock header_scripts_additional %} + + {% block body_header_additional %} {% endblock body_header_additional %} @@ -76,9 +86,9 @@ {% endblock body_content_additional %} - {% block body_footer_additional %} {% endblock body_footer_additional %} + {% block body_scripts_additional %} {% endblock body_scripts_additional %}