Skip to content
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

Language selector outside of main content and removing nested list #363

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Language selector outside of main content and removing nested list #363

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
47 changes: 26 additions & 21 deletions app/templates/views/alert.cy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
}) }}
<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
<div style="margin-right: 10px;">
{{ govukBreadcrumbs({
"items": [
{
"text": "Home",
"href": "https://www.gov.uk/"
},
{
"text": "Am Rybuddion Argyfwng",
"href": "/alerts/about.cy"
},
parentBreadcrumb,
]
}) }}
</div>
<div style="flex-grow: 1;"></div>
<div style="margin-left: 10px;">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/' ~ (alert_data | get_url_for_alert)
}
}) }}
</div>
</div>
{% endblock %}

{% block mainContent %}
Expand All @@ -53,14 +66,6 @@ <h1 class="govuk-heading-xl alerts-icon__container alerts-icon__container--48">
Emergency Alert
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/' ~ (alert_data | get_url_for_alert)
}
}) }}
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds alert-icon__container">
Expand Down
21 changes: 13 additions & 8 deletions app/templates/views/alert.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
{% endif %}

{% block beforeContent %}
<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
<div style="margin-right: 10px;">
{{ govukBreadcrumbs({
"items": [
{
Expand All @@ -43,6 +45,17 @@
parentBreadcrumb,
]
}) }}
</div>
<div style="flex-grow: 1;"></div>
<div style="margin-left: 10px;">
{{ hmrcLanguageSelect({
'language': 'en',
'cy': {
'href': '/alerts/' ~ (alert_data | get_url_for_alert) ~ '.cy'
}
}) }}
</div>
</div>
{% endblock %}

{% block mainContent %}
Expand All @@ -53,14 +66,6 @@ <h1 class="govuk-heading-xl alerts-icon__container alerts-icon__container--48">
Emergency Alert
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ hmrcLanguageSelect({
'language': 'en',
'cy': {
'href': '/alerts/' ~ (alert_data | get_url_for_alert) ~ '.cy'
}
}) }}
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds alert-icon__container">
Expand Down
21 changes: 13 additions & 8 deletions app/templates/views/announcements.cy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
{%- endblock %}

{% block beforeContent %}
<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
<div style="margin-right: 10px;">
{{ govukBreadcrumbs({
"items": [
{
Expand All @@ -32,6 +34,17 @@
}
]
}) }}
</div>
<div style="flex-grow: 1;"></div>
<div style="margin-left: 10px;">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/announcements'
}
}) }}
</div>
</div>
{% endblock %}

{% block mainContent %}
Expand All @@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
{{ pageTitle }}
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/announcements'
}
}) }}
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand Down
45 changes: 25 additions & 20 deletions app/templates/views/announcements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,31 @@
{%- endblock %}

{% block beforeContent %}
{{ govukBreadcrumbs({
"items": [
{
"text": "Home",
"href": "https://www.gov.uk/"
},
{
"text": "About Emergency Alerts",
"href": "/alerts"
}
]
}) }}
<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
<div style="margin-right: 10px;">
{{ govukBreadcrumbs({
"items": [
{
"text": "Home",
"href": "https://www.gov.uk/"
},
{
"text": "About Emergency Alerts",
"href": "/alerts"
}
]
}) }}
</div>
<div style="flex-grow: 1;"></div>
<div style="margin-left: 10px;">
{{ hmrcLanguageSelect({
'language': 'en',
'cy': {
'href': '/alerts/announcements.cy'
}
}) }}
</div>
</div>
{% endblock %}

{% block mainContent %}
Expand All @@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
{{ pageTitle }}
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ hmrcLanguageSelect({
'language': 'en',
'cy': {
'href': '/alerts/announcements.cy'
}
}) }}
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand Down
21 changes: 13 additions & 8 deletions app/templates/views/current-alerts.cy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
{%- endblock %}

{% block beforeContent %}
<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
<div style="margin-right: 10px;">
{{ govukBreadcrumbs({
"items": [
{
Expand All @@ -37,6 +39,17 @@
}
]
}) }}
</div>
<div style="flex-grow: 1;"></div>
<div style="margin-left: 10px;">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/current-alerts'
}
}) }}
</div>
</div>
{% endblock %}

{% block mainContent %}
Expand All @@ -46,14 +59,6 @@ <h1 class="govuk-heading-xl">
{{ pageTitle }}
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/current-alerts'
}
}) }}
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand Down
45 changes: 25 additions & 20 deletions app/templates/views/current-alerts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,31 @@
{%- endblock %}

{% block beforeContent %}
{{ govukBreadcrumbs({
"items": [
{
"text": "Home",
"href": "https://www.gov.uk/"
},
{
"text": "About Emergency Alerts",
"href": "/alerts"
}
]
}) }}
<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
<div style="margin-right: 10px;">
{{ govukBreadcrumbs({
"items": [
{
"text": "Home",
"href": "https://www.gov.uk/"
},
{
"text": "About Emergency Alerts",
"href": "/alerts"
}
]
}) }}
</div>
<div style="flex-grow: 1;"></div>
<div style="margin-left: 10px;">
{{ hmrcLanguageSelect({
'language': 'en',
'cy': {
'href': '/alerts/current-alerts.cy'
}
}) }}
</div>
</div>
{% endblock %}

{% block mainContent %}
Expand All @@ -46,14 +59,6 @@ <h1 class="govuk-heading-xl">
{{ pageTitle }}
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ hmrcLanguageSelect({
'language': 'en',
'cy': {
'href': '/alerts/current-alerts.cy'
}
}) }}
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand Down
31 changes: 17 additions & 14 deletions app/templates/views/how-alerts-work.cy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
{%- endblock %}

{% block beforeContent %}
<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
<div style="margin-right: 10px;">
{{ govukBreadcrumbs({
"items": [
{
Expand All @@ -32,6 +34,17 @@
}
]
}) }}
</div>
<div style="flex-grow: 1;"></div>
<div style="margin-left: 10px;">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/how-alerts-work'
}
}) }}
</div>
</div>
{% endblock %}

{% block mainContent %}
Expand All @@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
{{ pageTitle }}
</h1>
</div>
<div class="govuk-grid-column-one-third">
{{ hmrcLanguageSelect({
'language': 'cy',
'en': {
'href': '/alerts/how-alerts-work'
}
}) }}
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand Down Expand Up @@ -129,12 +134,10 @@ <h2 class="govuk-heading-l">
<p class="govuk-body" id="opt-out">
I optio allan:
</p>
<ul class="govuk-list">
<ol type="1">
<li>Chwiliwch am ‘rybuddion argyfwng’ yn eich gosodiadau.</li>
<li>Diffoddwch ‘rybuddion difrifol’ a ‘rhybuddion eithafol’.</li>
</ol>
</ul>
<ol class="govuk-list govuk-list--bullet">
<li>Chwiliwch am ‘rybuddion argyfwng’ yn eich gosodiadau.</li>
<li>Diffoddwch ‘rybuddion difrifol’ a ‘rhybuddion eithafol’.</li>
</ol>
<p class="govuk-body">
Os byddwch chi'n dal i dderbyn rhybuddion, cysylltwch â gwneuthurwr eich dyfais i gael cymorth.
</p>
Expand Down
Loading