From 05a0d0e0ba5243fa0a0f0cd3e3797c546870f2e5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Aug 2018 23:39:58 +0100 Subject: [PATCH] Split into partials --- source/_layouts/default.html.twig | 24 ++----------------- source/_partials/layout/header.html.twig | 11 +++++++++ source/_partials/layout/main-menu.html.twig | 10 ++++++++ .../{ => pages/classes}/class-list.html.twig | 0 .../{ => pages}/contact/form.html.twig | 0 .../{ => pages}/contact/map.html.twig | 0 source/contact.html.twig | 4 ++-- source/schedule.html.twig | 4 ++-- 8 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 source/_partials/layout/header.html.twig create mode 100644 source/_partials/layout/main-menu.html.twig rename source/_partials/{ => pages/classes}/class-list.html.twig (100%) rename source/_partials/{ => pages}/contact/form.html.twig (100%) rename source/_partials/{ => pages}/contact/map.html.twig (100%) diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 013fb8a..c9a4a5c 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -8,28 +8,8 @@
-
-
-
- -

Chris Rees Academy

-

Cardiff

-
- - -
-
- - + {% include 'layout/header' %} + {% include 'layout/main-menu' %}
diff --git a/source/_partials/layout/header.html.twig b/source/_partials/layout/header.html.twig new file mode 100644 index 0000000..9ba3784 --- /dev/null +++ b/source/_partials/layout/header.html.twig @@ -0,0 +1,11 @@ +
+
+
+ +

Chris Rees Academy

+

Cardiff

+
+ + +
+
diff --git a/source/_partials/layout/main-menu.html.twig b/source/_partials/layout/main-menu.html.twig new file mode 100644 index 0000000..7532113 --- /dev/null +++ b/source/_partials/layout/main-menu.html.twig @@ -0,0 +1,10 @@ + diff --git a/source/_partials/class-list.html.twig b/source/_partials/pages/classes/class-list.html.twig similarity index 100% rename from source/_partials/class-list.html.twig rename to source/_partials/pages/classes/class-list.html.twig diff --git a/source/_partials/contact/form.html.twig b/source/_partials/pages/contact/form.html.twig similarity index 100% rename from source/_partials/contact/form.html.twig rename to source/_partials/pages/contact/form.html.twig diff --git a/source/_partials/contact/map.html.twig b/source/_partials/pages/contact/map.html.twig similarity index 100% rename from source/_partials/contact/map.html.twig rename to source/_partials/pages/contact/map.html.twig diff --git a/source/contact.html.twig b/source/contact.html.twig index 2d988e4..ec7600f 100644 --- a/source/contact.html.twig +++ b/source/contact.html.twig @@ -27,8 +27,8 @@ location: |
- {% include 'contact/map' %} + {% include 'pages/contact/map' %}
-{% include 'contact/form' %} +{% include 'pages/contact/form' %} diff --git a/source/schedule.html.twig b/source/schedule.html.twig index a6068f1..0ecbacb 100644 --- a/source/schedule.html.twig +++ b/source/schedule.html.twig @@ -116,7 +116,7 @@ classes:

Adults

- {% include 'class-list' with { + {% include 'pages/classes/class-list' with { classes: page.classes, type: 'adults', } %} @@ -125,7 +125,7 @@ classes:

Kids

- {% include 'class-list' with { + {% include 'pages/classes/class-list' with { classes: page.classes, type: 'kids', } %}