metadata_presenter 2.17.42 → 2.17.44

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.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/metadata_presenter/engine_controller.rb +9 -2
  3. data/app/views/layouts/metadata_presenter/application.html.erb +5 -2
  4. data/app/views/metadata_presenter/analytics/{_cookie_banner.html.erb → _cookie_banner_confirmation.html.erb} +1 -26
  5. data/app/views/metadata_presenter/analytics/_cookie_banner_request.html.erb +27 -0
  6. data/app/views/metadata_presenter/page/checkanswers.html.erb +1 -1
  7. data/app/views/metadata_presenter/page/content.html.erb +1 -1
  8. data/app/views/metadata_presenter/page/multiplequestions.html.erb +1 -1
  9. data/app/views/metadata_presenter/page/singlequestion.html.erb +1 -1
  10. data/app/views/metadata_presenter/session/_timeout_warning_modal.html.erb +1 -1
  11. data/lib/metadata_presenter/version.rb +1 -1
  12. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d097ef739287d7b20f2023cee3a56965d6e81ba28c54144162369f198ec0bd60
4
- data.tar.gz: c383a7078042f8933c59d51965db8a09f8335d68971062b13fd9ad6b065a8973
3
+ metadata.gz: c5b8ce63d6058cd5e21a0db9190fb22fa6a64e56ba6734533b325781f8e7d32e
4
+ data.tar.gz: 70691c14ccd88fed3192eb0d4677e23d9f515786335ac155c867dbb1fe341bb4
5
5
  SHA512:
6
- metadata.gz: d4464292d0a45447d553ae22e7007c4a71bc164b6f96b9254d748b9468e343a4dca102cf214c51411343df9001e92991d5c2ceac8e1e926108abdbc4d4ac2f22
7
- data.tar.gz: d56962d232025286f75935328178ad4a3b296742070033bc6f222ba52476ec15bea61211eaddf2dd395bdeb4d05e80a8f045e967c86b1ecb0e5b453b81a6b191
6
+ metadata.gz: '0486169b63d3ca1303a6381db5db2795075e51d6a5de052ae1cce874ec4f70c1b8b35e38569a03d05d73dd5434754fccb9aaf4119b3aba97d9faf77fdf0614f8'
7
+ data.tar.gz: 1b6da19840195e042a146e43d1f0de9ab6cfc5bbd3aebb4a47e95e657c2a07f4df036114f0e211330eefe97eacf7a8123306bd3cf9bb3ca7c94256eae86b753c
data/app/controllers/metadata_presenter/engine_controller.rb CHANGED
@@ -47,10 +47,17 @@ module MetadataPresenter
47
47
  end
48
48
  helper_method :allow_analytics?
49
49
 
50
- def show_cookie_banner?
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 :show_cookie_banner?
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|
data/app/views/layouts/metadata_presenter/application.html.erb CHANGED
@@ -29,8 +29,11 @@
29
29
  </script>
30
30
 
31
31
  <div class="govuk-modal-dialogue-inert-container">
32
- <% if show_cookie_banner? %>
33
- <%= render partial: 'metadata_presenter/analytics/cookie_banner' %>
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' %>
data/app/views/metadata_presenter/analytics/{_cookie_banner.html.erb → _cookie_banner_confirmation.html.erb} RENAMED
@@ -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">
data/app/views/metadata_presenter/analytics/_cookie_banner_request.html.erb ADDED
@@ -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>
data/app/views/metadata_presenter/page/checkanswers.html.erb CHANGED
@@ -86,7 +86,7 @@
86
86
 
87
87
  <button <%= 'disabled' if editable? %> data-prevent-double-click="true" class="fb-block fb-block-actions govuk-button" data-module="govuk-button" data-block-id="actions" data-block-type="actions">
88
88
  <%= t('presenter.actions.submit') -%>
89
- </button> <% if ENV['SAVE_AND_RETURN'] == 'enabled' %><a href="<%= save_path %>" class="govuk-button" data-module="govuk-button" data-component="save-button"><%= t('presenter.save_and_return.save') %></a><% end %>
89
+ </button>
90
90
  <% end %>
91
91
 
92
92
  </div>
data/app/views/metadata_presenter/page/content.html.erb CHANGED
@@ -25,7 +25,7 @@
25
25
  content_components: @page.supported_content_components
26
26
  } %>
27
27
 
28
- <%= f.govuk_submit(disabled: editable?) %> <% if ENV['SAVE_AND_RETURN'] == 'enabled' %><a href="<%= save_path %>" class="govuk-button" data-module="govuk-button" data-component="save-button"><%= t('presenter.save_and_return.save') %></a><% end %>
28
+ <%= f.govuk_submit(disabled: editable?) %>
29
29
  <% end %>
30
30
  </div>
31
31
  </div>
data/app/views/metadata_presenter/page/multiplequestions.html.erb CHANGED
@@ -18,7 +18,7 @@
18
18
  }
19
19
  %>
20
20
 
21
- <%= f.govuk_submit(disabled: editable?) %> <% if ENV['SAVE_AND_RETURN'] == 'enabled' %><a href="<%= save_path %>" class="govuk-button" data-module="govuk-button" data-component="save-button"><%= t('presenter.save_and_return.save') %></a><% end %>
21
+ <%= f.govuk_submit(disabled: editable?) %>
22
22
  <% end %>
23
23
  </div>
24
24
  </div>
data/app/views/metadata_presenter/page/singlequestion.html.erb CHANGED
@@ -20,7 +20,7 @@
20
20
  </div>
21
21
  <% end %>
22
22
 
23
- <%= f.govuk_submit(disabled: editable?) %> <% if ENV['SAVE_AND_RETURN'] == 'enabled' %><a href="<%= save_path %>" class="govuk-button" data-module="govuk-button" data-component="save-button"><%= t('presenter.save_and_return.save') %></a><% end %>
23
+ <%= f.govuk_submit(disabled: editable?) %>
24
24
  <% end %>
25
25
  </div>
26
26
  </div>
data/app/views/metadata_presenter/session/_timeout_warning_modal.html.erb CHANGED
@@ -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="25"
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') %>"
data/lib/metadata_presenter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '2.17.42'.freeze
2
+ VERSION = '2.17.44'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metadata_presenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.17.42
4
+ version: 2.17.44
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-29 00:00:00.000000000 Z
11
+ date: 2023-03-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder
@@ -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/_cookie_banner.html.erb
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