mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-07-13 09:50:08 -04:00
Merge pull request #3181 from alphagov/update-footer-links
Update footer links
This commit is contained in:
Tom Byers
@@ -1,16 +1,5 @@
|
||||
// Overrides for certain GOV.UK Frontend styles to make its components match this application's design
|
||||
|
||||
// Notify's header navigation aligns to the right
|
||||
.govuk-header__navigation {
|
||||
text-align: right;
|
||||
|
||||
// reset the alignment of each item to left-to-right
|
||||
.govuk-header__navigation-item {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Additional padding-bottom override, following the GOV.UK Frontend spacing scale:
|
||||
// https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale
|
||||
.govuk-\!-padding-bottom-12 {
|
||||
@@ -48,3 +37,8 @@
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Make column headings smaller to prevent wrapping
|
||||
.govuk-footer__heading {
|
||||
@include govuk-font($size: 19, $weight: bold);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{% extends "template.njk" %}
|
||||
{% from "components/banner.html" import banner %}
|
||||
{% from "components/notify-footer.html" import notify_footer %}
|
||||
|
||||
{% block headIcons %}
|
||||
<link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ asset_url('images/favicon.ico') }}" type="image/x-icon" />
|
||||
@@ -125,7 +124,8 @@
|
||||
{{ govukHeader({
|
||||
"homepageUrl": url_for('main.show_accounts_or_dashboard'),
|
||||
"productName": "Notify",
|
||||
"navigation": navigation
|
||||
"navigation": navigation,
|
||||
"navigationClasses": "govuk-header__navigation--end"
|
||||
}) }}
|
||||
{% endblock %}
|
||||
|
||||
@@ -147,35 +147,29 @@
|
||||
{% set meta_suffix = 'Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service" class="govuk-footer__link">Government Digital Service</a>' %}
|
||||
{% endif %}
|
||||
|
||||
{{ notify_footer({
|
||||
{{ govukFooter({
|
||||
"classes": "js-footer",
|
||||
"navigation": [
|
||||
{
|
||||
"title": "Support",
|
||||
"columns": 1,
|
||||
"items": [
|
||||
{
|
||||
"href": url_for('main.support'),
|
||||
"text": "Support"
|
||||
"text": "Contact support"
|
||||
},
|
||||
{
|
||||
"href": "https://status.notifications.service.gov.uk",
|
||||
"text": "System status"
|
||||
},
|
||||
{
|
||||
"href": "https://www.gov.uk/performance/govuk-notify",
|
||||
"text": "Performance"
|
||||
},
|
||||
{
|
||||
"href": "https://ukgovernmentdigital.slack.com/messages/C0E1ADVPC",
|
||||
"text": "Slack channel"
|
||||
},
|
||||
{
|
||||
"href": "https://gds.blog.gov.uk/category/notify/",
|
||||
"text": "Blog"
|
||||
"text": "Chat to us on Slack"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": "About Notify",
|
||||
"columns": 1,
|
||||
"items": [
|
||||
{
|
||||
@@ -186,14 +180,6 @@
|
||||
"href": url_for("main.roadmap"),
|
||||
"text": "Roadmap"
|
||||
},
|
||||
{
|
||||
"href": url_for("main.trial_mode_new"),
|
||||
"text": "Trial mode"
|
||||
},
|
||||
{
|
||||
"href": url_for("main.message_status"),
|
||||
"text": "Message status"
|
||||
},
|
||||
{
|
||||
"href": url_for("main.security"),
|
||||
"text": "Security"
|
||||
@@ -201,10 +187,19 @@
|
||||
{
|
||||
"href": url_for("main.terms"),
|
||||
"text": "Terms of use"
|
||||
},
|
||||
{
|
||||
"href": "https://www.gov.uk/performance/govuk-notify",
|
||||
"text": "Performance"
|
||||
},
|
||||
{
|
||||
"href": "https://gds.blog.gov.uk/category/notify/",
|
||||
"text": "Blog"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": "Pricing and payment",
|
||||
"columns": 1,
|
||||
"items": [
|
||||
{
|
||||
@@ -218,11 +213,24 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": "Using Notify",
|
||||
"columns": 1,
|
||||
"items": [
|
||||
{
|
||||
"href": url_for("main.get_started"),
|
||||
"text": "Get started"
|
||||
},
|
||||
{
|
||||
"href": url_for("main.trial_mode_new"),
|
||||
"text": "Trial mode"
|
||||
},
|
||||
{
|
||||
"href": url_for("main.message_status"),
|
||||
"text": "Message status"
|
||||
},
|
||||
{
|
||||
"href": url_for("main.documentation"),
|
||||
"text": "Documentation"
|
||||
"text": "API documentation"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
{% macro notify_footer(params) %}
|
||||
|
||||
<footer class="govuk-footer {{ params.classes if params.classes }}" role="contentinfo" {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
|
||||
<div class="govuk-width-container {{ params.containerClasses if params.containerClasses }}">
|
||||
{% if params.navigation %}
|
||||
<div class="govuk-footer__navigation">
|
||||
{% for nav in params.navigation %}
|
||||
<div class="govuk-footer__section">
|
||||
{# <h2 class="govuk-footer__heading govuk-heading-m">{{ nav.title }}</h2> removed #}
|
||||
{% if nav['items'] %}
|
||||
{% set listClasses %}
|
||||
{% if nav.columns %}
|
||||
govuk-footer__list--columns-{{ nav.columns }}
|
||||
{% endif %}
|
||||
{% endset %}
|
||||
<ul class="govuk-footer__list {{ listClasses | trim }}">
|
||||
{% for item in nav['items'] %}
|
||||
{% if item.href and item.text %}
|
||||
<li class="govuk-footer__list-item">
|
||||
<a class="govuk-footer__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
|
||||
{{ item.text }}
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<hr class="govuk-footer__section-break">
|
||||
{% endif %}
|
||||
<div class="govuk-footer__meta">
|
||||
<div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
|
||||
{% if params.meta %}
|
||||
<h2 class="govuk-visually-hidden">{{ params.meta.visuallyHiddenTitle | default("Support links") }}</h2>
|
||||
{% if params.meta['items'] %}
|
||||
<ul class="govuk-footer__inline-list">
|
||||
{% for item in params.meta['items'] %}
|
||||
<li class="govuk-footer__inline-list-item">
|
||||
<a class="govuk-footer__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
|
||||
{{ item.text }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% if params.meta.text or params.meta.html %}
|
||||
<div class="govuk-footer__meta-custom">
|
||||
{{ params.meta.html | safe if params.meta.html else params.meta.text }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{#- The SVG needs `focusable="false"` so that Internet Explorer does not
|
||||
treat it as an interactive element - without this it will be
|
||||
'focusable' when using the keyboard to navigate. #}
|
||||
<svg
|
||||
role="presentation"
|
||||
focusable="false"
|
||||
class="govuk-footer__licence-logo"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewbox="0 0 483.2 195.7"
|
||||
height="17"
|
||||
width="41"
|
||||
>
|
||||
<path
|
||||
fill="currentColor"
|
||||
d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"
|
||||
/>
|
||||
</svg>
|
||||
<span class="govuk-footer__licence-description">
|
||||
All content is available under the
|
||||
<a
|
||||
class="govuk-footer__link"
|
||||
href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
|
||||
rel="license"
|
||||
>Open Government Licence v3.0</a>, except where otherwise stated
|
||||
</span>
|
||||
</div>
|
||||
<div class="govuk-footer__meta-item">
|
||||
<a
|
||||
class="govuk-footer__link govuk-footer__copyright-logo"
|
||||
href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/"
|
||||
>© Crown copyright</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
{% endmacro %}
|
||||
@@ -181,7 +181,7 @@ def test_get_started_is_hidden_once_templates_exist(
|
||||
)
|
||||
|
||||
mock_get_service_templates.assert_called_once_with(SERVICE_ONE_ID)
|
||||
assert 'Get started' not in page.text
|
||||
assert not page.find('h2', string='Get started')
|
||||
|
||||
|
||||
def test_inbound_messages_not_visible_to_service_without_permissions(
|
||||
|
||||
Reference in New Issue
Block a user