govuk_publishing_components 23.13.1 → 23.14.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/govuk_publishing_components/take-action-amber.svg +4 -0
- data/app/assets/images/govuk_publishing_components/take-action-green.svg +4 -0
- data/app/assets/images/govuk_publishing_components/take-action-red.svg +4 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss +34 -17
- data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss +8 -8
- data/app/views/govuk_publishing_components/components/_contextual_sidebar.html.erb +2 -8
- data/app/views/govuk_publishing_components/components/_document_list.html.erb +1 -1
- data/app/views/govuk_publishing_components/components/_layout_footer.html.erb +4 -2
- data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb +21 -0
- data/app/views/govuk_publishing_components/components/docs/contextual_sidebar.yml +60 -1
- data/app/views/govuk_publishing_components/components/docs/document_list.yml +8 -0
- data/config/initializers/assets.rb +3 -0
- data/config/locales/cy.yml +6 -1
- data/config/locales/en.yml +6 -1
- data/lib/govuk_publishing_components/presenters/contextual_navigation.rb +124 -2
- data/lib/govuk_publishing_components/version.rb +1 -1
- metadata +5 -3
- data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_related_links.html.erb +0 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 514faef62ff7e90f5416a3913ef0202014791feedb92f8b3d1fa87700a43f36f
|
|
4
|
+
data.tar.gz: 695af8e204a2f19992c470e6a0b71d497cc153d486008565631ab13cb1d66f72
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6cbdcdcd0b26eb0bc9985027ca172a595db96fd3b37189e8195bc5d7519763d909da2391b7ff011c223e581b9d5f2c4b0e30bf01c2a2f6c36b32d1ff99638225
|
|
7
|
+
data.tar.gz: e5666ac4e86a4f3382cc8b8d21296e3664303e075cb5886199d1e04477db04b2186eb5aebba26f213df1e7978012607e8cf48a088871a5110be8c901bb2f2e23
|
|
@@ -3,45 +3,38 @@ $transition-campaign-dark-blue: #1e1348;
|
|
|
3
3
|
|
|
4
4
|
.gem-c-contextual-sidebar__brexit-related-links {
|
|
5
5
|
border-top: 2px solid $govuk-brand-colour;
|
|
6
|
+
}
|
|
6
7
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
}
|
|
8
|
+
.gem-c-contextual-sidebar__brexit-heading {
|
|
9
|
+
@extend %govuk-heading-s;
|
|
10
|
+
margin-top: govuk-spacing(3);
|
|
11
|
+
margin-bottom: govuk-spacing(2);
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
.gem-c-contextual-sidebar__brexit-cta {
|
|
15
|
-
@include govuk-font(19);
|
|
16
15
|
margin-bottom: govuk-spacing(6);
|
|
17
16
|
background-color: govuk-colour('light-grey', $legacy: 'grey-4');
|
|
18
|
-
border-top:
|
|
17
|
+
border-top: 2px solid $transition-campaign-red;
|
|
19
18
|
display: block;
|
|
20
|
-
padding: govuk-spacing(3);
|
|
19
|
+
padding: 0 govuk-spacing(3) govuk-spacing(3);
|
|
21
20
|
text-decoration: none;
|
|
22
21
|
|
|
23
22
|
.gem-c-contextual-sidebar__brexit-heading {
|
|
24
|
-
|
|
25
|
-
color: $transition-campaign-dark-blue;
|
|
23
|
+
color: $govuk-text-colour;
|
|
26
24
|
}
|
|
27
25
|
|
|
28
26
|
.gem-c-contextual-sidebar__brexit-text {
|
|
29
27
|
@extend %govuk-link;
|
|
28
|
+
@include govuk-font(16);
|
|
30
29
|
|
|
31
30
|
margin-top: 0;
|
|
32
|
-
margin-bottom:
|
|
31
|
+
margin-bottom: govuk-spacing(1);
|
|
33
32
|
text-decoration: underline;
|
|
34
33
|
|
|
35
34
|
@include govuk-media-query($from: tablet) {
|
|
36
35
|
margin-bottom: govuk-spacing(2);
|
|
37
36
|
}
|
|
38
37
|
}
|
|
39
|
-
|
|
40
|
-
@include govuk-compatibility(govuk_template) {
|
|
41
|
-
.gem-c-contextual-sidebar__brexit-title {
|
|
42
|
-
margin-bottom: govuk-spacing(3);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
38
|
}
|
|
46
39
|
|
|
47
40
|
.gem-c-contextual-sidebar__brexit-cta:focus {
|
|
@@ -49,3 +42,27 @@ $transition-campaign-dark-blue: #1e1348;
|
|
|
49
42
|
text-decoration: none;
|
|
50
43
|
}
|
|
51
44
|
}
|
|
45
|
+
|
|
46
|
+
.gem-c-contextual-sidebar__take-action-traffic-lights {
|
|
47
|
+
text-align: left;
|
|
48
|
+
margin-bottom: govuk-spacing(2);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
.gem-c-contextual-sidebar__take-action-traffic-lights > li {
|
|
52
|
+
white-space: nowrap;
|
|
53
|
+
display: inline;
|
|
54
|
+
margin-right: 7px;
|
|
55
|
+
margin-bottom: govuk-spacing(1);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
.gem-c-contextual-sidebar__take-action-traffic-lists-icon {
|
|
59
|
+
vertical-align: middle;
|
|
60
|
+
margin-top: -2px;
|
|
61
|
+
width: 22px;
|
|
62
|
+
margin-right: 2px;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
.gem-c-contextual-sidebar__take-action-traffic-lists-text {
|
|
66
|
+
@include govuk-font($size: 19, $weight: bold, $line-height: 2);
|
|
67
|
+
vertical-align: middle;
|
|
68
|
+
}
|
|
@@ -7,14 +7,10 @@
|
|
|
7
7
|
|
|
8
8
|
.gem-c-document-list__item {
|
|
9
9
|
overflow: hidden;
|
|
10
|
-
margin-bottom: govuk-spacing(
|
|
11
|
-
padding-
|
|
12
|
-
border-
|
|
10
|
+
margin-bottom: govuk-spacing(5);
|
|
11
|
+
padding-top: govuk-spacing(2);
|
|
12
|
+
border-top: 1px solid $govuk-border-colour;
|
|
13
13
|
list-style: none;
|
|
14
|
-
|
|
15
|
-
&:last-child {
|
|
16
|
-
border-bottom: 0;
|
|
17
|
-
}
|
|
18
14
|
}
|
|
19
15
|
|
|
20
16
|
.gem-c-document-list__item-title {
|
|
@@ -52,7 +48,7 @@
|
|
|
52
48
|
}
|
|
53
49
|
|
|
54
50
|
.gem-c-document-list__subtext {
|
|
55
|
-
margin:
|
|
51
|
+
margin: 0;
|
|
56
52
|
}
|
|
57
53
|
|
|
58
54
|
.gem-c-document-list__item-description,
|
|
@@ -60,6 +56,10 @@
|
|
|
60
56
|
@include govuk-font($size: 16, $line-height: 1.5);
|
|
61
57
|
}
|
|
62
58
|
|
|
59
|
+
.gem-c-document-list__item-description--full-size {
|
|
60
|
+
@include govuk-font($size: 19);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
63
|
.gem-c-document-list__item-metadata {
|
|
64
64
|
padding: 0;
|
|
65
65
|
}
|
|
@@ -2,12 +2,6 @@
|
|
|
2
2
|
<% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
|
|
3
3
|
|
|
4
4
|
<div class="gem-c-contextual-sidebar">
|
|
5
|
-
<% if navigation.show_brexit_related_links? && navigation.step_by_step_count.zero? %>
|
|
6
|
-
<%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_related_links' %>
|
|
7
|
-
<% elsif navigation.step_by_step_count.zero? && !navigation.transition_countdown_exception? %>
|
|
8
|
-
<%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_cta' %>
|
|
9
|
-
<% end %>
|
|
10
|
-
|
|
11
5
|
<% if navigation.content_tagged_to_a_reasonable_number_of_step_by_steps? %>
|
|
12
6
|
<%# Rendering step by step related items because there are a few but not too many of them %>
|
|
13
7
|
<%= render 'govuk_publishing_components/components/step_by_step_nav_related', links: navigation.step_nav_helper.related_links %>
|
|
@@ -30,7 +24,7 @@
|
|
|
30
24
|
} %>
|
|
31
25
|
<% end %>
|
|
32
26
|
|
|
33
|
-
<% if navigation.
|
|
34
|
-
<%= render 'govuk_publishing_components/components/contextual_sidebar/
|
|
27
|
+
<% if navigation.show_brexit_cta? || navigation.show_brexit_related_links? %>
|
|
28
|
+
<%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_cta' %>
|
|
35
29
|
<% end %>
|
|
36
30
|
</div>
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
<% end %>
|
|
51
51
|
|
|
52
52
|
<% if item[:link][:description] %>
|
|
53
|
-
<p class="gem-c-document-list__item-description" ><%= item[:link][:description] %></p>
|
|
53
|
+
<p class="gem-c-document-list__item-description <%= "gem-c-document-list__item-description--full-size" if item[:link][:full_size_description] %>"><%= item[:link][:description] %></p>
|
|
54
54
|
<% end %>
|
|
55
55
|
|
|
56
56
|
<% if item[:metadata] %>
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
meta ||= []
|
|
3
3
|
navigation ||= []
|
|
4
4
|
with_border ||= false
|
|
5
|
+
classes = %w(gem-c-layout-footer govuk-footer)
|
|
6
|
+
classes << "gem-c-layout-footer--border" if with_border
|
|
5
7
|
%>
|
|
6
|
-
|
|
8
|
+
<%= tag.footer class: classes, role: "contentinfo" do %>
|
|
7
9
|
<div class="govuk-width-container ">
|
|
8
10
|
<% if navigation.any? %>
|
|
9
11
|
<div class="govuk-footer__navigation">
|
|
@@ -80,4 +82,4 @@
|
|
|
80
82
|
</div>
|
|
81
83
|
</div>
|
|
82
84
|
</div>
|
|
83
|
-
|
|
85
|
+
<% end %>
|
data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb
CHANGED
|
@@ -14,7 +14,28 @@
|
|
|
14
14
|
<%= link_to link_path,
|
|
15
15
|
class: "govuk-link gem-c-contextual-sidebar__brexit-cta",
|
|
16
16
|
data: data_attributes,
|
|
17
|
+
aria: { label: "#{t("components.related_navigation.take_action_list.aria_label")} #{link_text}" },
|
|
17
18
|
lang: shared_helper.t_locale("components.related_navigation.transition.title") do %>
|
|
18
19
|
<h2 class="gem-c-contextual-sidebar__brexit-heading"><%= t("components.related_navigation.transition.title") %></h2>
|
|
20
|
+
<ul class="govuk-list gem-c-contextual-sidebar__take-action-traffic-lights">
|
|
21
|
+
<li>
|
|
22
|
+
<%= image_tag 'govuk_publishing_components/take-action-red.svg', class: "gem-c-contextual-sidebar__take-action-traffic-lists-icon", alt: "" %>
|
|
23
|
+
<span class="gem-c-contextual-sidebar__take-action-traffic-lists-text">
|
|
24
|
+
<%= t("components.related_navigation.take_action_list.red") %>
|
|
25
|
+
</span>
|
|
26
|
+
</li>
|
|
27
|
+
<li>
|
|
28
|
+
<%= image_tag 'govuk_publishing_components/take-action-amber.svg', class: "gem-c-contextual-sidebar__take-action-traffic-lists-icon", alt: "" %>
|
|
29
|
+
<span class="gem-c-contextual-sidebar__take-action-traffic-lists-text">
|
|
30
|
+
<%= t("components.related_navigation.take_action_list.amber") %>
|
|
31
|
+
</span>
|
|
32
|
+
</li>
|
|
33
|
+
<li>
|
|
34
|
+
<%= image_tag 'govuk_publishing_components/take-action-green.svg', class: "gem-c-contextual-sidebar__take-action-traffic-lists-icon", alt: "" %>
|
|
35
|
+
<span class="gem-c-contextual-sidebar__take-action-traffic-lists-text">
|
|
36
|
+
<%= t("components.related_navigation.take_action_list.green") %>
|
|
37
|
+
</span>
|
|
38
|
+
</li>
|
|
39
|
+
</ul>
|
|
19
40
|
<p class="gem-c-contextual-sidebar__brexit-text"><%= link_text %></p>
|
|
20
41
|
<% end %>
|
|
@@ -144,7 +144,33 @@ examples:
|
|
|
144
144
|
- text: Find out what you’ll get
|
|
145
145
|
href: "/settled-status-eu-citizens-families/what-settled-and-presettled-status-means"
|
|
146
146
|
optional: false
|
|
147
|
-
|
|
147
|
+
with_brexit_cta:
|
|
148
|
+
description: For documents tagged with certain taxons defined in `brexit_cta_taxon_allow_list` we show a custom Brexit call to action element.
|
|
149
|
+
data:
|
|
150
|
+
content_item:
|
|
151
|
+
title: "Transport news story"
|
|
152
|
+
content_id: "3c402d90-fe77-49b9-a8aa-1800d4fc2b3d"
|
|
153
|
+
links:
|
|
154
|
+
ordered_related_items:
|
|
155
|
+
- title: Find an apprenticeship
|
|
156
|
+
base_path: /apply-apprenticeship
|
|
157
|
+
- title: Training and study at work
|
|
158
|
+
base_path: /training-study-work-your-rights
|
|
159
|
+
- title: Careers helpline for teenagers
|
|
160
|
+
base_path: /careers-helpline-for-teenagers
|
|
161
|
+
document_collections:
|
|
162
|
+
- title: Recruit an apprentice (formerly apprenticeship vacancies)
|
|
163
|
+
base_path: /government/collections/apprenticeship-vacancies
|
|
164
|
+
document_type: document_collection
|
|
165
|
+
- title: The future of jobs and skills
|
|
166
|
+
base_path: /government/collections/the-future-of-jobs-and-skills
|
|
167
|
+
document_type: document_collection
|
|
168
|
+
taxons:
|
|
169
|
+
- content_id: "a4038b29-b332-4f13-98b1-1c9709e216bc"
|
|
170
|
+
title: "Transport"
|
|
171
|
+
phase: "live"
|
|
172
|
+
with_brexit_cta_document_exception:
|
|
173
|
+
description: Illustrates an exception to showing the custom Brexit call to action element as defined in `brexit_cta_document_type_exceptions`.
|
|
148
174
|
data:
|
|
149
175
|
content_item:
|
|
150
176
|
title: "30 creative teams awarded up to £100,000 each for Festival UK* 2022 R&D project"
|
|
@@ -164,3 +190,36 @@ examples:
|
|
|
164
190
|
- title: The future of jobs and skills
|
|
165
191
|
base_path: /government/collections/the-future-of-jobs-and-skills
|
|
166
192
|
document_type: document_collection
|
|
193
|
+
taxons:
|
|
194
|
+
- content_id: "e2ca2f1a-0ff3-43ce-b813-16645ff27904"
|
|
195
|
+
title: "Society and culture"
|
|
196
|
+
phase: "live"
|
|
197
|
+
with_brexit_cta_taxon_exception:
|
|
198
|
+
description: Illustrates an exception to showing the custom Brexit call to action element as defined in `brexit_cta_taxon_exception_list`.
|
|
199
|
+
data:
|
|
200
|
+
content_item:
|
|
201
|
+
title: "Local transport news story"
|
|
202
|
+
content_id: "5c82db20-7631-11e4-a3cb-005056011aef"
|
|
203
|
+
links:
|
|
204
|
+
ordered_related_items:
|
|
205
|
+
- title: Find an apprenticeship
|
|
206
|
+
base_path: /apply-apprenticeship
|
|
207
|
+
- title: Training and study at work
|
|
208
|
+
base_path: /training-study-work-your-rights
|
|
209
|
+
- title: Careers helpline for teenagers
|
|
210
|
+
base_path: /careers-helpline-for-teenagers
|
|
211
|
+
document_collections:
|
|
212
|
+
- title: Recruit an apprentice (formerly apprenticeship vacancies)
|
|
213
|
+
base_path: /government/collections/apprenticeship-vacancies
|
|
214
|
+
document_type: document_collection
|
|
215
|
+
- title: The future of jobs and skills
|
|
216
|
+
base_path: /government/collections/the-future-of-jobs-and-skills
|
|
217
|
+
document_type: document_collection
|
|
218
|
+
taxons:
|
|
219
|
+
- content_id: "3b4d6319-fcef-4637-b35a-e3df76321894"
|
|
220
|
+
title: "Local transport"
|
|
221
|
+
phase: "live"
|
|
222
|
+
links:
|
|
223
|
+
parent_taxons:
|
|
224
|
+
- content_id: "a4038b29-b332-4f13-98b1-1c9709e216bc"
|
|
225
|
+
title: "Transport"
|
|
@@ -280,3 +280,11 @@ examples:
|
|
|
280
280
|
document_type: 'Data tryloywder'
|
|
281
281
|
locale:
|
|
282
282
|
document_type: 'cy'
|
|
283
|
+
with_full_size_description_text:
|
|
284
|
+
data:
|
|
285
|
+
items:
|
|
286
|
+
- link:
|
|
287
|
+
text: 'Become an apprentice'
|
|
288
|
+
path: '/become-an-apprentice'
|
|
289
|
+
description: 'Becoming an apprentice - what to expect, apprenticeship levels, pay and training, making an application, complaining about an apprenticeship.'
|
|
290
|
+
full_size_description: true
|
|
@@ -27,6 +27,9 @@ Rails.application.config.assets.precompile += %w[
|
|
|
27
27
|
govuk_publishing_components/icon-important.svg
|
|
28
28
|
govuk_publishing_components/chevron-banner/*.svg
|
|
29
29
|
govuk_publishing_components/crests/*.png
|
|
30
|
+
govuk_publishing_components/take-action-amber.svg
|
|
31
|
+
govuk_publishing_components/take-action-green.svg
|
|
32
|
+
govuk_publishing_components/take-action-red.svg
|
|
30
33
|
]
|
|
31
34
|
|
|
32
35
|
# GOV.UK Frontend assets
|
data/config/locales/cy.yml
CHANGED
|
@@ -12,4 +12,9 @@ cy:
|
|
|
12
12
|
transition:
|
|
13
13
|
title: "Brexit"
|
|
14
14
|
link_path: "/transition.cy"
|
|
15
|
-
link_text: "
|
|
15
|
+
link_text: "Gwiriwch beth sydd angen i chi ei wneud"
|
|
16
|
+
take_action_list:
|
|
17
|
+
red: Gwiriwch
|
|
18
|
+
amber: Newidiwch
|
|
19
|
+
green: Ewch
|
|
20
|
+
aria_label: Ymgyrch slogan Brexit, Gwiriwch, Newidiwch, Ewch.
|
data/config/locales/en.yml
CHANGED
|
@@ -79,7 +79,12 @@ en:
|
|
|
79
79
|
transition:
|
|
80
80
|
title: "Brexit"
|
|
81
81
|
link_path: "/transition"
|
|
82
|
-
link_text: "Check
|
|
82
|
+
link_text: "Check what you need to do"
|
|
83
|
+
take_action_list:
|
|
84
|
+
red: Check
|
|
85
|
+
amber: Change
|
|
86
|
+
green: Go
|
|
87
|
+
aria_label: Brexit campaign slogan, Check, Change, Go.
|
|
83
88
|
related_footer_navigation:
|
|
84
89
|
collections: "Collections"
|
|
85
90
|
policies: "Policies"
|
|
@@ -113,8 +113,130 @@ module GovukPublishingComponents
|
|
|
113
113
|
tagged_to_brexit? && (page_content_id != brexit_start_page_content_id)
|
|
114
114
|
end
|
|
115
115
|
|
|
116
|
-
def
|
|
117
|
-
|
|
116
|
+
def brexit_cta_document_exceptions
|
|
117
|
+
# /government/news/30-creative-teams-awarded-up-to-100000-each-for-festival-uk-2022-rd-project
|
|
118
|
+
%w[c3752802-f091-43a9-ba90-33568fccf391]
|
|
119
|
+
end
|
|
120
|
+
|
|
121
|
+
def brexit_cta_document_exception?
|
|
122
|
+
brexit_cta_document_exceptions.include?(content_item["content_id"])
|
|
123
|
+
end
|
|
124
|
+
|
|
125
|
+
def brexit_cta_document_type_exceptions
|
|
126
|
+
%w[
|
|
127
|
+
aaib_report
|
|
128
|
+
answer
|
|
129
|
+
asylum_support_decision
|
|
130
|
+
fatality_notice
|
|
131
|
+
maib_report
|
|
132
|
+
raib_report
|
|
133
|
+
simple_smart_answer
|
|
134
|
+
transaction
|
|
135
|
+
]
|
|
136
|
+
end
|
|
137
|
+
|
|
138
|
+
def brexit_cta_document_type_exception?
|
|
139
|
+
brexit_cta_document_type_exceptions.include?(content_item["document_type"])
|
|
140
|
+
end
|
|
141
|
+
|
|
142
|
+
def brexit_cta_taxon_allow_list
|
|
143
|
+
# Entering and staying in the UK
|
|
144
|
+
# Going and being abroad
|
|
145
|
+
# Corporate information
|
|
146
|
+
# Transport
|
|
147
|
+
# Environment
|
|
148
|
+
# International
|
|
149
|
+
# Defence and armed forces
|
|
150
|
+
# Society and culture
|
|
151
|
+
# Government
|
|
152
|
+
# Work
|
|
153
|
+
# Welfare
|
|
154
|
+
# Money
|
|
155
|
+
# Business and industry
|
|
156
|
+
# Health and social care
|
|
157
|
+
# Education > Further and higher education
|
|
158
|
+
# Education > Teaching and leadership
|
|
159
|
+
# Education > Funding and finance for students
|
|
160
|
+
# Coronavirus (COVID-19)
|
|
161
|
+
%w[
|
|
162
|
+
ba3a9702-da22-487f-86c1-8334a730e559
|
|
163
|
+
9597c30a-605a-4e36-8bc1-47e5cdae41b3
|
|
164
|
+
a544d48b-1e9e-47fb-b427-7a987c658c14
|
|
165
|
+
a4038b29-b332-4f13-98b1-1c9709e216bc
|
|
166
|
+
3cf97f69-84de-41ae-bc7b-7e2cc238fa58
|
|
167
|
+
37d0fa26-abed-4c74-8835-b3b51ae1c8b2
|
|
168
|
+
e491505c-77ae-45b2-84be-8c94b94f6a2b
|
|
169
|
+
e2ca2f1a-0ff3-43ce-b813-16645ff27904
|
|
170
|
+
e48ab80a-de80-4e83-bf59-26316856a5f9
|
|
171
|
+
d0f1e5a3-c8f4-4780-8678-994f19104b21
|
|
172
|
+
dded88e2-f92e-424f-b73e-6ad24a839c51
|
|
173
|
+
6acc9db4-780e-4a46-92b4-1812e3c2c48a
|
|
174
|
+
495afdb6-47be-4df1-8b38-91c8adb1eefc
|
|
175
|
+
8124ead8-8ebc-4faf-88ad-dd5cbcc92ba8
|
|
176
|
+
dd767840-363e-43ad-8835-c9ab516633de
|
|
177
|
+
ff00b8b2-dcdb-4659-93c2-291c9be354f3
|
|
178
|
+
23265b25-7ec3-4960-8517-4ff8d4d92cac
|
|
179
|
+
5b7b9532-a775-4bd2-a3aa-6ce380184b6c
|
|
180
|
+
]
|
|
181
|
+
end
|
|
182
|
+
|
|
183
|
+
def brexit_cta_taxon_allow_list?
|
|
184
|
+
taxons = content_item.dig("links", "taxons").to_a
|
|
185
|
+
taxons.each do |taxon|
|
|
186
|
+
if brexit_cta_taxon_allow_list.include?(taxon["content_id"]) || parent_taxon_include?(taxon, brexit_cta_taxon_allow_list)
|
|
187
|
+
return true
|
|
188
|
+
end
|
|
189
|
+
end
|
|
190
|
+
false
|
|
191
|
+
end
|
|
192
|
+
|
|
193
|
+
def parent_taxon_include?(taxon, taxon_list)
|
|
194
|
+
if taxon.present?
|
|
195
|
+
if taxon.dig("links", "parent_taxons").to_a.any? { |taxon_item| taxon_list.include?(taxon_item["content_id"]) }
|
|
196
|
+
return true
|
|
197
|
+
end
|
|
198
|
+
|
|
199
|
+
taxon.dig("links", "parent_taxons").to_a.any? { |taxon_item| parent_taxon_include?(taxon_item, taxon_list) }
|
|
200
|
+
else
|
|
201
|
+
false
|
|
202
|
+
end
|
|
203
|
+
end
|
|
204
|
+
|
|
205
|
+
def brexit_cta_taxon_exception_list
|
|
206
|
+
# Entering and staying in the UK > Immigration offences
|
|
207
|
+
# Entering and staying in the UK > Inspections of border, immigration and asylum services
|
|
208
|
+
# Entering and staying in the UK > Refugees, asylum and human rights
|
|
209
|
+
# Transport > Local transport
|
|
210
|
+
# Education > Further and higher education > Education in prisons
|
|
211
|
+
%w[
|
|
212
|
+
fa13521f-9285-45b0-bd65-4a472a8037e7
|
|
213
|
+
0fab9131-f877-4286-b4d8-922fbfb402b6
|
|
214
|
+
08a8a69f-2825-4fe2-a4cf-c83458a5629e
|
|
215
|
+
3b4d6319-fcef-4637-b35a-e3df76321894
|
|
216
|
+
6426d1c5-93c8-4659-85d5-1f0d3368a124
|
|
217
|
+
]
|
|
218
|
+
end
|
|
219
|
+
|
|
220
|
+
def brexit_cta_taxon_exception_list?
|
|
221
|
+
taxons = content_item.dig("links", "taxons").to_a
|
|
222
|
+
taxons.each do |taxon|
|
|
223
|
+
if brexit_cta_taxon_exception_list.include?(taxon["content_id"]) || parent_taxon_include?(taxon, brexit_cta_taxon_exception_list)
|
|
224
|
+
return true
|
|
225
|
+
end
|
|
226
|
+
end
|
|
227
|
+
false
|
|
228
|
+
end
|
|
229
|
+
|
|
230
|
+
def brexit_cta_exception?
|
|
231
|
+
brexit_cta_document_exception? ||
|
|
232
|
+
brexit_cta_document_type_exception? ||
|
|
233
|
+
brexit_cta_taxon_exception_list?
|
|
234
|
+
end
|
|
235
|
+
|
|
236
|
+
def show_brexit_cta?
|
|
237
|
+
brexit_cta_taxon_allow_list? &&
|
|
238
|
+
step_by_step_count.zero? &&
|
|
239
|
+
!brexit_cta_exception?
|
|
118
240
|
end
|
|
119
241
|
|
|
120
242
|
def step_by_step_count
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: govuk_publishing_components
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 23.
|
|
4
|
+
version: 23.14.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- GOV.UK Dev
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-01
|
|
11
|
+
date: 2021-02-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: govuk_app_config
|
|
@@ -390,6 +390,9 @@ files:
|
|
|
390
390
|
- app/assets/images/govuk_publishing_components/icon-print-2x.png
|
|
391
391
|
- app/assets/images/govuk_publishing_components/icon-print.png
|
|
392
392
|
- app/assets/images/govuk_publishing_components/search-button.png
|
|
393
|
+
- app/assets/images/govuk_publishing_components/take-action-amber.svg
|
|
394
|
+
- app/assets/images/govuk_publishing_components/take-action-green.svg
|
|
395
|
+
- app/assets/images/govuk_publishing_components/take-action-red.svg
|
|
393
396
|
- app/assets/javascripts/component_guide/accessibility-test.js
|
|
394
397
|
- app/assets/javascripts/component_guide/application.js
|
|
395
398
|
- app/assets/javascripts/component_guide/filter-components.js
|
|
@@ -686,7 +689,6 @@ files:
|
|
|
686
689
|
- app/views/govuk_publishing_components/components/attachment/_thumbnail_generic.svg
|
|
687
690
|
- app/views/govuk_publishing_components/components/attachment/_thumbnail_spreadsheet.svg
|
|
688
691
|
- app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb
|
|
689
|
-
- app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_related_links.html.erb
|
|
690
692
|
- app/views/govuk_publishing_components/components/docs/accordion.yml
|
|
691
693
|
- app/views/govuk_publishing_components/components/docs/action_link.yml
|
|
692
694
|
- app/views/govuk_publishing_components/components/docs/admin_analytics.yml
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
<% link_text = t("components.related_navigation.transition.link_text") %>
|
|
2
|
-
<% link_path = t("components.related_navigation.transition.link_path") %>
|
|
3
|
-
<div class="gem-c-contextual-sidebar__brexit-related-links govuk-!-margin-bottom-6" data-module="track-click" lang="en">
|
|
4
|
-
<h2 class="gem-c-contextual-sidebar__brexit-heading"><%= t("components.related_navigation.transition.title") %></h2>
|
|
5
|
-
<a href="<%= link_path %>" class="govuk-link" data-track-category="relatedLinkClicked" data-track-action="1.0 Transition" data-track-label="<%= link_path %>" data-track-options='{"dimension29":"<%= link_text %>"}'><%= link_text %></a>
|
|
6
|
-
</div>
|