Skip to content

Commit 0ef69a4

Browse files
matthew-shawmatthew-shaw
committed
follow service navigation patterns
1 parent 34e2df9 commit 0ef69a4

File tree

10 files changed

+10
-175
lines changed

10 files changed

+10
-175
lines changed

‎app/templates/base.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{%- from 'govuk_frontend_jinja/components/error-summary/macro.html' import govukErrorSummary-%}
55
{%- from 'govuk_frontend_jinja/components/notification-banner/macro.html' import govukNotificationBanner -%}
66
{%- from 'govuk_frontend_jinja/components/phase-banner/macro.html' import govukPhaseBanner -%}
7+
{%- from 'govuk_frontend_jinja/components/service-navigation/macro.html' import govukServiceNavigation -%}
78

89
{% set assetPath = url_for('static', filename='').rstrip('/') %}
910

@@ -108,10 +109,17 @@
108109

109110
{% block header %}
110111
{{ govukHeader({
111-
'homepageUrl': url_for('main.index'),
112+
'classes': 'govuk-header--full-width-border',
113+
'homepageUrl': 'https://www.gov.uk/'
114+
}) }}
115+
116+
{{ govukServiceNavigation({
112117
'serviceName': config['SERVICE_NAME'],
113118
'serviceUrl': url_for('main.index'),
114-
'useTudorCrown': true
119+
'navigation': [
120+
{'href': url_for('demos.components'), 'text': 'Components'},
121+
{'href': url_for('demos.forms'), 'text': 'Forms'}
122+
]
115123
}) }}
116124
{% endblock %}
117125

‎app/templates/demos/autocomplete.html

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,7 @@
11
{% extends "base.html" %}
22

3-
{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
4-
53
{% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Autocomplete – GOV.UK{% endblock %}
64

7-
{% block beforeContent %}
8-
{{ super() }}
9-
{{ govukBreadcrumbs({
10-
'collapseOnMobile': True,
11-
'items': [
12-
{
13-
'text': "Home",
14-
'href': url_for('main.index')
15-
},
16-
{
17-
'text': "Forms",
18-
'href': url_for('demos.forms')
19-
},
20-
{
21-
'text': "Autocomplete"
22-
}
23-
]
24-
}) }}
25-
{% endblock %}
26-
275
{% block content %}
286
<div class="govuk-grid-row">
297
<div class="govuk-grid-column-two-thirds">

‎app/templates/demos/bank_details.html

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,7 @@
11
{% extends "base.html" %}
22

3-
{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
4-
53
{% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Bank details – GOV.UK{% endblock %}
64

7-
{% block beforeContent %}
8-
{{ super() }}
9-
{{ govukBreadcrumbs({
10-
'collapseOnMobile': True,
11-
'items': [
12-
{
13-
'text': "Home",
14-
'href': url_for('main.index')
15-
},
16-
{
17-
'text': "Forms",
18-
'href': url_for('demos.forms')
19-
},
20-
{
21-
'text': "Bank details"
22-
}
23-
]
24-
}) }}
25-
{% endblock %}
26-
275
{% block content %}
286
<div class="govuk-grid-row">
297
<div class="govuk-grid-column-two-thirds">

‎app/templates/demos/component.html

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,6 @@
3939

4040
{% block pageTitle %}{{component | replace("-", " ") | capitalize}} – GOV.UK{% endblock %}
4141

42-
{% block beforeContent %}
43-
{{ super() }}
44-
{{ govukBreadcrumbs({
45-
'collapseOnMobile': True,
46-
'items': [
47-
{
48-
'text': "Home",
49-
'href': url_for('main.index')
50-
},
51-
{
52-
'text': "Components",
53-
'href': url_for('demos.components')
54-
},
55-
{
56-
'text': component | replace("-", " ") | capitalize
57-
}
58-
]
59-
}) }}
60-
{% endblock %}
61-
6242
{% block content %}
6343
<span class="govuk-caption-xl">Components</span>
6444
<h1 class="govuk-heading-xl">{{component | replace("-", " ") | capitalize}}</h1>

‎app/templates/demos/components.html

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
{% extends "base.html" %}
22

3-
{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
4-
5-
{% block beforeContent %}
6-
{{ super() }}
7-
{{ govukBreadcrumbs({
8-
'collapseOnMobile': True,
9-
'items': [
10-
{
11-
'text': "Home",
12-
'href': url_for('main.index')
13-
},
14-
{
15-
'text': "Components"
16-
}
17-
]
18-
}) }}
19-
{% endblock %}
20-
213
{% block content %}
224
<div class="govuk-grid-row">
235
<div class="govuk-grid-column-two-thirds">

‎app/templates/demos/conditional_reveal.html

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,7 @@
11
{% extends "base.html" %}
22

3-
{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
4-
53
{% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Conditionally revealed inputs – GOV.UK{% endblock %}
64

7-
{% block beforeContent %}
8-
{{ super() }}
9-
{{ govukBreadcrumbs({
10-
'collapseOnMobile': True,
11-
'items': [
12-
{
13-
'text': "Home",
14-
'href': url_for('main.index')
15-
},
16-
{
17-
'text': "Forms",
18-
'href': url_for('demos.forms')
19-
},
20-
{
21-
'text': "Conditional reveal"
22-
}
23-
]
24-
}) }}
25-
{% endblock %}
26-
275
{% block content %}
286
<div class="govuk-grid-row">
297
<div class="govuk-grid-column-two-thirds">

‎app/templates/demos/create_account.html

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,7 @@
11
{% extends "base.html" %}
22

3-
{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
4-
53
{% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Create an account – GOV.UK{% endblock %}
64

7-
{% block beforeContent %}
8-
{{ super() }}
9-
{{ govukBreadcrumbs({
10-
'collapseOnMobile': True,
11-
'items': [
12-
{
13-
'text': "Home",
14-
'href': url_for('main.index')
15-
},
16-
{
17-
'text': "Forms",
18-
'href': url_for('demos.forms')
19-
},
20-
{
21-
'text': "Create account"
22-
}
23-
]
24-
}) }}
25-
{% endblock %}
26-
275
{% block content %}
286
<div class="govuk-grid-row">
297
<div class="govuk-grid-column-two-thirds">

‎app/templates/demos/forms.html

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
{% extends "base.html" %}
22

3-
{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
4-
5-
{% block beforeContent %}
6-
{{ super() }}
7-
8-
{{ govukBreadcrumbs({
9-
'collapseOnMobile': True,
10-
'items': [
11-
{
12-
'text': "Home",
13-
'href': url_for('main.index')
14-
},
15-
{
16-
'text': "Forms"
17-
}
18-
]
19-
}) }}
20-
{% endblock %}
21-
223
{% block content %}
234
<div class="govuk-grid-row">
245
<div class="govuk-grid-column-two-thirds">

‎app/templates/demos/kitchen_sink.html

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,7 @@
11
{% extends "base.html" %}
22

3-
{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
4-
53
{% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Kitchen sink – GOV.UK{% endblock %}
64

7-
{% block beforeContent %}
8-
{{ super() }}
9-
{{ govukBreadcrumbs({
10-
'collapseOnMobile': True,
11-
'items': [
12-
{
13-
'text': "Home",
14-
'href': url_for('main.index')
15-
},
16-
{
17-
'text': "Forms",
18-
'href': url_for('demos.forms')
19-
},
20-
{
21-
'text': "Kitchen sink"
22-
}
23-
]
24-
}) }}
25-
{% endblock %}
26-
275
{% block content %}
286
<div class="govuk-grid-row">
297
<div class="govuk-grid-column-two-thirds">

‎app/templates/main/index.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ <h2 class="govuk-heading-m">Features</h2>
3939
<li>Rate limiting</li>
4040
</ul>
4141

42-
<h2 class="govuk-heading-m">Demos</h2>
43-
<ul class="govuk-list govuk-list--bullet govuk-list--spaced">
44-
<li><a class="govuk-link" href="{{ url_for('demos.components')}}">Components</a></li>
45-
<li><a class="govuk-link" href="{{ url_for('demos.forms')}}">Forms</a></li>
46-
</ul>
47-
4842
<h2 class="govuk-heading-m">Documentation</h2>
4943
<p class="govuk-body">Detailed documentation on the features listed above and the next steps to start building out your app on top of this template is on <a class="govuk-link"
5044
href="https://github.com/LandRegistry/govuk-frontend-flask#readme">GitHub</a></p>

0 commit comments

Comments
 (0)