govuk_publishing_components 37.2.4 → 37.3.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/javascripts/govuk_publishing_components/analytics/auto-scroll-tracker.js +3 -2
- data/app/assets/javascripts/govuk_publishing_components/analytics/init.js +0 -19
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-auto-tracker.js +3 -2
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-core.js +1 -1
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-event-tracker.js +3 -2
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-form-tracker.js +4 -3
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-link-tracker.js +15 -4
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-scroll-tracker.js +3 -2
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-smart-answer-results-tracker.js +3 -2
- data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/init-ga4.js +1 -0
- data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js +1 -8
- data/app/assets/javascripts/govuk_publishing_components/dependencies.js +1 -0
- data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js +3 -3
- data/app/assets/javascripts/govuk_publishing_components/load-analytics.js +20 -12
- data/app/assets/javascripts/govuk_publishing_components/modules.js +1 -1
- data/app/assets/javascripts/govuk_publishing_components/rum-loader.js +2 -3
- data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss +5 -16
- data/app/models/govuk_publishing_components/audit_comparer.rb +0 -1
- data/app/views/govuk_publishing_components/components/_attachment.html.erb +3 -1
- data/app/views/govuk_publishing_components/components/_back_link.html.erb +17 -7
- data/app/views/govuk_publishing_components/components/_cookie_banner.html.erb +1 -1
- data/app/views/govuk_publishing_components/components/_govspeak.html.erb +17 -2
- data/app/views/govuk_publishing_components/components/docs/attachment.yml +13 -0
- data/app/views/govuk_publishing_components/components/docs/back_link.yml +5 -3
- data/app/views/govuk_publishing_components/components/docs/cookie_banner.yml +2 -2
- data/app/views/govuk_publishing_components/components/docs/govspeak.yml +9 -0
- data/lib/govuk_publishing_components/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2555b277de08ff265823e6d39f556e5b11914ce143737ad5e8cd2d41dce344ff
|
4
|
+
data.tar.gz: 193200e4d2a872523f728817a8ad078f3fbf915a99b0986e10fa6fe1e51b6b5e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 926c1dbb856d7e056a3bb230ddf74ef83c3a1684287e2ce10133c0d8c869500f7a8124b6dfdbb1d399c415358e34909bcc3ad69b98661f7d39509e4bafa9bfba
|
7
|
+
data.tar.gz: 1c0bd5a48a1d14bcc5850a2be305b5fb2890dc51c6fbe45b02d6adcda587599f6cf4070f02183635083d1224c774543ec138dab23aae6276c133319f6cb09ad1
|
@@ -22,12 +22,13 @@ window.GOVUK.analyticsVars = window.GOVUK.analyticsVars || {};
|
|
22
22
|
if (consentCookie && consentCookie.usage) {
|
23
23
|
this.startModule()
|
24
24
|
} else {
|
25
|
-
this.
|
26
|
-
window.addEventListener('cookie-consent', this.
|
25
|
+
this.start = this.startModule.bind(this)
|
26
|
+
window.addEventListener('cookie-consent', this.start)
|
27
27
|
}
|
28
28
|
}
|
29
29
|
|
30
30
|
AutoScrollTracker.prototype.startModule = function () {
|
31
|
+
window.removeEventListener('cookie-consent', this.start)
|
31
32
|
if (window.GOVUK.analyticsVars.scrollTrackerStarted) {
|
32
33
|
return
|
33
34
|
}
|
@@ -11,25 +11,6 @@ var analyticsInit = function () {
|
|
11
11
|
var crossDomainLinkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
|
12
12
|
}
|
13
13
|
|
14
|
-
window.GOVUK.Analytics.checkDigitalIdentityConsent = function (location) {
|
15
|
-
if (!location || !location.search) return
|
16
|
-
// this checks for the presence of the Digital Identity cookie consent query parameter and updates our consent cookie accordingly
|
17
|
-
// This is so that users don't see multiple cookie banners when they move between the different account management pages, as some will be on GOV.UK and others will be on the DI domain.
|
18
|
-
var digitalIdentityConsent = /([?&]cookie_consent=)(accept|reject)/.exec(location.search)
|
19
|
-
if (digitalIdentityConsent) {
|
20
|
-
if (digitalIdentityConsent[2] === 'accept') {
|
21
|
-
window.GOVUK.setConsentCookie({ usage: true })
|
22
|
-
// set cookies_preferences_set to true to prevent cookie banner showing
|
23
|
-
window.GOVUK.cookie('cookies_preferences_set', 'true')
|
24
|
-
} else if (digitalIdentityConsent[2] === 'reject') {
|
25
|
-
window.GOVUK.setConsentCookie({ usage: false })
|
26
|
-
window.GOVUK.cookie('cookies_preferences_set', 'true')
|
27
|
-
}
|
28
|
-
}
|
29
|
-
}
|
30
|
-
|
31
|
-
window.GOVUK.Analytics.checkDigitalIdentityConsent(window.location)
|
32
|
-
|
33
14
|
var consentCookie = window.GOVUK.getConsentCookie()
|
34
15
|
var dummyAnalytics = {
|
35
16
|
addLinkedTrackerDomain: function () {},
|
@@ -16,8 +16,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
16
16
|
if (consentCookie && consentCookie.usage) {
|
17
17
|
this.startModule()
|
18
18
|
} else {
|
19
|
-
this.
|
20
|
-
window.addEventListener('cookie-consent', this.
|
19
|
+
this.start = this.startModule.bind(this)
|
20
|
+
window.addEventListener('cookie-consent', this.start)
|
21
21
|
}
|
22
22
|
}
|
23
23
|
|
@@ -27,6 +27,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
27
27
|
|
28
28
|
Ga4AutoTracker.prototype.sendEvent = function () {
|
29
29
|
if (window.dataLayer) {
|
30
|
+
window.removeEventListener('cookie-consent', this.start)
|
30
31
|
try {
|
31
32
|
var data = this.module.getAttribute(this.trackingTrigger)
|
32
33
|
data = JSON.parse(data) || {}
|
@@ -268,7 +268,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
|
|
268
268
|
module.setAttribute('data-ga4-link', JSON.stringify(ga4LinkData))
|
269
269
|
} catch (e) {
|
270
270
|
// if there's a problem with the config, don't start the tracker
|
271
|
-
console.error('Unable to JSON.parse or JSON.stringify index: '
|
271
|
+
console.error('Unable to JSON.parse or JSON.stringify index: ', e, window.location)
|
272
272
|
}
|
273
273
|
},
|
274
274
|
|
@@ -16,14 +16,15 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
16
16
|
if (consentCookie && consentCookie.usage) {
|
17
17
|
this.startModule()
|
18
18
|
} else {
|
19
|
-
this.
|
20
|
-
window.addEventListener('cookie-consent', this.
|
19
|
+
this.start = this.startModule.bind(this)
|
20
|
+
window.addEventListener('cookie-consent', this.start)
|
21
21
|
}
|
22
22
|
}
|
23
23
|
|
24
24
|
// triggered by cookie-consent event, which happens when users consent to cookies
|
25
25
|
Ga4EventTracker.prototype.startModule = function () {
|
26
26
|
if (window.dataLayer) {
|
27
|
+
window.removeEventListener('cookie-consent', this.start)
|
27
28
|
this.module.addEventListener('click', this.trackClick.bind(this), true) // useCapture must be true
|
28
29
|
}
|
29
30
|
}
|
@@ -18,14 +18,15 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
18
18
|
if (consentCookie && consentCookie.usage) {
|
19
19
|
this.startModule()
|
20
20
|
} else {
|
21
|
-
this.
|
22
|
-
window.addEventListener('cookie-consent', this.
|
21
|
+
this.start = this.startModule.bind(this)
|
22
|
+
window.addEventListener('cookie-consent', this.start)
|
23
23
|
}
|
24
24
|
}
|
25
25
|
|
26
26
|
// triggered by cookie-consent event, which happens when users consent to cookies
|
27
27
|
Ga4FormTracker.prototype.startModule = function () {
|
28
28
|
if (window.dataLayer) {
|
29
|
+
window.removeEventListener('cookie-consent', this.start)
|
29
30
|
this.module.addEventListener('submit', this.trackFormSubmit.bind(this))
|
30
31
|
}
|
31
32
|
}
|
@@ -88,7 +89,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
88
89
|
} else if (inputNodename === 'SELECT' && elem.options[elem.selectedIndex].value) {
|
89
90
|
input.answer = elem.options[elem.selectedIndex].text
|
90
91
|
} else if (inputTypes.indexOf(inputType) !== -1 && elem.value) {
|
91
|
-
if (this.includeTextInputValues) {
|
92
|
+
if (this.includeTextInputValues || elem.hasAttribute('data-ga4-form-include-input')) {
|
92
93
|
var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
|
93
94
|
input.answer = PIIRemover.stripPIIWithOverride(elem.value, true, true)
|
94
95
|
} else {
|
@@ -19,14 +19,15 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
19
19
|
if (consentCookie && consentCookie.usage) {
|
20
20
|
this.startModule()
|
21
21
|
} else {
|
22
|
-
this.
|
23
|
-
window.addEventListener('cookie-consent', this.
|
22
|
+
this.start = this.startModule.bind(this)
|
23
|
+
window.addEventListener('cookie-consent', this.start)
|
24
24
|
}
|
25
25
|
}
|
26
26
|
|
27
27
|
// triggered by cookie-consent event, which happens when users consent to cookies
|
28
28
|
Ga4LinkTracker.prototype.startModule = function () {
|
29
29
|
if (window.dataLayer) {
|
30
|
+
window.removeEventListener('cookie-consent', this.start)
|
30
31
|
this.handleClick = this.handleClick.bind(this)
|
31
32
|
this.handleMousedown = this.handleMousedown.bind(this)
|
32
33
|
|
@@ -47,8 +48,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
47
48
|
} else if (this.trackLinksOnly && target.closest('a')) {
|
48
49
|
if (!this.limitToElementClass) {
|
49
50
|
this.trackClick(event)
|
50
|
-
} else
|
51
|
-
this.
|
51
|
+
} else {
|
52
|
+
var classes = this.limitToElementClass.split(',')
|
53
|
+
|
54
|
+
for (var i = 0; i < classes.length; i++) {
|
55
|
+
if (target.closest('.' + classes[i].trim())) {
|
56
|
+
// Stops the link tracker firing twice if the link itself has data-ga4-link, and the parent element does as well.
|
57
|
+
if (target.closest('[data-ga4-link]') !== target.closest('[data-ga4-limit-to-element-class]')) {
|
58
|
+
return
|
59
|
+
}
|
60
|
+
this.trackClick(event)
|
61
|
+
}
|
62
|
+
}
|
52
63
|
}
|
53
64
|
}
|
54
65
|
}
|
@@ -22,12 +22,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
22
22
|
if (consentCookie && consentCookie.usage) {
|
23
23
|
this.startModule()
|
24
24
|
} else {
|
25
|
-
this.
|
26
|
-
window.addEventListener('cookie-consent', this.
|
25
|
+
this.start = this.startModule.bind(this)
|
26
|
+
window.addEventListener('cookie-consent', this.start)
|
27
27
|
}
|
28
28
|
}
|
29
29
|
|
30
30
|
Ga4ScrollTracker.prototype.startModule = function () {
|
31
|
+
window.removeEventListener('cookie-consent', this.start)
|
31
32
|
if (window.GOVUK.analyticsGa4.vars.scrollTrackerStarted) {
|
32
33
|
return
|
33
34
|
}
|
@@ -15,8 +15,8 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
|
|
15
15
|
if (consentCookie && consentCookie.usage) {
|
16
16
|
this.startModule()
|
17
17
|
} else {
|
18
|
-
this.
|
19
|
-
window.addEventListener('cookie-consent', this.
|
18
|
+
this.start = this.startModule.bind(this)
|
19
|
+
window.addEventListener('cookie-consent', this.start)
|
20
20
|
}
|
21
21
|
}
|
22
22
|
|
@@ -25,6 +25,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
|
|
25
25
|
// only run this code if the dataLayer exists and an element with a data-ga4-ecommerce-path
|
26
26
|
// attribute exists as this indicates that ecommerce tracking is required
|
27
27
|
if (window.dataLayer && this.module.querySelector('[data-ga4-ecommerce-path]')) {
|
28
|
+
window.removeEventListener('cookie-consent', this.start)
|
28
29
|
this.trackResults()
|
29
30
|
this.module.addEventListener('click', this.handleClick.bind(this))
|
30
31
|
}
|
@@ -2,6 +2,7 @@ window.GOVUK = window.GOVUK || {}
|
|
2
2
|
window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {}
|
3
3
|
|
4
4
|
var initFunction = function () {
|
5
|
+
window.removeEventListener('cookie-consent', window.GOVUK.analyticsGa4.init)
|
5
6
|
var consentCookie = window.GOVUK.getConsentCookie()
|
6
7
|
|
7
8
|
if (consentCookie && consentCookie.usage) {
|
@@ -26,13 +26,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
26
26
|
|
27
27
|
this.$acceptCookiesButton = this.$module.querySelector('button[data-accept-cookies]')
|
28
28
|
if (this.$acceptCookiesButton) {
|
29
|
-
this.$acceptCookiesButton.style.display = 'block'
|
30
29
|
this.$acceptCookiesButton.addEventListener('click', this.$module.setCookieConsent)
|
31
30
|
}
|
32
31
|
|
33
32
|
this.$rejectCookiesButton = this.$module.querySelector('button[data-reject-cookies]')
|
34
33
|
if (this.$rejectCookiesButton) {
|
35
|
-
this.$rejectCookiesButton.style.display = 'block'
|
36
34
|
this.$rejectCookiesButton.addEventListener('click', this.$module.rejectCookieConsent)
|
37
35
|
}
|
38
36
|
|
@@ -45,7 +43,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
45
43
|
var shouldHaveCookieMessage = (this.$module && window.GOVUK.cookie('cookies_preferences_set') !== 'true')
|
46
44
|
|
47
45
|
if (shouldHaveCookieMessage) {
|
48
|
-
this.$module.
|
46
|
+
this.$module.removeAttribute('hidden')
|
49
47
|
|
50
48
|
// Set the default consent cookie if it isn't already present
|
51
49
|
if (!window.GOVUK.cookie('cookies_policy')) {
|
@@ -53,18 +51,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
53
51
|
}
|
54
52
|
|
55
53
|
window.GOVUK.deleteUnconsentedCookies()
|
56
|
-
} else {
|
57
|
-
this.$module.style.display = 'none'
|
58
54
|
}
|
59
|
-
} else {
|
60
|
-
this.$module.style.display = 'none'
|
61
55
|
}
|
62
56
|
}
|
63
57
|
|
64
58
|
CookieBanner.prototype.hideCookieMessage = function (event) {
|
65
59
|
if (this.$module) {
|
66
60
|
this.$module.hidden = true
|
67
|
-
this.$module.style.display = 'none'
|
68
61
|
window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
|
69
62
|
}
|
70
63
|
|
@@ -10,6 +10,7 @@ document.addEventListener('DOMContentLoaded', function () {
|
|
10
10
|
|
11
11
|
// if statements ensure these functions don't execute during testing
|
12
12
|
if (typeof window.GOVUK.loadAnalytics !== 'undefined') {
|
13
|
+
window.GOVUK.loadAnalytics.loadExtraDomains()
|
13
14
|
if (typeof window.GOVUK.analyticsGa4.vars === 'undefined') {
|
14
15
|
window.GOVUK.loadAnalytics.loadGa4()
|
15
16
|
}
|
data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js
CHANGED
@@ -10,15 +10,15 @@
|
|
10
10
|
|
11
11
|
YoutubeLinkEnhancement.prototype.init = function () {
|
12
12
|
if (!this.campaignCookiesAllowed()) {
|
13
|
-
this.
|
14
|
-
window.addEventListener('cookie-consent', this.
|
13
|
+
this.start = this.startModule.bind(this)
|
14
|
+
window.addEventListener('cookie-consent', this.start)
|
15
15
|
return
|
16
16
|
}
|
17
17
|
this.startModule()
|
18
18
|
}
|
19
19
|
|
20
20
|
YoutubeLinkEnhancement.prototype.startModule = function () {
|
21
|
-
window.removeEventListener('cookie-consent', this.
|
21
|
+
window.removeEventListener('cookie-consent', this.start)
|
22
22
|
var $youtubeLinks = this.$element.querySelectorAll('a[href*="youtube.com"], a[href*="youtu.be"]')
|
23
23
|
|
24
24
|
if ($youtubeLinks.length > 0) {
|
@@ -70,6 +70,12 @@ window.GOVUK.loadAnalytics = {
|
|
70
70
|
}
|
71
71
|
],
|
72
72
|
|
73
|
+
loadExtraDomains: function () {
|
74
|
+
if (Array.isArray(window.GOVUK.analyticsGa4Domains)) {
|
75
|
+
this.domains = this.domains.concat(window.GOVUK.analyticsGa4Domains)
|
76
|
+
}
|
77
|
+
},
|
78
|
+
|
73
79
|
// For Universal Analytics' cross domain tracking. linkedDomains is defined by the require statement at the top of the file.
|
74
80
|
linkedDomains: window.GOVUK.analytics.linkedDomains,
|
75
81
|
|
@@ -99,18 +105,7 @@ window.GOVUK.loadAnalytics = {
|
|
99
105
|
|
100
106
|
loadGa4: function (currentDomain) {
|
101
107
|
currentDomain = currentDomain || window.location.hostname
|
102
|
-
var environment =
|
103
|
-
// lots of dev domains, so simplify the matching process
|
104
|
-
if (currentDomain.match(/[a-zA-Z0-9.-]+dev\.gov\.uk/)) {
|
105
|
-
environment = this.domains[0]
|
106
|
-
} else {
|
107
|
-
for (var i = 0; i < this.domains.length; i++) {
|
108
|
-
if (this.arrayContains(currentDomain, this.domains[i].domains)) {
|
109
|
-
environment = this.domains[i]
|
110
|
-
break
|
111
|
-
}
|
112
|
-
}
|
113
|
-
}
|
108
|
+
var environment = this.getEnvironment(currentDomain)
|
114
109
|
|
115
110
|
// If we recognise the environment (i.e. the string isn't empty), load in GA4
|
116
111
|
if (environment) {
|
@@ -135,5 +130,18 @@ window.GOVUK.loadAnalytics = {
|
|
135
130
|
|
136
131
|
arrayContains: function (valueToFind, array) {
|
137
132
|
return array.indexOf(valueToFind) !== -1
|
133
|
+
},
|
134
|
+
|
135
|
+
getEnvironment: function (currentDomain) {
|
136
|
+
// lots of dev domains, so simplify the matching process
|
137
|
+
if (currentDomain.match(/[a-zA-Z0-9.-]+dev\.gov\.uk/)) {
|
138
|
+
return this.domains[0]
|
139
|
+
} else {
|
140
|
+
for (var i = 0; i < this.domains.length; i++) {
|
141
|
+
if (this.arrayContains(currentDomain, this.domains[i].domains)) {
|
142
|
+
return this.domains[i]
|
143
|
+
}
|
144
|
+
}
|
145
|
+
}
|
138
146
|
}
|
139
147
|
}
|
@@ -43,7 +43,7 @@
|
|
43
43
|
element.setAttribute('data-' + moduleNames[j] + '-module-started', true)
|
44
44
|
} catch (e) {
|
45
45
|
// if there's a problem with the module, catch the error to allow other modules to start
|
46
|
-
console.error('Error starting ' + moduleName + ' component JS: '
|
46
|
+
console.error('Error starting ' + moduleName + ' component JS: ', e, window.location)
|
47
47
|
}
|
48
48
|
}
|
49
49
|
}
|
@@ -19,6 +19,7 @@
|
|
19
19
|
})()
|
20
20
|
|
21
21
|
var insertScript = function () {
|
22
|
+
window.removeEventListener('cookie-consent', insertScript)
|
22
23
|
var marker = document.querySelector('script[data-lux-reporter-script]')
|
23
24
|
|
24
25
|
if (!marker) {
|
@@ -37,8 +38,6 @@
|
|
37
38
|
if (parsedCookie.usage === true) {
|
38
39
|
insertScript()
|
39
40
|
} else {
|
40
|
-
window.addEventListener('cookie-consent',
|
41
|
-
insertScript()
|
42
|
-
})
|
41
|
+
window.addEventListener('cookie-consent', insertScript)
|
43
42
|
}
|
44
43
|
})()
|
@@ -1,25 +1,14 @@
|
|
1
1
|
@import "govuk_publishing_components/individual_component_support";
|
2
2
|
@import "govuk/components/cookie-banner/cookie-banner";
|
3
3
|
|
4
|
-
.gem-c-cookie-banner
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
display: none;
|
10
|
-
}
|
11
|
-
|
12
|
-
.js-enabled {
|
13
|
-
.gem-c-cookie-banner {
|
14
|
-
display: none; // shown with JS, always on for non-JS
|
4
|
+
.gem-c-cookie-banner {
|
5
|
+
[hidden],
|
6
|
+
.govuk-button-group[hidden],
|
7
|
+
.govuk-cookie-banner__heading[hidden] {
|
8
|
+
display: none;
|
15
9
|
}
|
16
10
|
}
|
17
11
|
|
18
|
-
// can't be used without js so implement there
|
19
|
-
.gem-c-cookie-banner .gem-c-button {
|
20
|
-
display: none;
|
21
|
-
}
|
22
|
-
|
23
12
|
.gem-c-cookie-banner__confirmation {
|
24
13
|
// This element is focused using JavaScript so that it's being read out by screen readers
|
25
14
|
// for this reason we don't want to show the default outline or emphasise it visually using `govuk-focused-text`
|
@@ -7,6 +7,7 @@
|
|
7
7
|
hide_order_copy_link ||= false
|
8
8
|
attributes = []
|
9
9
|
data_attributes ||= {}
|
10
|
+
details_ga4_attributes ||= {}
|
10
11
|
shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
|
11
12
|
|
12
13
|
container_class_names = %w[gem-c-attachment govuk-!-display-none-print]
|
@@ -118,7 +119,8 @@
|
|
118
119
|
<% if attachment.alternative_format_contact_email %>
|
119
120
|
<%= tag.p t("components.attachment.request_format_text"), class: "gem-c-attachment__metadata" %>
|
120
121
|
<%= render "govuk_publishing_components/components/details", {
|
121
|
-
title: t("components.attachment.request_format_cta")
|
122
|
+
title: t("components.attachment.request_format_cta"),
|
123
|
+
ga4_attributes: details_ga4_attributes,
|
122
124
|
} do %>
|
123
125
|
<%= t("components.attachment.request_format_details_html", alternative_format_contact_email: attachment.alternative_format_contact_email) %>
|
124
126
|
<% end %>
|
@@ -2,11 +2,21 @@
|
|
2
2
|
add_gem_component_stylesheet("back-link")
|
3
3
|
|
4
4
|
text ||= t('components.back_link.back')
|
5
|
-
data_attributes ||=
|
5
|
+
data_attributes ||= {}
|
6
|
+
disable_ga4 ||= false
|
7
|
+
|
8
|
+
component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
|
9
|
+
component_helper.add_class("gem-c-back-link govuk-back-link govuk-!-display-none-print")
|
10
|
+
unless disable_ga4
|
11
|
+
ga4_link = {
|
12
|
+
event_name: "navigation",
|
13
|
+
type: "back",
|
14
|
+
url: href,
|
15
|
+
}
|
16
|
+
component_helper.add_data_attribute({ module: "ga4-link-tracker" })
|
17
|
+
component_helper.add_data_attribute({ ga4_link: ga4_link })
|
18
|
+
end
|
6
19
|
%>
|
7
|
-
<%=
|
8
|
-
text
|
9
|
-
|
10
|
-
class: %w(gem-c-back-link govuk-back-link govuk-!-display-none-print),
|
11
|
-
data: data_attributes
|
12
|
-
) %>
|
20
|
+
<%= tag.a(**component_helper.all_attributes.merge!({ href: href })) do %>
|
21
|
+
<%= text %>
|
22
|
+
<% end %>
|
@@ -34,7 +34,7 @@
|
|
34
34
|
disable_ga4 ||= false
|
35
35
|
%>
|
36
36
|
|
37
|
-
<div id="<%= id %>" class="<%= css_classes.join(' ') %>" data-module="cookie-banner" data-nosnippet role="region" aria-label="<%= title %>">
|
37
|
+
<div id="<%= id %>" class="<%= css_classes.join(' ') %>" data-module="cookie-banner" data-nosnippet role="region" aria-label="<%= title %>" hidden>
|
38
38
|
<div class="govuk-cookie-banner__message govuk-width-container">
|
39
39
|
<div class="govuk-grid-row">
|
40
40
|
<div class="govuk-grid-column-two-thirds">
|
@@ -9,9 +9,24 @@
|
|
9
9
|
classes << direction_class if direction_class
|
10
10
|
classes << "disable-youtube" if disable_youtube_expansions
|
11
11
|
classes << "gem-c-govspeak--inverse" if inverse
|
12
|
+
|
13
|
+
disable_ga4 ||= false
|
14
|
+
|
15
|
+
data_modules = "govspeak"
|
16
|
+
data_modules << " ga4-link-tracker" unless disable_ga4
|
17
|
+
data_attributes = { module: data_modules }
|
18
|
+
|
19
|
+
unless disable_ga4
|
20
|
+
data_attributes.merge!({
|
21
|
+
ga4_track_links_only: "",
|
22
|
+
ga4_limit_to_element_class: "call-to-action, info-notice, help-notice, advisory",
|
23
|
+
ga4_link: { "event_name": "navigation", "type": "callout" }.to_json,
|
24
|
+
})
|
25
|
+
end
|
26
|
+
|
12
27
|
%>
|
13
28
|
|
14
|
-
|
29
|
+
<%= tag.div(class: "gem-c-govspeak govuk-govspeak " + classes.join(" "), data: data_attributes) do %>
|
15
30
|
<% if local_assigns.include?(:content) %>
|
16
31
|
<% if content.html_safe? %>
|
17
32
|
<%= content %>
|
@@ -32,4 +47,4 @@
|
|
32
47
|
<% elsif block_given? %>
|
33
48
|
<%= yield %>
|
34
49
|
<% end %>
|
35
|
-
|
50
|
+
<% end %>
|
@@ -76,6 +76,19 @@ examples:
|
|
76
76
|
content_type: application/pdf
|
77
77
|
file_size: 20000
|
78
78
|
alternative_format_contact_email: defra.helpline@defra.gsi.gov.uk
|
79
|
+
with_contact_email_and_ga4_tracking:
|
80
|
+
description: The attachment component can contain the details component as shown. The details component provides all of its own GA4 tracking, but in most situations also requires an `index_section_count` attribute to be passed manually. This can be done via the attachment component as shown (along with any other needed GA4 attributes).
|
81
|
+
data:
|
82
|
+
attachment:
|
83
|
+
title: "Department for Transport information asset register"
|
84
|
+
url: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/747661/department-for-transport-information-asset-register.csv
|
85
|
+
filename: department-for-transport-information-asset-register.csv
|
86
|
+
content_type: application/pdf
|
87
|
+
file_size: 20000
|
88
|
+
alternative_format_contact_email: defra.helpline@defra.gsi.gov.uk
|
89
|
+
details_ga4_attributes: {
|
90
|
+
index_section_count: 4
|
91
|
+
}
|
79
92
|
with_data_attributes:
|
80
93
|
data:
|
81
94
|
attachment:
|
@@ -6,6 +6,7 @@ shared_accessibility_criteria:
|
|
6
6
|
- link
|
7
7
|
govuk_frontend_components:
|
8
8
|
- back-link
|
9
|
+
uses_component_wrapper_helper: true
|
9
10
|
examples:
|
10
11
|
default:
|
11
12
|
data:
|
@@ -14,8 +15,9 @@ examples:
|
|
14
15
|
data:
|
15
16
|
text: 'Back to document list'
|
16
17
|
href: '#'
|
17
|
-
|
18
|
+
without_ga4_tracking:
|
19
|
+
description: |
|
20
|
+
Disables GA4 tracking on the component. Tracking is enabled by default. This adds a data module and data-attributes with JSON data. See the [ga4-link-tracker documentation](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics-ga4/ga4-link-tracker.md) for more information.
|
18
21
|
data:
|
19
22
|
href: '#'
|
20
|
-
|
21
|
-
an_attribute: the value
|
23
|
+
disable_ga4: true
|
@@ -1,11 +1,11 @@
|
|
1
1
|
name: Cookie banner
|
2
2
|
description: Help users manage their personal data by telling them when you store cookies on their device.
|
3
3
|
body: |
|
4
|
-
By default the cookie banner is
|
4
|
+
By default the cookie banner is hidden. If JavaScript is enabled, the banner is displayed if cookie preferences are not set. The banner will stay hidden if cookie preferences are already set.
|
5
5
|
|
6
6
|
Setting `data-hide-cookie-banner="true"` on any link inside the banner will overwrite the default action and when clicked will dismiss the cookie banner for a period of 365 days (approx. 1 year).
|
7
7
|
|
8
|
-
If the examples below are not showing the banner, make sure the `cookies_preferences_set` cookie is not present or is set to false.
|
8
|
+
If the examples below are not showing the banner, make sure JS is enabled, and the `cookies_preferences_set` cookie is not present or is set to false.
|
9
9
|
accessibility_criteria: |
|
10
10
|
Text in the cookie banner must be clear and unambiguous and should provide a way to dismiss the message.
|
11
11
|
shared_accessibility_criteria:
|
@@ -914,3 +914,12 @@ examples:
|
|
914
914
|
<p>Deforested area. Credit: Blue Ventures-Garth Cripps</p>
|
915
915
|
</figcaption>
|
916
916
|
</figure>
|
917
|
+
without_ga4_tracking:
|
918
|
+
description: |
|
919
|
+
Disables GA4 tracking on the component. Tracking is enabled by default. This adds a data module and data-attributes with JSON data. See the [ga4-link-tracker documentation](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics-ga4/ga4-link-tracker.md) for more information.
|
920
|
+
data:
|
921
|
+
block: |
|
922
|
+
<p>
|
923
|
+
<a href='https://www.gov.uk'>Hello World</a>
|
924
|
+
</p>
|
925
|
+
disable_ga4: true
|
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: 37.
|
4
|
+
version: 37.3.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: 2024-
|
11
|
+
date: 2024-02-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: govuk_app_config
|
@@ -1497,7 +1497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1497
1497
|
- !ruby/object:Gem::Version
|
1498
1498
|
version: '0'
|
1499
1499
|
requirements: []
|
1500
|
-
rubygems_version: 3.5.
|
1500
|
+
rubygems_version: 3.5.6
|
1501
1501
|
signing_key:
|
1502
1502
|
specification_version: 4
|
1503
1503
|
summary: A gem to document components in GOV.UK frontend applications
|