From 661669f2a58f222f8a8a9caa72a67d4c50987f85 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 18 Dec 2024 21:45:11 +0000 Subject: [PATCH] Combine the default and base templates --- source/_layouts/base.html.twig | 46 ++++++++++++++++++++++++++++- source/_layouts/default.html.twig | 49 ------------------------------- source/_layouts/page.html.twig | 2 +- 3 files changed, 46 insertions(+), 51 deletions(-) delete mode 100644 source/_layouts/default.html.twig diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index 413484418..7786ef0c5 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -45,7 +45,51 @@ Jump to the navigation menu - {% block body %}{% endblock %} +
+ {% include 'banner.html.twig' %} + +
+
+ {% include 'logo.html.twig' %} +
+
+ +
+
+ {% block content_top %}{% endblock %} + +
+ {% if page.url matches "#^/atdc/#" %} +
+
+
+

I'm currently updating this course for Drupal 11. If you find any bugs or have any issues, please let me know. +

+
+
+ {% endif %} + +

+ {% block page_title %}{{ page.title }}{% endblock %} +

+ +
+ {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock %} +
+
+ + {% block content_bottom %}{% endblock %} +
+ +
+ + + {% include 'main-menu.html.twig' %} +
+
+
{# Add the Mastodon verification link so pages can be verified. #} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig deleted file mode 100644 index 1f5abf8e0..000000000 --- a/source/_layouts/default.html.twig +++ /dev/null @@ -1,49 +0,0 @@ -{% extends 'base' %} - -{% block body %} -
- {% include 'banner.html.twig' %} - -
-
- {% include 'logo.html.twig' %} -
-
- -
-
- {% block content_top %}{% endblock %} - -
- {% if page.url matches "#^/atdc/#" %} -
-
-
-

I'm currently updating this course for Drupal 11. If you find any bugs or have any issues, please let me know. -

-
-
- {% endif %} - -

- {% block page_title %}{{ page.title }}{% endblock %} -

- -
- {% block content_wrapper %} - {% block content %}{% endblock %} - {% endblock %} -
-
- - {% block content_bottom %}{% endblock %} -
- - -
-
-{% endblock %} diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig index 3d01df5d3..d055ba343 100644 --- a/source/_layouts/page.html.twig +++ b/source/_layouts/page.html.twig @@ -1,4 +1,4 @@ -{% extends 'default' %} +{% extends 'base' %} {% block content_bottom %} {% include 'about-me.html.twig' %}