metadata_presenter 0.13.2 → 0.13.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/metadata_presenter/engine_controller.rb +3 -1
  3. data/app/presenters/metadata_presenter/page_answers_presenter.rb +1 -1
  4. data/app/validators/metadata_presenter/base_validator.rb +1 -6
  5. data/app/views/metadata_presenter/component/_checkboxes.html.erb +2 -1
  6. data/app/views/metadata_presenter/component/_text.html.erb +8 -6
  7. data/app/views/metadata_presenter/header/show.html.erb +1 -1
  8. data/app/views/metadata_presenter/page/singlequestion.html.erb +2 -1
  9. data/app/views/metadata_presenter/page/start.html.erb +22 -12
  10. data/lib/metadata_presenter/version.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 25eab7ae4724a7b0efc235808753ec4d66b966c6d9d36aefea3938839d6a18fb
4
- data.tar.gz: 548f0e1c5784f72a48f29ff2555f2ed41e77deb704037f33d6ab9042b08de25a
3
+ metadata.gz: 1a03324e5fcda2cc6e240abf9de25153de6d3420df67c756616e28f3ae1d645b
4
+ data.tar.gz: 865b8c040daa4e3d80a83a64131b1e5e57c3a720d99c94dc325b121453ca33df
5
5
  SHA512:
6
- metadata.gz: 1d33a47191c80f198c2c2318ae690b469398459d37e329667c5f81b0f857ecfa277f5f8ac797e18e2df94951dd43be551b63f9037137566e30b996e18bd1c15c
7
- data.tar.gz: c9cdc90d35ce14f61f7afb9102fe39119dd84abdd4189a9f076aab5bf6bb861f4cc91bc841000718ae6184363d48a721b0fc3fe7b603baa4be46e99c8ccb9c26
6
+ metadata.gz: de3122090686c934774b46f29b0db345984681d282c0be662ccf3bd8f8ccb6a8f38dcd5d7660e8b11221b6d617176339aa825eadde59bcf8396e2de8ef8787d9
7
+ data.tar.gz: ced8509a65f415a2c0e65378ad3ca880d142e526f8c1ab44e2af6e2f45a2f497ee26d09e6a8037e556b724f8adc6589f1a06a2fdb11a163b25ad706d1f821955
data/app/controllers/metadata_presenter/engine_controller.rb CHANGED
@@ -8,7 +8,9 @@ module MetadataPresenter
8
8
  def back_link
9
9
  return if @page.blank?
10
10
 
11
- @back_link ||= service.previous_page(current_page: @page)&.url
11
+ previous_page = service.previous_page(current_page: @page)&.url
12
+
13
+ @back_link ||= File.join(request.script_name, previous_page) if previous_page
12
14
  end
13
15
  helper_method :back_link
14
16
 
data/app/presenters/metadata_presenter/page_answers_presenter.rb CHANGED
@@ -51,7 +51,7 @@ module MetadataPresenter
51
51
  end
52
52
 
53
53
  def checkboxes(value)
54
- value.reject(&:blank?).join("<br>").html_safe
54
+ value.join("<br>").html_safe
55
55
  end
56
56
  end
57
57
  end
data/app/validators/metadata_presenter/base_validator.rb CHANGED
@@ -63,12 +63,7 @@ module MetadataPresenter
63
63
  # @return [String] user answer for the specific component
64
64
  #
65
65
  def user_answer
66
- value = page_answers.send(component.name)
67
- if component.type == 'checkboxes'
68
- Array(value).reject(&:blank?)
69
- else
70
- value
71
- end
66
+ page_answers.send(component.name)
72
67
  end
73
68
 
74
69
  # The default error message will be look using the schema key.
data/app/views/metadata_presenter/component/_checkboxes.html.erb CHANGED
@@ -5,5 +5,6 @@
5
5
  :name,
6
6
  :description,
7
7
  legend: { text: input_title },
8
- hint: { text: component.hint }
8
+ hint: { text: component.hint },
9
+ include_hidden: false
9
10
  %>
data/app/views/metadata_presenter/component/_text.html.erb CHANGED
@@ -1,6 +1,8 @@
1
- <%=
2
- f.govuk_text_field component.id.to_sym,
3
- label: { text: input_title },
4
- hint: { text: component.hint },
5
- name: "answers[#{component.name}]"
6
- %>
1
+ <div class="fb-editable" data-fb-content-type="<%= component._type %>" data-fb-content-id="<%= component_id %>" data-fb-content-data="<%= component.to_json %>">
2
+ <%=
3
+ f.govuk_text_field component.id.to_sym,
4
+ label: { text: input_title },
5
+ hint: { text: component.hint },
6
+ name: "answers[#{component.name}]"
7
+ %>
8
+ </div>
data/app/views/metadata_presenter/header/show.html.erb CHANGED
@@ -26,7 +26,7 @@
26
26
  </div>
27
27
  <% if service.service_name.present? %>
28
28
  <div class="govuk-header__content">
29
- <a href="/" class="govuk-header__link govuk-header__link--service-name">
29
+ <a href="<%= root_path %>" class="govuk-header__link govuk-header__link--service-name">
30
30
  <%= service.service_name %>
31
31
  </a>
32
32
  <% end %>
data/app/views/metadata_presenter/page/singlequestion.html.erb CHANGED
@@ -3,9 +3,10 @@
3
3
  <div class="govuk-grid-column-two-thirds">
4
4
  <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
5
5
  <%= f.govuk_error_summary %>
6
- <% @page.components.each do |component| %>
6
+ <% @page.components.each_with_index do |component, index| %>
7
7
  <%= render partial: component, locals: {
8
8
  component: component,
9
+ component_id: "page[components[#{index}]]",
9
10
  f: f,
10
11
  input_title: main_h1(component) }
11
12
  %>
data/app/views/metadata_presenter/page/start.html.erb CHANGED
@@ -1,33 +1,41 @@
1
- <div class="fb-main-grid-wrapper" data-block-id="<%= @page.id %>" data-block-type="page" data-block-pagetype="<%= @page.type %>">
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
4
  <% if @page.section_heading -%>
5
- <p class="govuk-caption-l fb-section_heading" data-block-id="<%= @page.id %>" data-block-property="section_heading">
5
+ <p class="fb-editable govuk-caption-l fb-section_heading"
6
+ data-fb-content-type="element"
7
+ data-fb-content-id="page[section_heading]">
6
8
  <%= @page.section_heading.html_safe %>
7
9
  </p>
8
10
  <%- end %>
9
11
 
10
12
  <% if @page.heading %>
11
- <h1 class="<%= @page.heading_class %>" data-block-id="<%= @page.id %>" data-block-property="heading">
13
+ <h1 class="fb-editable <%= @page.heading_class %>"
14
+ data-fb-content-id="page[heading]"
15
+ data-fb-content-type="element">
12
16
  <%= @page.heading.html_safe %>
13
17
  </h1>
14
18
  <% end %>
15
19
 
16
20
  <% if @page.lede %>
17
- <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="lede">
21
+ <div class="fb-editable"
22
+ data-fb-content-id="page[lede]"
23
+ data-fb-content-type="content">
18
24
  <%= @page.lede.html_safe %>
19
- </p>
25
+ </div>
20
26
  <%- end %>
21
27
 
22
28
  <% if @page.body %>
23
- <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="lede">
24
- <%= to_markdown(@page.body) %>
25
- </p>
29
+ <div class="fb-editable"
30
+ data-fb-content-id="page[body]"
31
+ data-fb-content-type="content">
32
+ <%= to_markdown(@page.body) %>
33
+ </div>
26
34
  <%- end %>
27
35
 
28
36
  <%= form_tag(root_path, method: :post) do %>
29
37
  <button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
30
- Start
38
+ Start now
31
39
  <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
32
40
  <path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z" />
33
41
  </svg>
@@ -35,9 +43,11 @@
35
43
  <% end %>
36
44
 
37
45
  <% if @page.before_you_start %>
38
- <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="before-you-start">
39
- <%= to_markdown(@page.before_you_start) %>
40
- </p>
46
+ <div class="fb-editable"
47
+ data-fb-content-id="page[before_you_start]"
48
+ data-fb-content-type="content">
49
+ <%= to_markdown(@page.before_you_start) %>
50
+ </div>
41
51
  <%- end %>
42
52
  </div>
43
53
  </div>
data/lib/metadata_presenter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '0.13.2'
2
+ VERSION = '0.13.7'
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: 0.13.2
4
+ version: 0.13.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Online
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-02-16 00:00:00.000000000 Z
11
+ date: 2021-02-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails