metadata_presenter 3.3.28 → 3.3.30

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 (14) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/metadata_presenter/engine_controller.rb +4 -0
  3. data/app/helpers/metadata_presenter/application_helper.rb +1 -1
  4. data/app/views/metadata_presenter/attribute/_heading.html.erb +4 -2
  5. data/app/views/metadata_presenter/component/_multiupload.html.erb +2 -2
  6. data/app/views/metadata_presenter/component/_upload.html.erb +1 -1
  7. data/app/views/metadata_presenter/page/checkanswers.html.erb +4 -2
  8. data/app/views/metadata_presenter/page/confirmation.html.erb +8 -6
  9. data/app/views/metadata_presenter/page/content.html.erb +4 -2
  10. data/app/views/metadata_presenter/page/exit.html.erb +4 -2
  11. data/app/views/metadata_presenter/page/multiplequestions.html.erb +1 -2
  12. data/app/views/metadata_presenter/page/singlequestion.html.erb +2 -3
  13. data/lib/metadata_presenter/version.rb +1 -1
  14. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8b4d904af9c3e0a5d4d9fc730f426242bf9bcd54f5200aeeb6fcedba69fe7182
4
- data.tar.gz: b9e2ba21c2fd43ccda2dcc52fa139482a4882acdeabab4e20d1dcac520408497
3
+ metadata.gz: 73a3d052b51c2e4c3df419fe6fd44fdd5e72767847b70914df09c24841ebc054
4
+ data.tar.gz: f90bfd09b7e27ce456499c8e1c232f6d57fc56cded38c4c13658134aff08ab4c
5
5
  SHA512:
6
- metadata.gz: 22ddccac4842f0c32a4e063d44a12792832259912ed3625302ef7d68abd519773c85c132fe586cf889261464b635ffc60630a33d820e466129089a7c5877cc88
7
- data.tar.gz: 622fdf7db6971a90c17c67365013ddec444066fa108108378fc4e68f7fefed966aefbeb04c2c07cb86f1216d29d2d04f469ca479d62b30c12e62ad9693288155
6
+ metadata.gz: 3c52b11d81bfa71f18bc0ea3e4db5bd21105b785f263df96e1d60b26b58f95a0f6725adce696de52677738d2c791be7f8ba39ced89148ec4308b6843af99c88f
7
+ data.tar.gz: '06796fe1e2157baa17b2757cb78e613901a9e91403a1535679b8013dfac60bc19d149eddc1761c077750a77f81cb84c4dfffd4e91e36ac3e7962e79a948371e1'
data/app/controllers/metadata_presenter/engine_controller.rb CHANGED
@@ -55,6 +55,10 @@ module MetadataPresenter
55
55
  end
56
56
 
57
57
  def back_link
58
+ if response.status == 404
59
+ @back_link = File.join(request.script_name, @page.url)
60
+ end
61
+
58
62
  if use_external_start_page? && first_page?
59
63
  return external_start_page_url
60
64
  end
data/app/helpers/metadata_presenter/application_helper.rb CHANGED
@@ -6,7 +6,7 @@ module MetadataPresenter
6
6
 
7
7
  def main_title(component:, tag: :h1, classes: 'govuk-heading-xl')
8
8
  content_tag(tag, class: classes) do
9
- component.humanised_title
9
+ content_tag(:span, component.humanised_title)
10
10
  end
11
11
  end
12
12
 
data/app/views/metadata_presenter/attribute/_heading.html.erb CHANGED
@@ -1,7 +1,9 @@
1
- <h1 class="fb-editable govuk-heading-xl"
1
+ <h1>
2
+ <span class="fb-editable govuk-heading-xl"
2
3
  data-fb-content-id="page[heading]"
3
4
  data-fb-content-type="element"
4
5
  data-fb-default-value="<%= default_page_title(@page.type) %>">
5
- <%= @page.heading %>
6
+ <%= @page.heading %>
7
+ </span>
6
8
  </h1>
7
9
 
data/app/views/metadata_presenter/component/_multiupload.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <legend class="govuk-heading-xl"><%= input_title %></legend>
1
+ <label><%= input_title %></label>
2
2
  <%= render 'metadata_presenter/attribute/body' %>
3
3
 
4
4
  <% if answered?(component.id) && @page_answers.send(component.id)[component.id].compact.count.positive? %>
@@ -28,7 +28,7 @@
28
28
  text: component.hint.present? ? component.hint : ''
29
29
  },
30
30
  accept: component.validation['accept'],
31
- disabled: editable?,
31
+ 'aria-disabled': editable?,
32
32
  label: -> do %>
33
33
  <% if answered?(component.id) && @page_answers.send(component.id)[component.id].compact.count.positive? && !editable? %>
34
34
  <h3 class="govuk-heading-s govuk-!-margin-top-8"><%= t('presenter.questions.multiupload.add_another') %></h3>
data/app/views/metadata_presenter/component/_upload.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <% if answered?(component.id) %>
2
- <h1 class="govuk-heading-xl"><%= input_title %></h1>
2
+ <%= input_title %>
3
3
  <span class="govuk-hint" id="answers-dog-picture-upload-1-hint" data-fb-default-text="<%= default_text('upload_hint') %>">
4
4
  <%= component.hint.present? ? component.hint : default_text('upload_hint') %>
5
5
  </span>
data/app/views/metadata_presenter/page/checkanswers.html.erb CHANGED
@@ -4,11 +4,13 @@
4
4
 
5
5
  <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
6
6
 
7
- <h1 class="fb-editable govuk-heading-xl"
7
+ <h1>
8
+ <span class="fb-editable govuk-heading-xl"
8
9
  data-fb-content-type="element"
9
10
  data-fb-content-id="page[heading]"
10
11
  data-fb-default-value="<%= default_page_title(@page.type) %>">
11
- <%= @page.heading %>
12
+ <%= @page.heading %>
13
+ </span>
12
14
  </h1>
13
15
 
14
16
  <%= form_for @page, url: reserved_submissions_path, authenticity_token: false, html: { id: 'answers-form' } do |f| %>
data/app/views/metadata_presenter/page/confirmation.html.erb CHANGED
@@ -8,15 +8,17 @@
8
8
  <% else %>
9
9
  <div class="govuk-panel govuk-panel--confirmation govuk-grid-column-two-thirds">
10
10
  <% end %>
11
- <h1 class="fb-editable govuk-panel__title"
11
+ <h1>
12
+ <span class="fb-editable govuk-panel__title"
12
13
  data-fb-content-type="element"
13
14
  data-fb-content-id="page[heading]"
14
15
  data-fb-default-value="<%= default_page_title(@page.type) %>">
15
- <% if payment_link_enabled? && @page.heading == I18n.t('presenter.confirmation.application_complete') %>
16
- <p><%= I18n.t('presenter.confirmation.payment_enabled') %></p>
17
- <% else %>
18
- <%= @page.heading %>
19
- <% end %>
16
+ <% if payment_link_enabled? && @page.heading == I18n.t('presenter.confirmation.application_complete') %>
17
+ <%= I18n.t('presenter.confirmation.payment_enabled') %>
18
+ <% else %>
19
+ <%= @page.heading %>
20
+ <% end %>
21
+ </span>
20
22
  </h1>
21
23
 
22
24
  <div class="govuk-panel__body">
data/app/views/metadata_presenter/page/content.html.erb CHANGED
@@ -9,11 +9,13 @@
9
9
 
10
10
  <%= render 'metadata_presenter/attribute/section_heading' %>
11
11
 
12
- <h1 class="fb-editable govuk-heading-xl"
12
+ <h1>
13
+ <span class="fb-editable govuk-heading-xl"
13
14
  data-fb-content-id="page[heading]"
14
15
  data-fb-content-type="element"
15
16
  data-fb-default-value="<%= default_page_title(@page.type) %>">
16
- <%= @page.heading %>
17
+ <%= @page.heading %>
18
+ </span>
17
19
  </h1>
18
20
 
19
21
  <%= render 'metadata_presenter/attribute/lede' %>
data/app/views/metadata_presenter/page/exit.html.erb CHANGED
@@ -6,11 +6,13 @@
6
6
 
7
7
  <%= render 'metadata_presenter/attribute/section_heading' %>
8
8
 
9
- <h1 class="fb-editable govuk-heading-xl"
9
+ <h1>
10
+ <span class="fb-editable govuk-heading-xl"
10
11
  data-fb-content-id="page[heading]"
11
12
  data-fb-content-type="element"
12
13
  data-fb-default-value="<%= default_page_title(@page.type) %>">
13
- <%= @page.heading %>
14
+ <%= @page.heading %>
15
+ </span>
14
16
  </h1>
15
17
 
16
18
  <%= render 'metadata_presenter/attribute/lede' %>
data/app/views/metadata_presenter/page/multiplequestions.html.erb CHANGED
@@ -25,8 +25,7 @@
25
25
  %>
26
26
 
27
27
  <div class="govuk-button-group">
28
- <%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
29
-
28
+ <%= f.govuk_submit(t('presenter.actions.continue'),'aria-disabled': editable?) %>
30
29
  <% if save_and_return_enabled? && show_save_and_return %>
31
30
  <% if editor_preview? || editable? %>
32
31
  <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
data/app/views/metadata_presenter/page/singlequestion.html.erb CHANGED
@@ -10,7 +10,7 @@
10
10
 
11
11
  <%= form_for @page_answers, as: :answers, url: @page.url, method: :post, authenticity_token: false do |f| %>
12
12
  <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
13
- <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
13
+ <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
14
14
  <% @page.components.each_with_index do |component, index| %>
15
15
  <div class="fb-editable"
16
16
  data-fb-content-type="<%= component._type %>"
@@ -27,8 +27,7 @@
27
27
  <% end %>
28
28
 
29
29
  <div class="govuk-button-group">
30
- <%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
31
-
30
+ <%= f.govuk_submit(t('presenter.actions.continue'), 'aria-disabled': editable?) %>
32
31
  <% if save_and_return_enabled? && show_save_and_return %>
33
32
  <% if editor_preview? || editable? %>
34
33
  <%= button_to t('presenter.save_and_return.actions.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
data/lib/metadata_presenter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '3.3.28'.freeze
2
+ VERSION = '3.3.30'.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.28
4
+ version: 3.3.30
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-03-26 00:00:00.000000000 Z
11
+ date: 2024-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder