opdavies/dcbristol-2019-static
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Split base and app layouts

Browse source
This commit is contained in:
Oliver Davies 2019-05-20 20:44:51 +01:00
parent 3d8a8f6bf7
commit 98afbc0947
2 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/_layouts/app.html.twig Normal file
View file

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en" dir="ltr" prefix="content: http://purl.org/rss/1.0/modules/content/ dc: http://purl.org/dc/terms/ foaf: http://xmlns.com/foaf/0.1/ og: http://ogp.me/ns# rdfs: http://www.w3.org/2000/01/rdf-schema# schema: http://schema.org/ sioc: http://rdfs.org/sioc/ns# sioct: http://rdfs.org/sioc/types# skos: http://www.w3.org/2004/02/skos/core# xsd: http://www.w3.org/2001/XMLSchema# ">
<head>
{% include 'meta' %}
</head>
<body class="path-frontpage">
<div id="app">
{% block body %}{% endblock %}
</div>
</body>
</html>

46
source/_layouts/base.html.twig
View file

@ -1,29 +1,25 @@
<!DOCTYPE html>
<html lang="en" dir="ltr" prefix="content: http://purl.org/rss/1.0/modules/content/ dc: http://purl.org/dc/terms/ foaf: http://xmlns.com/foaf/0.1/ og: http://ogp.me/ns# rdfs: http://www.w3.org/2000/01/rdf-schema# schema: http://schema.org/ sioc: http://rdfs.org/sioc/ns# sioct: http://rdfs.org/sioc/types# skos: http://www.w3.org/2004/02/skos/core# xsd: http://www.w3.org/2001/XMLSchema# ">
<head>
{% include 'meta' %}
</head>
<body class="path-frontpage">
<a href="#main-content" class="visually-hidden focusable skip-link">
Skip to main content
</a>
<div class="tw-min-h-screen tw-flex tw-flex-col">
{% include 'banner' %}
{% extends 'app' %}
<div class="tw-flex tw-flex-col tw-flex-1">
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
{% block body %}
<a href="#main-content" class="visually-hidden focusable skip-link">
Skip to main content
</a>
<div class="tw-min-h-screen tw-flex tw-flex-col">
{% include 'banner' %}
{% if page.update_text %}
{% include 'update-text' %}
{% endif %}
</div>
<div class="tw-flex tw-flex-col tw-flex-1">
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
<div>
{% block content_bottom %}{% endblock %}
{% include 'footer' %}
</div>
{% if page.update_text %}
{% include 'update-text' %}
{% endif %}
</div>
</body>
</html>
<div>
{% block content_bottom %}{% endblock %}
{% include 'footer' %}
</div>
</div>
{% endblock %}