From 9447e76815cdcd45790b6271e46d33805a5ffbc3 Mon Sep 17 00:00:00 2001 From: Nick Yeoman Date: Sat, 31 Aug 2024 14:02:51 -0700 Subject: [PATCH] working for a parked page --- examples/App/views/index.html.twig | 2 +- twig/foot.html.twig | 6 ++++++ twig/footer.html.twig | 3 +++ twig/head.html.twig | 2 +- twig/master.html.twig | 12 +++++------- 5 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 twig/foot.html.twig create mode 100644 twig/footer.html.twig diff --git a/examples/App/views/index.html.twig b/examples/App/views/index.html.twig index a38042f..798960c 100644 --- a/examples/App/views/index.html.twig +++ b/examples/App/views/index.html.twig @@ -1,4 +1,4 @@ -{% extends '@nytwig/master.html.twig' %} +{% extends '@novaconium/master.html.twig' %} {% block content %}

This is twig

diff --git a/twig/foot.html.twig b/twig/foot.html.twig new file mode 100644 index 0000000..58c7f71 --- /dev/null +++ b/twig/foot.html.twig @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/twig/footer.html.twig b/twig/footer.html.twig new file mode 100644 index 0000000..4cbe189 --- /dev/null +++ b/twig/footer.html.twig @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/twig/head.html.twig b/twig/head.html.twig index 203f27f..7e0479f 100644 --- a/twig/head.html.twig +++ b/twig/head.html.twig @@ -1,6 +1,6 @@ {{ title | default('Welcome') }} - + diff --git a/twig/master.html.twig b/twig/master.html.twig index 288c8a4..fd5c21b 100644 --- a/twig/master.html.twig +++ b/twig/master.html.twig @@ -1,10 +1,10 @@ -{% include '@override/mod_above_head.html.twig' ignore missing %} +{% include '@override/above_head.html.twig' ignore missing %} - {% include ['@override/mod_head.html.twig', '@novaconium/head.html.twig'] %} + {% include ['@override/head.html.twig', '@novaconium/head.html.twig'] %} @@ -12,7 +12,7 @@ {# Page Header #}
{% block headerbefore %}{% endblock %} - {% include ['@override/mod_nav.html.twig', '@novaconium/nav.html.twig'] %} + {% include ['@override/nav.html.twig', '@novaconium/nav.html.twig'] %} {% block headerafter %}{% endblock %}
@@ -34,9 +34,7 @@ {% endif %}
- {% include 'cms/mod_alex.html.twig' ignore missing %} {% block content %}{% endblock %} - {% include 'cms/mod_simon.html.twig' ignore missing %}
@@ -46,9 +44,9 @@ {# Page Footer #} -{% include '@override/mod_foot.html.twig' ignore missing %} +{% include ['@override/foot.html.twig', '@novaconium/foot.html.twig'] %}