Skip to content

Move header and footer blocks out of govuk-branded into main #2486

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

Closed
owenatgov wants to merge 1 commit into from
Closed

Move header and footer blocks out of govuk-branded into main #2486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Breaking

- [#2486: Move header and footer blocks out of govuk-branded into main](https://github.com/alphagov/govuk-prototype-kit/pull/2486)

## 13.18.1

### Fixes
Expand Down
20 changes: 16 additions & 4 deletions __tests__/spec/migrate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,22 @@ https://prototype-kit.service.gov.uk/docs/how-to-use-layouts

{% block header %}

{{ govukHeader() }}
{{ govukServiceNavigation({
serviceName: serviceName
})}}
{{ govukHeader() }}
{{ govukServiceNavigation({
serviceName: serviceName,
serviceUrl: "/"
})}}

{% endblock %}

{% block footer %}

{{ govukFooter({
meta: {
items: footerItems,
visuallyHiddenTitle: "Footer links"
}
}) }}

{% endblock %}
`
Expand Down
40 changes: 11 additions & 29 deletions lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,7 @@

{% extends "govuk/template.njk" %}

{% block head %}
{% block meta %}{% endblock %}
{% block stylesheets %}
{% include "govuk-prototype-kit/includes/stylesheets.njk" %}
{% endblock %}
{% endblock %}

{% block pageTitle %}
{% if pageName %}{{ pageName }} - {% endif %}{{ serviceName }} - GOV.UK
{% endblock %}

{% block header %}
{{ govukHeader({
homepageUrl: "/",
serviceName: serviceName,
serviceUrl: "/",
containerClasses: "govuk-width-container"
}) }}
{% endblock %}

{% if (GOVUKPrototypeKit.isDevelopment) %}
{%- if (GOVUKPrototypeKit.isDevelopment) %}
{% set footerItems = [
{
href: "/manage-prototype",
Expand All @@ -39,15 +19,17 @@
text: "Clear data"
}
] %}
{% endif %}
{% endif -%}

{% block footer %}
{{ govukFooter({
meta: {
items: footerItems,
visuallyHiddenTitle: "Footer links"
}
}) }}
{% block head %}
{% block meta %}{% endblock %}
{% block stylesheets %}
{% include "govuk-prototype-kit/includes/stylesheets.njk" %}
{% endblock %}
{% endblock %}

{% block pageTitle %}
{% if pageName %}{{ pageName }} - {% endif %}{{ serviceName }} - GOV.UK
{% endblock %}

{% block bodyEnd %}
Expand Down
20 changes: 16 additions & 4 deletions prototype-starter/app/views/layouts/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,21 @@

{% block header %}

{{ govukHeader() }}
{{ govukServiceNavigation({
serviceName: serviceName
})}}
{{ govukHeader() }}
{{ govukServiceNavigation({
serviceName: serviceName,
serviceUrl: "/"
})}}

{% endblock %}

{% block footer %}

{{ govukFooter({
meta: {
items: footerItems,
visuallyHiddenTitle: "Footer links"
}
}) }}

{% endblock %}