From 98afbc09470e0cd229668198fd6e5bc5f8157f04 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 20 May 2019 20:44:51 +0100 Subject: [PATCH] Split base and app layouts --- source/_layouts/app.html.twig | 11 ++++++++ source/_layouts/base.html.twig | 46 ++++++++++++++++------------------ 2 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 source/_layouts/app.html.twig diff --git a/source/_layouts/app.html.twig b/source/_layouts/app.html.twig new file mode 100644 index 0000000..7e67e50 --- /dev/null +++ b/source/_layouts/app.html.twig @@ -0,0 +1,11 @@ + + + + {% include 'meta' %} + + +
+ {% block body %}{% endblock %} +
+ + diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index d24e0eb..3f89381 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -1,29 +1,25 @@ - - - - {% include 'meta' %} - - - -
- {% include 'banner' %} +{% extends 'app' %} -
- {% block content_wrapper %} - {% block content %}{% endblock %} - {% endblock %} +{% block body %} + +
+ {% include 'banner' %} - {% if page.update_text %} - {% include 'update-text' %} - {% endif %} -
+
+ {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock %} -
- {% block content_bottom %}{% endblock %} - {% include 'footer' %} -
+ {% if page.update_text %} + {% include 'update-text' %} + {% endif %}
- - + +
+ {% block content_bottom %}{% endblock %} + {% include 'footer' %} +
+
+{% endblock %}