From c0e9ba25184aacd3bf86946185e62391994407a8 Mon Sep 17 00:00:00 2001 From: Adam Mitchell Date: Wed, 21 Aug 2024 11:55:03 +0100 Subject: [PATCH] Language selector outside of main content and removing nested list --- app/templates/views/alert.cy.html | 47 ++++++++++-------- app/templates/views/alert.html | 21 +++++--- app/templates/views/announcements.cy.html | 21 +++++--- app/templates/views/announcements.html | 45 +++++++++-------- app/templates/views/current-alerts.cy.html | 21 +++++--- app/templates/views/current-alerts.html | 45 +++++++++-------- app/templates/views/how-alerts-work.cy.html | 31 ++++++------ app/templates/views/how-alerts-work.html | 55 +++++++++++---------- app/templates/views/index.cy.html | 21 +++++--- app/templates/views/index.html | 38 ++++++++------ app/templates/views/past-alerts.cy.html | 43 +++++++++------- app/templates/views/past-alerts.html | 45 +++++++++-------- app/templates/views/service-tests.cy.html | 23 +++++---- app/templates/views/service-tests.html | 47 ++++++++++-------- app/templates/views/system-testing.cy.html | 13 +++++ app/templates/views/system-testing.html | 45 +++++++++-------- 16 files changed, 323 insertions(+), 238 deletions(-) diff --git a/app/templates/views/alert.cy.html b/app/templates/views/alert.cy.html index cc47f7c3..fa390670 100644 --- a/app/templates/views/alert.cy.html +++ b/app/templates/views/alert.cy.html @@ -30,19 +30,32 @@ {% endif %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "Am Rybuddion Argyfwng", - "href": "/alerts/about.cy" - }, - parentBreadcrumb, - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "Am Rybuddion Argyfwng", + "href": "/alerts/about.cy" + }, + parentBreadcrumb, + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts/' ~ (alert_data | get_url_for_alert) + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -53,14 +66,6 @@

Emergency Alert

-
- {{ hmrcLanguageSelect({ - 'language': 'cy', - 'en': { - 'href': '/alerts/' ~ (alert_data | get_url_for_alert) - } - }) }} -
diff --git a/app/templates/views/alert.html b/app/templates/views/alert.html index dae7a7ce..476745cd 100644 --- a/app/templates/views/alert.html +++ b/app/templates/views/alert.html @@ -30,6 +30,8 @@ {% endif %} {% block beforeContent %} +
+
{{ govukBreadcrumbs({ "items": [ { @@ -43,6 +45,17 @@ parentBreadcrumb, ] }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/' ~ (alert_data | get_url_for_alert) ~ '.cy' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -53,14 +66,6 @@

Emergency Alert

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/' ~ (alert_data | get_url_for_alert) ~ '.cy' - } - }) }} -
diff --git a/app/templates/views/announcements.cy.html b/app/templates/views/announcements.cy.html index 755f4ab0..b9dfabdb 100644 --- a/app/templates/views/announcements.cy.html +++ b/app/templates/views/announcements.cy.html @@ -20,6 +20,8 @@ {%- endblock %} {% block beforeContent %} +
+
{{ govukBreadcrumbs({ "items": [ { @@ -32,6 +34,17 @@ } ] }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts/announcements' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -41,14 +54,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'cy', - 'en': { - 'href': '/alerts/announcements' - } - }) }} -
diff --git a/app/templates/views/announcements.html b/app/templates/views/announcements.html index 0f073739..45b3b11f 100644 --- a/app/templates/views/announcements.html +++ b/app/templates/views/announcements.html @@ -20,18 +20,31 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "About Emergency Alerts", - "href": "/alerts" - } - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "About Emergency Alerts", + "href": "/alerts" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/announcements.cy' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -41,14 +54,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/announcements.cy' - } - }) }} -
diff --git a/app/templates/views/current-alerts.cy.html b/app/templates/views/current-alerts.cy.html index cd4edd2a..b95c5287 100644 --- a/app/templates/views/current-alerts.cy.html +++ b/app/templates/views/current-alerts.cy.html @@ -25,6 +25,8 @@ {%- endblock %} {% block beforeContent %} +
+
{{ govukBreadcrumbs({ "items": [ { @@ -37,6 +39,17 @@ } ] }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts/current-alerts' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -46,14 +59,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'cy', - 'en': { - 'href': '/alerts/current-alerts' - } - }) }} -
diff --git a/app/templates/views/current-alerts.html b/app/templates/views/current-alerts.html index 04ad1cc2..ae5ec8a6 100644 --- a/app/templates/views/current-alerts.html +++ b/app/templates/views/current-alerts.html @@ -25,18 +25,31 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "About Emergency Alerts", - "href": "/alerts" - } - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "About Emergency Alerts", + "href": "/alerts" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/current-alerts.cy' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -46,14 +59,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/current-alerts.cy' - } - }) }} -
diff --git a/app/templates/views/how-alerts-work.cy.html b/app/templates/views/how-alerts-work.cy.html index c3b7c984..20678bbc 100644 --- a/app/templates/views/how-alerts-work.cy.html +++ b/app/templates/views/how-alerts-work.cy.html @@ -20,6 +20,8 @@ {%- endblock %} {% block beforeContent %} +
+
{{ govukBreadcrumbs({ "items": [ { @@ -32,6 +34,17 @@ } ] }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts/how-alerts-work' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -41,14 +54,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'cy', - 'en': { - 'href': '/alerts/how-alerts-work' - } - }) }} -
@@ -129,12 +134,10 @@

I optio allan:

-
    -
      -
    1. Chwiliwch am ‘rybuddion argyfwng’ yn eich gosodiadau.
      2. -
    2. Diffoddwch ‘rybuddion difrifol’ a ‘rhybuddion eithafol’.
      3. -
    -
+
    +
  1. Chwiliwch am ‘rybuddion argyfwng’ yn eich gosodiadau.
    2. +
  2. Diffoddwch ‘rybuddion difrifol’ a ‘rhybuddion eithafol’.
    3. +

Os byddwch chi'n dal i dderbyn rhybuddion, cysylltwch â gwneuthurwr eich dyfais i gael cymorth.

diff --git a/app/templates/views/how-alerts-work.html b/app/templates/views/how-alerts-work.html index cfec0e75..a4e1ae5e 100644 --- a/app/templates/views/how-alerts-work.html +++ b/app/templates/views/how-alerts-work.html @@ -20,18 +20,31 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "About Emergency Alerts", - "href": "/alerts" - } - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "About Emergency Alerts", + "href": "/alerts" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/how-alerts-work.cy' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -41,14 +54,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/how-alerts-work.cy' - } - }) }} -
@@ -129,12 +134,10 @@

To opt out:

-
    -
      -
    1. Search your settings for ‘emergency alerts’.
      2. -
    2. Turn off ‘severe alerts’ and ‘extreme alerts’.
      3. -
    -
+
    +
  1. Search your settings for ‘emergency alerts’.
    2. +
  2. Turn off ‘severe alerts’ and ‘extreme alerts’.
    3. +

If you still get alerts, contact your device manufacturer for help.

diff --git a/app/templates/views/index.cy.html b/app/templates/views/index.cy.html index 645a3a26..f76790de 100644 --- a/app/templates/views/index.cy.html +++ b/app/templates/views/index.cy.html @@ -28,6 +28,8 @@ {%- endblock %} {% block beforeContent %} +
+
{{ govukBreadcrumbs({ "items": [ { @@ -36,6 +38,17 @@ } ] }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -45,14 +58,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'cy', - 'en': { - 'href': '/alerts' - } - }) }} -
{% if alerts.current_and_public or alerts.status_box_announcements %} {% if alerts.current_and_public %} diff --git a/app/templates/views/index.html b/app/templates/views/index.html index 5d076a45..9ff10333 100644 --- a/app/templates/views/index.html +++ b/app/templates/views/index.html @@ -27,16 +27,30 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - } - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/about.cy' + } + }) }} +
+
{% endblock %} + {% block mainContent %}
@@ -44,14 +58,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/about.cy' - } - }) }} -
{% if alerts.current_and_public or alerts.status_box_announcements %} {% if alerts.current_and_public %} diff --git a/app/templates/views/past-alerts.cy.html b/app/templates/views/past-alerts.cy.html index f87b921c..f0214de0 100644 --- a/app/templates/views/past-alerts.cy.html +++ b/app/templates/views/past-alerts.cy.html @@ -25,18 +25,31 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "Am Rybuddion Argyfwng", - "href": "/alerts/about.cy" +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "Am Rybuddion Argyfwng", + "href": "/alerts/about.cy" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts/past-alerts' } - ] - }) }} + }) }} +
+
{% endblock %} {% block content %} @@ -46,14 +59,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'cy', - 'en': { - 'href': '/alerts/past-alerts' - } - }) }} -
diff --git a/app/templates/views/past-alerts.html b/app/templates/views/past-alerts.html index 8caaf74b..d80a5198 100644 --- a/app/templates/views/past-alerts.html +++ b/app/templates/views/past-alerts.html @@ -25,18 +25,31 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "About Emergency Alerts", - "href": "/alerts" - } - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "About Emergency Alerts", + "href": "/alerts" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/past-alerts.cy' + } + }) }} +
+
{% endblock %} {% block content %} @@ -46,14 +59,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/past-alerts.cy' - } - }) }} -
diff --git a/app/templates/views/service-tests.cy.html b/app/templates/views/service-tests.cy.html index b50e284f..14916dc1 100644 --- a/app/templates/views/service-tests.cy.html +++ b/app/templates/views/service-tests.cy.html @@ -20,6 +20,8 @@ {%- endblock %} {% block beforeContent %} +
+
{{ govukBreadcrumbs({ "items": [ { @@ -32,6 +34,17 @@ } ] }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts/service-tests' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -41,14 +54,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'cy', - 'en': { - 'href': '/alerts/service-tests' - } - }) }} -
@@ -112,4 +117,4 @@

{{ alert_or_planned_test.content | paragraphize(classes="govuk-body") }}

{% endfor %} -{% endmacro %} \ No newline at end of file +{% endmacro %} diff --git a/app/templates/views/service-tests.html b/app/templates/views/service-tests.html index 1c0aee67..206bb183 100644 --- a/app/templates/views/service-tests.html +++ b/app/templates/views/service-tests.html @@ -20,18 +20,31 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "About Emergency Alerts", - "href": "/alerts" - } - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "About Emergency Alerts", + "href": "/alerts" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/service-tests.cy' + } + }) }} +
+
{% endblock %} {% block mainContent %} @@ -41,14 +54,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/service-tests.cy' - } - }) }} -
@@ -114,4 +119,4 @@

{{ alert_or_planned_test.content | paragraphize(classes="govuk-body") }}

{% endfor %} -{% endmacro %} \ No newline at end of file +{% endmacro %} diff --git a/app/templates/views/system-testing.cy.html b/app/templates/views/system-testing.cy.html index 496e0ec0..b0825c43 100644 --- a/app/templates/views/system-testing.cy.html +++ b/app/templates/views/system-testing.cy.html @@ -25,6 +25,8 @@ {%- endblock %} {% block beforeContent %} +
+
{{ govukBreadcrumbs({ "items": [ { @@ -37,6 +39,17 @@ } ] }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'cy', + 'en': { + 'href': '/alerts/system-testing' + } + }) }} +
+
{% endblock %} {% block content %} diff --git a/app/templates/views/system-testing.html b/app/templates/views/system-testing.html index a86d6fda..bdc827aa 100644 --- a/app/templates/views/system-testing.html +++ b/app/templates/views/system-testing.html @@ -25,18 +25,31 @@ {%- endblock %} {% block beforeContent %} - {{ govukBreadcrumbs({ - "items": [ - { - "text": "Home", - "href": "https://www.gov.uk/" - }, - { - "text": "About Emergency Alerts", - "href": "/alerts" - } - ] - }) }} +
+
+ {{ govukBreadcrumbs({ + "items": [ + { + "text": "Home", + "href": "https://www.gov.uk/" + }, + { + "text": "About Emergency Alerts", + "href": "/alerts" + } + ] + }) }} +
+
+
+ {{ hmrcLanguageSelect({ + 'language': 'en', + 'cy': { + 'href': '/alerts/system-testing.cy' + } + }) }} +
+
{% endblock %} {% block content %} @@ -46,14 +59,6 @@

{{ pageTitle }}

-
- {{ hmrcLanguageSelect({ - 'language': 'en', - 'cy': { - 'href': '/alerts/system-testing.cy' - } - }) }} -