govuk_publishing_components 27.9.1 → 27.10.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,3 @@
1
- .gem-c-layout-super-navigation-header__content {
2
- display: none;
1
+ .gem-c-super-navigation-header a:after {
2
+ content: " ( " attr(href) " ) ";
3
3
  }
@@ -1,4 +1,7 @@
1
- <% user_organisation ||= nil %>
1
+ <%
2
+ warn('DEPRECATION WARNING: admin_analytics component is deprecated and will be removed in a future major release of govuk_publishing_components')
3
+ user_organisation ||= nil
4
+ %>
2
5
 
3
6
  <script class="analytics">
4
7
  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -1,4 +1,5 @@
1
1
  <%
2
+ warn('DEPRECATION WARNING: government_navigation component is deprecated and will be removed in a future major release of govuk_publishing_components')
2
3
  active ||= nil
3
4
  %>
4
5
 
@@ -1,4 +1,5 @@
1
1
  <%
2
+ warn('DEPRECATION WARNING: highlight_boxes component is deprecated and will be removed in a future major release of govuk_publishing_components')
2
3
  items ||= []
3
4
  inverse ||= false
4
5
  half_width ||= false
@@ -8,6 +8,7 @@
8
8
  navigation_items ||= []
9
9
  omit_feedback_form ||= false
10
10
  omit_footer_navigation ||= false
11
+ omit_footer_border ||= false
11
12
  omit_header ||= false
12
13
  product_name ||= nil
13
14
  show_explore_header ||= false
@@ -143,7 +144,7 @@
143
144
 
144
145
  <% unless local_assigns[:hide_footer_links] %>
145
146
  <%= render "govuk_publishing_components/components/layout_footer", {
146
- with_border: true,
147
+ with_border: !omit_footer_border,
147
148
  navigation: omit_footer_navigation ? nil : layout_helper.footer_navigation,
148
149
  meta: layout_helper.footer_meta,
149
150
  } %>
@@ -18,8 +18,7 @@
18
18
  <header role="banner" class="gem-c-layout-super-navigation-header">
19
19
  <div class="gem-c-layout-super-navigation-header__container govuk-width-container govuk-clearfix">
20
20
  <div class="gem-c-layout-super-navigation-header__header-logo">
21
- <a
22
- class="govuk-header__link govuk-header__link--homepage"
21
+ <a class="govuk-header__link govuk-header__link--homepage"
23
22
  data-module="gem-track-click"
24
23
  data-track-action="logoLink"
25
24
  data-track-category="headerClicked"
@@ -28,30 +27,26 @@
28
27
  data-track-dimension-index="29"
29
28
  href="<%= logo_link %>"
30
29
  id="logo"
31
- title="<%= logo_link_title %>"
32
- >
30
+ title="<%= logo_link_title %>">
33
31
  <span class="govuk-header__logotype">
34
- <!--[if gt IE 8]><!-->
35
- <svg
36
- aria-hidden="true"
32
+ <svg aria-hidden="true"
37
33
  class="govuk-header__logotype-crown gem-c-layout-super-navigation-header__logotype-crown"
38
34
  focusable="false"
39
35
  height="30"
40
36
  viewBox="0 0 132 97"
41
- width="36"
42
37
  xmlns="http://www.w3.org/2000/svg"
43
- >
44
- <path
45
- d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"
46
- fill="currentColor"
38
+ width="36">
39
+ <path fill="currentColor"
47
40
  fill-rule="evenodd"
48
- >
41
+ d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z">
49
42
  </path>
43
+ <image class="govuk-header__logotype-crown-fallback-image"
44
+ height="30"
45
+ src="<%= asset_path('govuk-logotype-crown.png') %>"
46
+ width="36"
47
+ xlink:href="">
48
+ </image>
50
49
  </svg>
51
- <!--<![endif]-->
52
- <!--[if IE 8]>
53
- <img src="<%= asset_path('govuk-logotype-crown.png') %>" alt="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32">
54
- <![endif]-->
55
50
  <span class="govuk-header__logotype-text">
56
51
  <%= logo_text %>
57
52
  </span>
@@ -81,13 +76,6 @@
81
76
  type="button"
82
77
  >
83
78
  Menu
84
- <span
85
- aria-hidden="true"
86
- class="gem-c-layout-super-navigation-header__navigation-top-toggle-close-icon"
87
- focusable="false"
88
- >
89
- &times;
90
- </span>
91
79
  </button>
92
80
  <ul id="super-navigation-menu" class="gem-c-layout-super-navigation-header__navigation-items">
93
81
  <% navigation_links.each_with_index do | link, index | %>
@@ -101,34 +89,34 @@
101
89
  tracking_label = link[:label].downcase.gsub(/\s+/, "")
102
90
  %>
103
91
  <%= tag.li class: li_classes do %>
104
- <div class="gem-c-layout-super-navigation-header__navigation-toggle-wrapper govuk-clearfix">
105
- <%= link_to link[:label], link[:href], {
106
- class: "gem-c-layout-super-navigation-header__navigation-item-link",
107
- data: {
108
- module: "gem-track-click",
109
- track_action: "#{tracking_label}Link",
110
- track_category: "headerClicked",
111
- track_label: link[:href],
112
- track_dimension: link[:label],
113
- track_dimension_index: "29",
114
- }
115
- } %>
116
- <% if has_children %>
117
- <button
118
- aria-controls="super-navigation-menu__section-<%= unique_id %>"
119
- aria-expanded="false"
120
- aria-label="<%= show_menu_text %>"
121
- class="gem-c-layout-super-navigation-header__navigation-second-toggle-button"
122
- data-text-for-hide="<%= hide_menu_text %>"
123
- data-text-for-show="<%= show_menu_text %>"
124
- data-toggle-desktop-group="top"
125
- data-toggle-mobile-group="second"
126
- data-tracking-key="<%= tracking_label %>"
127
- hidden
128
- id="super-navigation-menu__section-<%= unique_id %>-toggle"
129
- type="button"
130
- ><%= link[:label] %></button>
131
- </div>
92
+ <%= link_to link[:label], link[:href], {
93
+ class: "gem-c-layout-super-navigation-header__navigation-item-link",
94
+ data: {
95
+ module: "gem-track-click",
96
+ track_action: "#{tracking_label}Link",
97
+ track_category: "headerClicked",
98
+ track_label: link[:href],
99
+ track_dimension: link[:label],
100
+ track_dimension_index: "29",
101
+ }
102
+ } %>
103
+ <% if has_children %>
104
+ <button
105
+ aria-controls="super-navigation-menu__section-<%= unique_id %>"
106
+ aria-expanded="false"
107
+ aria-label="<%= show_menu_text %>"
108
+ class="gem-c-layout-super-navigation-header__navigation-second-toggle-button"
109
+ data-text-for-hide="<%= hide_menu_text %>"
110
+ data-text-for-show="<%= show_menu_text %>"
111
+ data-toggle-desktop-group="top"
112
+ data-toggle-mobile-group="second"
113
+ data-tracking-key="<%= tracking_label %>"
114
+ hidden
115
+ id="super-navigation-menu__section-<%= unique_id %>-toggle"
116
+ type="button"
117
+ >
118
+ <%= link[:label] %>
119
+ </button>
132
120
  <div
133
121
  hidden
134
122
  class="gem-c-layout-super-navigation-header__navigation-dropdown-menu"
@@ -164,7 +152,7 @@
164
152
  track_dimension_index: "29",
165
153
  }
166
154
  } %>
167
- <%= tag.p item[:description], class: "govuk-body govuk-!-margin-0 govuk-!-margin-top-1" if has_description %>
155
+ <%= tag.p item[:description], class: "govuk-body govuk-!-margin-0" if has_description %>
168
156
  </li>
169
157
  <% end %>
170
158
  </ul>
@@ -226,17 +214,9 @@
226
214
  <%= search_text %>
227
215
  </span>
228
216
  <%=
229
- render "govuk_publishing_components/components/search/search_icon", {
230
- classes: %w[gem-c-layout-super-navigation-header__search-toggle-button-link-icon],
231
- }
217
+ render "govuk_publishing_components/components/search/search_icon",
218
+ classes: %W[gem-c-layout-super-navigation-header__search-toggle-button-link-icon]
232
219
  %>
233
- <span
234
- aria-hidden="true"
235
- class="gem-c-layout-super-navigation-header__navigation-top-toggle-close-icon"
236
- focusable="false"
237
- >
238
- &times;
239
- </span>
240
220
  </button>
241
221
 
242
222
  <div id="super-search-menu" class="gem-c-layout-super-navigation-header__search-items">
@@ -263,16 +243,14 @@
263
243
  cy="10.0161"
264
244
  r="8.51613"
265
245
  stroke="currentColor"
266
- stroke-width="3"
267
- />
246
+ stroke-width="3" />
268
247
  <line
269
248
  x1="15.8668"
270
249
  y1="16.3587"
271
250
  x2="25.4475"
272
251
  y2="25.9393"
273
252
  stroke="currentColor"
274
- stroke-width="3"
275
- />
253
+ stroke-width="3" />
276
254
  </svg>
277
255
  </a>
278
256
  </div>
@@ -310,20 +288,16 @@
310
288
  <ul class="govuk-list">
311
289
  <% popular_links.each do | popular_link | %>
312
290
  <li class="gem-c-layout-super-navigation-header__popular-item">
313
- <%= link_to popular_link[:label], popular_link[:href], {
314
- class: [
315
- "govuk-link",
316
- "gem-c-layout-super-navigation-header__popular-link",
317
- ],
318
- data: {
319
- module: "gem-track-click",
320
- track_action: "popularLink",
321
- track_category: "headerClicked",
322
- track_label: popular_link[:href],
323
- track_dimension: popular_link[:label],
324
- track_dimension_index: "29",
325
- }
326
- } %>
291
+ <a class="govuk-link gem-c-layout-super-navigation-header__popular-link"
292
+ href="<%= popular_link[:href] %>"
293
+ data-module="gem-track-click"
294
+ data-track-action="popularLink"
295
+ data-track-category="headerClicked"
296
+ data-track-label="<%= popular_link[:href] %>"
297
+ data-track-dimension="<%= popular_link[:label] %>"
298
+ data-track-dimension-index="29">
299
+ <%= popular_link[:label] %>
300
+ </a>
327
301
  </li>
328
302
  <% end %>
329
303
  </ul>
@@ -1,4 +1,5 @@
1
1
  <%
2
+ warn('DEPRECATION WARNING: taxonomy_list component is deprecated and will be removed in a future major release of govuk_publishing_components')
2
3
  highlight_box ||= false
3
4
  document_list ||= false
4
5
  image_cards ||= false
@@ -16,21 +16,12 @@ accessibility_criteria: |
16
16
 
17
17
  * have a role of banner at the root of the component (<header>) (ARIA 1.1)
18
18
  accessibility_excluded_rules:
19
- # The header element can not be top level in the examples.
20
- - landmark-banner-is-top-level
21
- # Banners will be duplicated in component examples list.
22
- - duplicate-id
23
- - duplicate-id-active
24
- - duplicate-id-aria
25
- - landmark-no-duplicate-banner
26
- - landmark-unique
19
+ - landmark-banner-is-top-level # The header element can not be top level in the examples
20
+ - landmark-no-duplicate-banner # banners will be duplicated in component examples list
27
21
  examples:
28
22
  default:
29
23
  with_custom_logo_link:
30
- description: |
31
- The header logo links to root by default. This option allows us to override that in certain instances.
32
-
33
- Remember to update the title, as the default is "Go to the GOV.UK homepage".
24
+ description: The header logo links to root by default. This option allows us to override that in certain instances. Remember to change the title, as the default is "Go to the GOV.UK homepage".
34
25
  data:
35
26
  logo_link: "https://www.example.com"
36
27
  logo_link_title: "Go to example"
@@ -1,15 +1,7 @@
1
1
  <div class="govuk-width-container">
2
- <% message = capture do %>
3
- <%= t("components.layout_for_public.account_layout.feedback.banners.phase_intro") %>
4
- <a class="govuk-link" href=<%= GovukPersonalisation::Urls.feedback %>>
5
- <%= t("components.layout_for_public.account_layout.feedback.banners.phase_link") %>
6
- </a>
7
- <%= t("components.layout_for_public.account_layout.feedback.banners.phase_outro") %>
8
- <% end %>
9
-
10
2
  <%= render "govuk_publishing_components/components/phase_banner", {
11
3
  phase: "beta",
12
- message: message
4
+ message: sanitize(t("components.layout_for_public.account_layout.feedback.banners.phase_banner_html"))
13
5
  } unless omit_account_phase_banner %>
14
6
 
15
7
  <div class="govuk-grid-row govuk-main-wrapper">
@@ -94,9 +94,7 @@ en:
94
94
  account_layout:
95
95
  feedback:
96
96
  banners:
97
- phase_intro: This is a new service – your
98
- phase_link: feedback
99
- phase_outro: will help us to improve it.
97
+ phase_banner_html: This is a new service – your <a class="govuk-link" href="https://signin.account.gov.uk/contact-us?supportType=PUBLIC">feedback</a> will help us to improve it.
100
98
  navigation:
101
99
  destroy_user_session: Sign out
102
100
  menu_bar:
@@ -1,3 +1,3 @@
1
1
  module GovukPublishingComponents
2
- VERSION = "27.9.1".freeze
2
+ VERSION = "27.10.2".freeze
3
3
  end
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: 27.9.1
4
+ version: 27.10.2
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-10-28 00:00:00.000000000 Z
11
+ date: 2021-11-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_app_config