metadata_presenter 3.3.9 → 3.3.10

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: 686438bb706d255bb141b89fe969fd8bc2a948221aca64973243806bb944d6ac
4
- data.tar.gz: f812f2ce0b2d47038fcfdb86d627d29a5b33eacaf7f435601b381bc58314b218
3
+ metadata.gz: 72f903ea69aac642330788eb582ca3ca0f23b6be19bb46675dd57e9c65435a9e
4
+ data.tar.gz: b937d1215881c6634dab4ac6844cc9f4a9d5e34bda404c8d71fc26d5800ffeea
5
5
  SHA512:
6
- metadata.gz: 9e1ca38299788d27690f79e36df3fb40cb770bfba680143989e0f0c5782c93de5d0787843298ab58429f6167c104ba77a7f793ae1a404b28efa4c4190a8dc813
7
- data.tar.gz: 93b4f74dc4150ac14fb05ce8714b0e78e9a8348e8fbd97f7530d24c96806e4a4b24c4386aa27389372dd2475c28edcd013085394eadf5b1ecf97c63516e517c7
6
+ metadata.gz: c4cb42cfa3147e7b5ba49fa4d847fdfe3af0a568851a525da702f080d08c03bbe8c0f94b01eacf6b5191c04d793a3051a47ecf19338095a35563a5f9d033cecf
7
+ data.tar.gz: ef5eb881fc90c4bc68057740d6caa4370a14c5328480044384b6ac7c582f0d49dc1acf32e04f61b9cc5f32f275de694485de210ca230df534137e2e7a0fe2440
@@ -50,6 +50,10 @@ module MetadataPresenter
50
50
  end
51
51
 
52
52
  def back_link
53
+ if use_external_start_page? && first_page?
54
+ return external_start_page_url
55
+ end
56
+
53
57
  previous_page = PreviousPage.new(
54
58
  service:,
55
59
  user_data: load_user_data,
@@ -1,8 +1,30 @@
1
1
  module MetadataPresenter
2
2
  class ServiceController < EngineController
3
3
  def start
4
+ if use_external_start_page?
5
+ return redirect_to_next_page
6
+ end
7
+
4
8
  @page = service.start_page
5
9
  render template: @page.template
6
10
  end
11
+
12
+ private
13
+
14
+ def redirect_to_next_page
15
+ next_page = NextPage.new(
16
+ service:,
17
+ session:,
18
+ user_data: reload_user_data,
19
+ current_page_url: service.start_page.url,
20
+ previous_answers: []
21
+ ).find
22
+
23
+ if next_page.present?
24
+ redirect_to_page next_page.url
25
+ else
26
+ not_found
27
+ end
28
+ end
7
29
  end
8
30
  end
@@ -0,0 +1,12 @@
1
+ <div class="govuk-notification-banner" role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
2
+ <div class="govuk-notification-banner__header">
3
+ <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
4
+ <%= I18n.t('presenter.external_start_page_info.important') %>
5
+ </h2>
6
+ </div>
7
+ <div class="govuk-notification-banner__content">
8
+ <p class="govuk-notification-banner__heading">
9
+ <%= I18n.t('presenter.external_start_page_info.content', href: govuk_link_to(I18n.t('presenter.external_start_page_info.link_text'), 'https://moj-forms.service.justice.gov.uk/building-and-editing/#start-page')).html_safe %>
10
+ </p>
11
+ </div>
12
+ </div>
@@ -28,10 +28,10 @@
28
28
  </div>
29
29
  <% if service.service_name.present? %>
30
30
  <div class="govuk-header__content">
31
- <a href="<%= root_path %>" class="govuk-header__link govuk-header__service-name">
31
+ <a href="<%= start_page_url %>" class="govuk-header__link govuk-header__service-name">
32
32
  <%= service.service_name %>
33
33
  </a>
34
+ </div>
34
35
  <% end %>
35
- </div>
36
36
  </div>
37
37
  </header>
@@ -1,6 +1,9 @@
1
1
  <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
2
2
  <div class="govuk-grid-row">
3
3
  <div class="govuk-grid-column-two-thirds">
4
+ <% if editor_preview? && use_external_start_page? && first_page? %>
5
+ <%= render 'metadata_presenter/attribute/external_start_page_info' %>
6
+ <% end %>
4
7
 
5
8
  <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
6
9
 
@@ -1,6 +1,9 @@
1
1
  <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
2
2
  <div class="govuk-grid-row">
3
3
  <div class="govuk-grid-column-two-thirds">
4
+ <% if editor_preview? && use_external_start_page? && first_page? %>
5
+ <%= render 'metadata_presenter/attribute/external_start_page_info' %>
6
+ <% end %>
4
7
 
5
8
  <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
6
9
 
@@ -2,6 +2,10 @@
2
2
  <div class="govuk-grid-row">
3
3
  <div class="govuk-grid-column-two-thirds">
4
4
 
5
+ <% if editor_preview? && use_external_start_page? && first_page? %>
6
+ <%= render 'metadata_presenter/attribute/external_start_page_info' %>
7
+ <% end %>
8
+
5
9
  <%= render 'metadata_presenter/attribute/section_heading' %>
6
10
 
7
11
  <%= form_for @page_answers, as: :answers, url: @page.url, method: :post, authenticity_token: false do |f| %>
@@ -17,6 +17,10 @@ en:
17
17
  rejected: rejected
18
18
  confirmation: You've %{action} analytics cookies.
19
19
  hide: Hide this message
20
+ external_start_page_info:
21
+ important: 'Important'
22
+ content: "Your form has a %{href}. Links to your form's 'home' page, such as your form's name in the header, will not work until the GOV.UK page has been published."
23
+ link_text: 'GOV.UK start page'
20
24
  maintenance:
21
25
  maintenance_page_heading: 'Sorry, this form is unavailable'
22
26
  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)"
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '3.3.9'.freeze
2
+ VERSION = '3.3.10'.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: 3.3.9
4
+ version: 3.3.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-01-23 00:00:00.000000000 Z
11
+ date: 2024-01-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder
@@ -426,6 +426,7 @@ files:
426
426
  - app/views/metadata_presenter/analytics/_ua.html.erb
427
427
  - app/views/metadata_presenter/analytics/analytics.html.erb
428
428
  - app/views/metadata_presenter/attribute/_body.html.erb
429
+ - app/views/metadata_presenter/attribute/_external_start_page_info.html.erb
429
430
  - app/views/metadata_presenter/attribute/_heading.html.erb
430
431
  - app/views/metadata_presenter/attribute/_lede.html.erb
431
432
  - app/views/metadata_presenter/attribute/_section_heading.html.erb