metadata_presenter 2.17.39 → 2.17.40

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 74a03d0e71f4cda581df3afd4cf40329124cbf1aa600c04ca3ee54bf3b8ad40d
4
- data.tar.gz: 977eed88e73f2e507681ff4e2580b4538c00a7a67548bf7ba12dc442560089c4
3
+ metadata.gz: df4841d770916f29d6e715bb0f183b1fffeae2631d5b25634c0a8dcc11bec693
4
+ data.tar.gz: de0236515c2de4fbd0afd30dad64ee85f038229f4a7c86f4b92f0b463cb895e8
5
5
  SHA512:
6
- metadata.gz: f0b846fa1f4ed5b5317130cf201cfd6ecef403237ff546d009fb4415a8df5a97a280e6e28d6c4a68e89a00b4c465a3e574419bf527edbbad5b92e42892742da6
7
- data.tar.gz: 6fe78ca82cb81ba12782c9f6ad589cc5f41831a9e72e4d61a4e3201d749549c08cd387bad53264b3c41132688f0814a8895a5a7b57bbe0a88ee0b2d3d060f329
6
+ metadata.gz: fbfa3d5c87351fa9bf59f1b6ec630a3c441718a7632d55289d7cd9a99f11b3fe5a830bc49597847f7cbde725a6fd34acec749d788c1a9006e049e61406de21f5
7
+ data.tar.gz: 65aefa06629b7a63ff6beced03a227f70724b92a110bfa8a2c71a2eebb754f08e0bc03a54b8c1f7d7a331ce76794c8652fe798e71ca30bf6b32cd19d8808bd83
@@ -1,18 +1,19 @@
1
1
  <!DOCTYPE html>
2
2
  <html lang="en">
3
3
  <head>
4
+ <meta charset="utf-8">
4
5
  <title><%= service.service_name %></title>
5
6
  <%= csrf_meta_tags %>
6
7
  <%= csp_meta_tag %>
7
8
 
8
- <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
9
- <meta name="robots" content="noindex">
10
- <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
11
- <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
12
- <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">
13
- <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-167x167.png') %>">
14
- <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-152x152.png') %>">
15
- <link rel="apple-touch-icon" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon.png') %>">
9
+ <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
10
+ <meta name="robots" content="noindex">
11
+ <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
12
+ <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
13
+ <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">
14
+ <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-167x167.png') %>">
15
+ <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-152x152.png') %>">
16
+ <link rel="apple-touch-icon" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon.png') %>">
16
17
 
17
18
  <%= javascript_pack_tag 'runner_application', 'govuk', defer: true %>
18
19
  <%= stylesheet_pack_tag 'govuk', 'runner_application', media: 'all' %>
@@ -23,19 +24,34 @@
23
24
  </head>
24
25
 
25
26
  <body class="govuk-template__body">
26
- <% if show_cookie_banner? %>
27
- <%= render partial: 'metadata_presenter/analytics/cookie_banner' %>
28
- <% end %>
27
+ <script>
28
+ document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
29
+ </script>
30
+
31
+ <div class="govuk-modal-dialogue-inert-container">
32
+ <% if show_cookie_banner? %>
33
+ <%= render partial: 'metadata_presenter/analytics/cookie_banner' %>
34
+ <% end %>
35
+
36
+ <%= render template: 'metadata_presenter/header/show' %>
29
37
 
30
- <%= render template: 'metadata_presenter/header/show' %>
31
- <div class="govuk-width-container govuk-body-m">
32
- <main class="govuk-main-wrapper govuk-main-wrapper--auto-spacing" id="main-content" role="main">
33
- <% if back_link.present? %>
34
- <a class="govuk-back-link" href="<%= back_link %>">Back</a>
35
- <% end %>
36
- <%= yield %>
37
- </main>
38
+ <div class="govuk-width-container govuk-body-m">
39
+ <main class="govuk-main-wrapper govuk-main-wrapper--auto-spacing" id="main-content" role="main">
40
+ <% if back_link.present? %>
41
+ <a class="govuk-back-link" href="<%= back_link %>">Back</a>
42
+ <% end %>
43
+ <% if !in_progress? %>
44
+ <%= render partial: 'metadata_presenter/session/timeout_fallback' %>
45
+ <% end %>
46
+ <%= yield %>
47
+ </main>
48
+ </div>
49
+
50
+ <%= render template: 'metadata_presenter/footer/footer' %>
38
51
  </div>
39
- <%= render template: 'metadata_presenter/footer/footer' %>
52
+
53
+ <% if !in_progress? %>
54
+ <%= render partial: 'metadata_presenter/session/timeout_warning_modal' %>
55
+ <% end %>
40
56
  </body>
41
57
  </html>
@@ -0,0 +1,8 @@
1
+ <div class="govuk-warning-text govuk-timeout-warning-fallback">
2
+ <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
3
+ <strong class="govuk-warning-text__text">
4
+ <span class="govuk-warning-text__assistive">Warning</span>
5
+ <%= t('presenter.session_timeout_warning.timer_fallback') %> <%= session_expiry_time&.strftime('%l:%M %p') %>.
6
+ <%= t('presenter.session_timeout_warning.timer_extra') %>
7
+ </strong>
8
+ </div>
@@ -0,0 +1,33 @@
1
+ <div class="govuk-timeout-warning"
2
+ data-module="govuk-timeout-warning"
3
+ id="js-timeout-warning"
4
+ data-minutes-idle-timeout="25"
5
+ data-minutes-modal-visible="5"
6
+ data-url-redirect="/session/reset"
7
+ data-timer-text="<%= t('presenter.session_timeout_warning.timer') %>"
8
+ data-timer-extra-text="<%= t('presenter.session_timeout_warning.timer_extra') %>"
9
+ data-timer-redirect-text="<%= t('presenter.session_timeout_warning.redirect') %>">
10
+
11
+ <div id="timeout-warning-modal"
12
+ class="govuk-modal-dialogue govuk-timeout-warning__dialog"
13
+ data-inert-container=".govuk-modal-dialogue-inert-container">
14
+ <div class="govuk-modal-dialogue__wrapper" >
15
+ <dialog class="govuk-modal-dialogue__box " aria-labelledby="timeout-warning-modal-title" aria-modal="true" role="modal" tabindex="-1">
16
+ <div class="govuk-modal-dialogue__header">
17
+ <button type="button" class="govuk-button govuk-modal-dialogue__close" aria-label="<%= t('presenter.session_timeout_warning.close_button') %>" data-element="govuk-modal-dialogue-close">x</button>
18
+ </div>
19
+ <div class="govuk-modal-dialogue__content">
20
+ <h2 class="govuk-modal-dialogue__heading govuk-heading-l" id="timeout-warning-modal-title">
21
+ <%= t('presenter.session_timeout_warning.heading') %>
22
+ </h2>
23
+ <div class="govuk-modal-dialogue__description govuk-body" id="timeout-warning-modal-description">
24
+ <div class="govuk-timeout-warning__timer" aria-hidden="true"></div>
25
+ <div class="govuk-timeout-warning__at-timer govuk-visually-hidden" role="status" id="at-timer"></div>
26
+ </div>
27
+ <button class="govuk-button dialog-button govuk" data-module="govuk-button" data-element="govuk-modal-dialogue-close"><%= t('presenter.session_timeout_warning.button') %></button>
28
+ </div>
29
+ </dialog>
30
+ </div>
31
+ <div class="govuk-modal-dialogue__backdrop"></div>
32
+ </div>
33
+ </div>
@@ -19,9 +19,17 @@ en:
19
19
  maintenance:
20
20
  maintenance_page_heading: 'Sorry, this form is unavailable'
21
21
  maintenance_page_content: "If you were in the middle of completing the form, your data has not been saved.\r\n\r\nThe form will be available again from 9am on Monday 19 November 2018.\r\n\r\n\r\n\r\n### Other ways to apply\r\n\r\nContact us if your application is urgent \r\n\r\nEmail: \r\nTelephone: \r\nMonday to Friday, 9am to 5pm \r\n[Find out about call charges](https://www.gov.uk/call-charges)"
22
+ session_timeout_warning:
23
+ heading: Your form will reset soon
24
+ timer: We will reset your form if you do not continue in
25
+ timer_fallback: We will reset your form if you do not complete the page and press continue by
26
+ timer_extra: Any answers you have entered so far will be cleared to protect your information.
27
+ redirect: You are about to be redirected
28
+ close_button: Close
29
+ button: Continue
22
30
  session_expired:
23
31
  title: Your form has been reset
24
- content: "To protect your personal information, we have reset the form and cleared your answers.\r\n\r\nThis is because you were inactive for 20 minutes."
32
+ content: "To protect your personal information, we have reset the form and cleared your answers.\r\n\r\nThis is because you were inactive for 30 minutes."
25
33
  restart_link: Start again
26
34
  confirmation:
27
35
  reference_number: 'Your reference number is:'
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '2.17.39'.freeze
2
+ VERSION = '2.17.40'.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.39
4
+ version: 2.17.40
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-16 00:00:00.000000000 Z
11
+ date: 2023-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder
@@ -357,6 +357,8 @@ files:
357
357
  - app/views/metadata_presenter/page/singlequestion.html.erb
358
358
  - app/views/metadata_presenter/page/standalone.html.erb
359
359
  - app/views/metadata_presenter/page/start.html.erb
360
+ - app/views/metadata_presenter/session/_timeout_fallback.html.erb
361
+ - app/views/metadata_presenter/session/_timeout_warning_modal.html.erb
360
362
  - app/views/metadata_presenter/session/expired.html.erb
361
363
  - config/initializers/default_metadata.rb
362
364
  - config/initializers/default_text.rb