Skip to content

Commit 4a75251

Browse files
Rosa-FoxJonathanHallam
authored andcommitted
Update callout box
This updates the copy for the individual country pages. It also adds different copy for the Irish page in line with advice from FCDO.
1 parent 5adafb4 commit 4a75251

File tree

4 files changed

+42
-12
lines changed

4 files changed

+42
-12
lines changed

app/presenters/travel_advice_presenter.rb

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ def country_name
3838
content_item["details"]["country"]["name"]
3939
end
4040

41+
def ireland?
42+
country_name == "Ireland"
43+
end
44+
4145
def is_summary?
4246
@part_slug.nil?
4347
end
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<p class="govuk-body">
2+
<strong>
3+
Under current UK COVID-19 restrictions, you must stay at home. You must not leave home or travel, including internationally, unless you have a legally permitted reason to do so. Check the <a href="/guidance/national-lockdown-stay-at-home">rules that apply to you in England</a>, <a href="https://www.gov.scot/coronavirus-covid-19/">Scotland</a>, <a href="https://gov.wales/covid-19-alert-levels">Wales</a> and <a href="https://www.nidirect.gov.uk/articles/coronavirus-covid-19-regulations-guidance-what-restrictions-mean-you">Northern Ireland</a>.
4+
</strong>
5+
</p>
6+
<p class="govuk-body">
7+
From 15 January, if you intend to <a href="/government/speeches/international-travel-update-11-january-2021">travel to England</a> or <a href="https://www.gov.scot/news/pre-departure-coronavirus-testing-update/">Scotland</a> from outside the Common Travel Area, including UK nationals returning home from travel abroad, you must provide evidence of a negative COVID-19 test result taken up to 3 days before departure. This testing requirement does not apply to travel from Ireland.
8+
</p>
9+
<p class="govuk-body">
10+
If you are legally permitted to travel, <a href="/guidance/travel-advice-novel-coronavirus">check our advice</a> for the country you are visiting. Some other countries have closed borders, and may further restrict movement or bring in new rules including testing requirements with little warning. Before you return to the UK you must <a href="/provide-journey-contact-details-before-travel-uk">provide your journey and contact details</a>. Also check if you need to <a href="/uk-border-control">self-isolate</a>.
11+
</p>

app/views/content_items/travel_advice.html.erb

+16-12
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,22 @@
2525
} %>
2626
</div>
2727
<div class="travel-advice-notice__content">
28-
<p class="govuk-body">
29-
<strong>
30-
Under current UK COVID-19 restrictions, you must stay at home. You must not leave home or travel, including abroad, unless you have a legally permitted reason to do so.
31-
</strong>
32-
Check the rules that apply to you in <a href="/guidance/national-lockdown-stay-at-home">England</a>, <a href="https://www.gov.scot/coronavirus-covid-19/">Scotland</a>, <a href="https://gov.wales/covid-19-alert-levels">Wales</a> and <a href="https://www.nidirect.gov.uk/articles/coronavirus-covid-19-regulations-guidance-what-restrictions-mean-you">Northern Ireland</a>.
33-
</p>
34-
<p class="govuk-body">
35-
If you are legally permitted to travel, <a href="/guidance/travel-advice-novel-coronavirus">check our advice</a> for the country you are visiting. Other countries have closed borders, and may further restrict movement or bring in new rules including testing requirements with little warning. Before you return to the UK you must <a href="/provide-journey-contact-details-before-travel-uk">provide your journey and contact details</a>. Also check if you need to <a href="/uk-border-control">self isolate</a>.
36-
</p>
37-
<p class="govuk-body">
38-
If you are travelling abroad and wish to return to the UK, contact your airline or travel provider.
39-
</p>
28+
<% if @content_item.ireland? %>
29+
<%= render 'content_items/ireland_covid_travel_guidance' %>
30+
<% else %>
31+
<p class="govuk-body">
32+
<strong>
33+
Under current UK COVID-19 restrictions, you must stay at home. You must not leave home or travel, including internationally, unless you have a legally permitted reason to do so.
34+
</strong>
35+
Check the <a href="/guidance/national-lockdown-stay-at-home">rules that apply to you in England</a>, <a href="https://www.gov.scot/coronavirus-covid-19/">Scotland</a>, <a href="https://gov.wales/covid-19-alert-levels">Wales</a> and <a href="https://www.nidirect.gov.uk/articles/coronavirus-covid-19-regulations-guidance-what-restrictions-mean-you">Northern Ireland</a>.
36+
</p>
37+
<p class="govuk-body">
38+
From 15 January, if you intend to <a href="/government/speeches/international-travel-update-11-january-2021">travel to England</a> or <a href="https://www.gov.scot/news/pre-departure-coronavirus-testing-update/">Scotland</a>, including UK nationals returning home from travel abroad, you must provide evidence of a negative COVID-19 test result taken up to 3 days before departure. If you do not comply (and you do not have a valid exemption) your airline or carrier may refuse you boarding and/or you may be fined on arrival. All other current entry requirements and restrictions continue to apply.
39+
</p>
40+
<p class="govuk-body">
41+
If you are legally permitted to travel, <a href="/guidance/travel-advice-novel-coronavirus">check our advice</a> for the country you are visiting. Some other countries have closed borders, and may further restrict movement or bring in new rules including testing requirements with little warning. Before you return to the UK you must <a href="/provide-journey-contact-details-before-travel-uk">provide your journey and contact details</a>. Also check if you need to <a href="/uk-border-control">self-isolate</a>.
42+
</p>
43+
<% end %>
4044
</div>
4145
</div>
4246

test/presenters/travel_advice_presenter_test.rb

+11
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,17 @@ def schema_name
148148
assert_equal "#{schema_item('full-country')['base_path']}/print", presented_item("full-country").print_link
149149
end
150150

151+
test "presents country name" do
152+
assert_equal schema_item("full-country")["details"]["country"]["name"], presented_item("full-country").country_name
153+
end
154+
155+
test "#ireland?" do
156+
example = schema_item("full-country")
157+
example["details"]["country"]["name"] = "Ireland"
158+
159+
assert_equal true, presented_item("full-country", nil, example).ireland?
160+
end
161+
151162
test "presents only next navigation when on the summary" do
152163
example = schema_item("full-country")
153164
parts = example["details"]["parts"]

0 commit comments

Comments
 (0)