Skip to content

[SPIKE] Page template block updates #5004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
querkmachine wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

[SPIKE] Page template block updates #5004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60b6548
Update to preview branch
querkmachine Nov 27, 2025
188de31
Update header and footer partials
querkmachine Nov 27, 2025
6881ab6
Rename beforeContent -> containerStart blocks
querkmachine Nov 27, 2025
4e83a7c
Update main -> container blocks
querkmachine Nov 27, 2025
dee4e2b
Rename empty header and footer blocks
querkmachine Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.1.1",
"glob": "^11.1.0",
"govuk-frontend": "^5.13.0",
"govuk-frontend": "github:alphagov/govuk-frontend#4e255359e",
"gray-matter": "^4.0.2",
"highlight.js": "^11.11.1",
"html-validate": "^10.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/error-summary/full-page-example/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/date-input/macro.njk" import govukDateInput %}
{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}

{% block beforeContent %}
{% block containerStart %}
{{ govukBackLink({
text: "Back"
}) }}
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/check-a-service-is-suitable/result/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% block beforeContent %}
{% block containerStart %}
{{ govukPhaseBanner({
tag: {
text: "Prototype"
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/check-answers/default/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% block beforeContent %}
{% block containerStart %}
{{ govukBackLink({
text: "Back",
href: "#"
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/cookies-page/full-page/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ layout: layout-example-full-page-with-no-footer.njk
{% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
{% from "govuk/components/table/macro.njk" import govukTable %}

{% block beforeContent %}
{% block containerStart %}
{{ govukPhaseBanner({
tag: {
text: "Prototype"
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/date-of-birth/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/date-input/macro.njk" import govukDateInput %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% block beforeContent %}
{% block containerStart %}
{{ govukBackLink({
text: "Back"
}) }}
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/default/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/radios/macro.njk" import govukRadios %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% block beforeContent %}
{% block containerStart %}
{{ govukBackLink({
text: "Back"
}) }}
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/explanatory-text/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/radios/macro.njk" import govukRadios %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% block beforeContent %}
{% block containerStart %}
{{ govukBackLink({
text: "Back"
}) }}
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/passport/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/date-input/macro.njk" import govukDateInput %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% block beforeContent %}
{% block containerStart %}
{{ govukBackLink({
text: "Back"
}) }}
Expand Down
2 changes: 1 addition & 1 deletion src/patterns/question-pages/postcode/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ layout: layout-example-full-page.njk
{% from "govuk/components/input/macro.njk" import govukInput %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% block beforeContent %}
{% block containerStart %}
{{ govukBackLink({
text: "Back"
}) }}
Expand Down
4 changes: 2 additions & 2 deletions src/styles/page-template/block-areas/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ stylesheets:
</div>
{%- endblock %}

{% block main -%}
{% block container -%}
<div class="app-annotate-block">
<span class="app-annotate-block__label">block: main</span>
<p class="govuk-body">
Expand All @@ -50,7 +50,7 @@ stylesheets:
</div>
{%- endblock %}

{% block beforeContent -%}
{% block containerStart -%}
<div class="app-annotate-block">
<span class="app-annotate-block__label">block: beforeContent</span>
{{ super() }}
Expand Down
4 changes: 2 additions & 2 deletions src/styles/page-template/custom/code.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ ignoreInSitemap: true

{% set mainClasses = "app-main-class" %}

{% block main %}
{% block container %}
{{ super() }}
{% endblock %}

{% block beforeContent %}
{% block containerStart %}
{{ govukPhaseBanner({
tag: {
text: "Alpha"
Expand Down
4 changes: 2 additions & 2 deletions src/styles/page-template/custom/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ ignoreInSitemap: true

{% set mainClasses = "app-main-class" %}

{% block main %}
{% block container %}
{{ super() }}
{% endblock %}

{% block beforeContent %}
{% block containerStart %}
{{ govukPhaseBanner({
tag: {
text: "Alpha"
Expand Down
13 changes: 7 additions & 6 deletions views/layouts/_generic.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,22 @@
}) %}{% endcall %}
{% endblock %}

{# We provide our own header, so blank the one provided by the template #}
{% block header %}{% endblock %}

{% block main %}
{% block header %}
{% include "_header.njk" %}
{% include "_navigation.njk" %}
{% endblock %}

{% block container %}
{% include "_banner.njk" %}

{% block body %}
{{ contents | safe }}
{% endblock %}
{% endblock %}

{# We provide our own footer, so blank the one provided by the template #}
{% block footer %}{% endblock %}
{% block footer %}
{% include "_footer.njk" %}
{% endblock %}

{% block bodyEnd %}
<script type="module" src="{{ getFingerprint('/javascripts/application.js') }}"></script>
Expand Down
Loading