metadata_presenter 2.17.42 → 2.17.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/metadata_presenter/engine_controller.rb +9 -2
- data/app/views/layouts/metadata_presenter/application.html.erb +5 -2
- data/app/views/metadata_presenter/analytics/{_cookie_banner.html.erb → _cookie_banner_confirmation.html.erb} +1 -26
- data/app/views/metadata_presenter/analytics/_cookie_banner_request.html.erb +27 -0
- data/app/views/metadata_presenter/session/_timeout_warning_modal.html.erb +1 -1
- data/lib/metadata_presenter/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c4074167f68122d70397e5cb77986392aa8bdcb69691cc83ed2c9464df47ef4a
|
|
4
|
+
data.tar.gz: 62c30b9329c349778cc6c42b68ca4f2fd4a9868d938fe5cb838d1e2e5521afc5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dcfbaa935f3628552670d1e0734cec91f14d28a528bd2c68956186326c38857359955e141ddbfc9e9e6a0ac3e989cf32cecd726a7f4312ec02f9c8508622fdfd
|
|
7
|
+
data.tar.gz: 84a2dbe8d458cf66461df61e3f4197c775b16b9b8f7361718d79d2c1604cb9fde67bce9582fa536d534837102ef4663090cc8db60a8373defed44d5312993043
|
|
@@ -47,10 +47,17 @@ module MetadataPresenter
|
|
|
47
47
|
end
|
|
48
48
|
helper_method :allow_analytics?
|
|
49
49
|
|
|
50
|
-
def
|
|
50
|
+
def show_cookie_request?
|
|
51
51
|
(Rails.application.config.respond_to?(:global_ga4) || analytics_tags_present?) && no_analytics_cookie?
|
|
52
52
|
end
|
|
53
|
-
helper_method :
|
|
53
|
+
helper_method :show_cookie_request?
|
|
54
|
+
|
|
55
|
+
def show_cookie_confirmation?
|
|
56
|
+
unless no_analytics_cookie?
|
|
57
|
+
(Rails.application.config.respond_to?(:global_ga4) || analytics_tags_present?) && params[:analytics].present?
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
helper_method :show_cookie_confirmation?
|
|
54
61
|
|
|
55
62
|
def analytics_tags_present?
|
|
56
63
|
Rails.application.config.supported_analytics.values.flatten.any? do |analytic|
|
|
@@ -29,8 +29,11 @@
|
|
|
29
29
|
</script>
|
|
30
30
|
|
|
31
31
|
<div class="govuk-modal-dialogue-inert-container">
|
|
32
|
-
<% if
|
|
33
|
-
<%= render partial: 'metadata_presenter/analytics/
|
|
32
|
+
<% if show_cookie_request? %>
|
|
33
|
+
<%= render partial: 'metadata_presenter/analytics/cookie_banner_request' %>
|
|
34
|
+
<% end %>
|
|
35
|
+
<% if show_cookie_confirmation? %>
|
|
36
|
+
<%= render partial: 'metadata_presenter/analytics/cookie_banner_confirmation' %>
|
|
34
37
|
<% end %>
|
|
35
38
|
|
|
36
39
|
<%= render template: 'metadata_presenter/header/show' %>
|
|
@@ -1,30 +1,5 @@
|
|
|
1
|
-
<div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>">
|
|
2
|
-
<div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message">
|
|
3
|
-
|
|
4
|
-
<div class="govuk-grid-row">
|
|
5
|
-
<div class="govuk-grid-column-two-thirds">
|
|
6
|
-
<h2 class="govuk-cookie-banner__heading govuk-heading-m">
|
|
7
|
-
<%= t('presenter.analytics.heading', service_name: service.service_name) %>
|
|
8
|
-
</h2>
|
|
9
|
-
|
|
10
|
-
<div class="govuk-cookie-banner__content">
|
|
11
|
-
<p class="govuk-body"><%= t('presenter.analytics.body_1') %></p>
|
|
12
|
-
<p class="govuk-body"><%= t('presenter.analytics.body_2') %></p>
|
|
13
|
-
</div>
|
|
14
|
-
</div>
|
|
15
|
-
</div>
|
|
16
|
-
|
|
17
|
-
<div class="govuk-button-group">
|
|
18
|
-
<button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.accept("<%= analytics_cookie_name %>")'>
|
|
19
|
-
<%= t('presenter.analytics.accept') %>
|
|
20
|
-
</button>
|
|
21
|
-
<button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.reject("<%= analytics_cookie_name %>")'>
|
|
22
|
-
<%= t('presenter.analytics.reject') %>
|
|
23
|
-
</button>
|
|
24
|
-
<a class="govuk-link" href="/cookies"><%= t('presenter.analytics.view_cookies') %></a>
|
|
25
|
-
</div>
|
|
26
|
-
</div>
|
|
27
1
|
|
|
2
|
+
<div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>">
|
|
28
3
|
<div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-accepted" role="alert" style="display: none;">
|
|
29
4
|
<div class="govuk-grid-row">
|
|
30
5
|
<div class="govuk-grid-column-two-thirds">
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
<div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>">
|
|
2
|
+
<div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message">
|
|
3
|
+
|
|
4
|
+
<div class="govuk-grid-row">
|
|
5
|
+
<div class="govuk-grid-column-two-thirds">
|
|
6
|
+
<h2 class="govuk-cookie-banner__heading govuk-heading-m">
|
|
7
|
+
<%= t('presenter.analytics.heading', service_name: service.service_name) %>
|
|
8
|
+
</h2>
|
|
9
|
+
|
|
10
|
+
<div class="govuk-cookie-banner__content">
|
|
11
|
+
<p class="govuk-body"><%= t('presenter.analytics.body_1') %></p>
|
|
12
|
+
<p class="govuk-body"><%= t('presenter.analytics.body_2') %></p>
|
|
13
|
+
</div>
|
|
14
|
+
</div>
|
|
15
|
+
</div>
|
|
16
|
+
|
|
17
|
+
<div class="govuk-button-group">
|
|
18
|
+
<button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.accept("<%= analytics_cookie_name %>")'>
|
|
19
|
+
<%= t('presenter.analytics.accept') %>
|
|
20
|
+
</button>
|
|
21
|
+
<button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.reject("<%= analytics_cookie_name %>")'>
|
|
22
|
+
<%= t('presenter.analytics.reject') %>
|
|
23
|
+
</button>
|
|
24
|
+
<a class="govuk-link" href="/cookies"><%= t('presenter.analytics.view_cookies') %></a>
|
|
25
|
+
</div>
|
|
26
|
+
</div>
|
|
27
|
+
</div>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<div class="govuk-timeout-warning"
|
|
2
2
|
data-module="govuk-timeout-warning"
|
|
3
3
|
id="js-timeout-warning"
|
|
4
|
-
data-minutes-idle-timeout="
|
|
4
|
+
data-minutes-idle-timeout="24"
|
|
5
5
|
data-minutes-modal-visible="5"
|
|
6
6
|
data-url-redirect="/session/reset"
|
|
7
7
|
data-timer-text="<%= t('presenter.session_timeout_warning.timer') %>"
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metadata_presenter
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.17.
|
|
4
|
+
version: 2.17.43
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- MoJ Forms
|
|
@@ -324,7 +324,8 @@ files:
|
|
|
324
324
|
- app/validators/metadata_presenter/word_count.rb
|
|
325
325
|
- app/views/errors/404.html
|
|
326
326
|
- app/views/layouts/metadata_presenter/application.html.erb
|
|
327
|
-
- app/views/metadata_presenter/analytics/
|
|
327
|
+
- app/views/metadata_presenter/analytics/_cookie_banner_confirmation.html.erb
|
|
328
|
+
- app/views/metadata_presenter/analytics/_cookie_banner_request.html.erb
|
|
328
329
|
- app/views/metadata_presenter/analytics/_ga4.html.erb
|
|
329
330
|
- app/views/metadata_presenter/analytics/_global_analytics.html.erb
|
|
330
331
|
- app/views/metadata_presenter/analytics/_google.html.erb
|