metadata_presenter 0.26.0 → 0.27.3

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e140ce8ae2fc9716782e590e01fd314e68635b38c7e64692dcd936bd0bc7b9c2
4
- data.tar.gz: 3bd91d0686e5f698c8040e49eac6cd9c6faf220d2d15acabc219429a901886c5
3
+ metadata.gz: 027ea2efffbb85068abc14cb2ba4ff016aa92f7d32052a29689e1e5a0f38e315
4
+ data.tar.gz: 77b4685de4e43230b2c42b716f318d19e0352dea1b9ffa7e13f36f3a55501b54
5
5
  SHA512:
6
- metadata.gz: c86ebe1d8bbf50e71f90eba4ddc6217214b9d2726686263e9e1da83f677e4523d09abe89e05a63f4009abbc5e4e79cd61f7905d5502ae92299ab6e52f4d489a1
7
- data.tar.gz: 8c9ba57695e37e30a33d54650f0e6b7dfe05acd56738a118db8e2b50c0d3c1cd1a5644de7a9f1a5c7e378c15483c6ec4afddd3ce092987f998931a4e76a9990c
6
+ metadata.gz: d19d3e0d29083c44dc3efda1c631b0e949d78e865b112c97601acf71590e6e376b0f9324d92d35dd39dcf0866a9552fd0609025ce344570f344926c0aa4a4ea4
7
+ data.tar.gz: 18426551b21ebca783e364ad645bfef4b9dcf1a94a868e35d73c549535efbf30e77d571f8ac94919fae4c34804be16c84fe8642f6a6e5fa7514140979845070c
@@ -6,15 +6,14 @@ module MetadataPresenter
6
6
  end
7
7
  end
8
8
 
9
- # Renders markdown given a text.
9
+ # Renders html given markdown.
10
10
  #
11
11
  # @example
12
- # <%=m '# Some markdown' %>
12
+ # <%=to_html '# Some markdown' %>
13
13
  #
14
- def m(text)
14
+ def to_html(text)
15
15
  Kramdown::Document.new(text).to_html.html_safe
16
16
  end
17
- alias_method :to_markdown, :m
18
17
 
19
18
  def default_text(property)
20
19
  MetadataPresenter::DefaultText[property]
@@ -3,6 +3,6 @@
3
3
  data-fb-content-id="page[body]"
4
4
  data-fb-content-type="content"
5
5
  data-fb-default-text="<%= default_text('body') %>">
6
- <%= to_markdown(@page.body) %>
6
+ <%= to_html(@page.body) %>
7
7
  </div>
8
8
  <%- end %>
@@ -1,7 +1,5 @@
1
- <% if @page.heading %>
2
- <h1 class="fb-editable govuk-heading-xl"
3
- data-fb-content-id="page[heading]"
4
- data-fb-content-type="element">
5
- <%= @page.heading %>
6
- </h1>
7
- <%- end %>
1
+ <h1 class="fb-editable govuk-heading-xl"
2
+ data-fb-content-id="page[heading]"
3
+ data-fb-content-type="element">
4
+ <%= @page.heading %>
5
+ </h1>
@@ -18,23 +18,3 @@
18
18
  %>
19
19
  </div>
20
20
  <% end %>
21
-
22
- <% if editable? %>
23
- <ul class="component-activated-menu govuk-navigation editor-button govuk-button fb-govuk-button">
24
- <% if input_components.present? %>
25
- <ul>
26
- <% input_components.each do |component| %>
27
- <li><a href="#add-input-component" data-component-type="<%= component %>"></a>+ Add <%= component %> component</li>
28
- <% end %>
29
- </ul>
30
- <% end %>
31
-
32
- <% if content_components.present? %>
33
- <ul>
34
- <% content_components.each do |component| %>
35
- <li><a href="#add-content-component" data-component-type="<%= component %>">+ Add <%= component %> component</a></li>
36
- <% end %>
37
- </ul>
38
- <% end %>
39
- </ul>
40
- <% end %>
@@ -1 +1 @@
1
- <%= to_markdown(component.html) %>
1
+ <%= to_html(component.content) %>
@@ -1,82 +1,80 @@
1
- <div class="govuk-grid-row">
2
- <div class="govuk-grid-column-two-thirds">
1
+ <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
2
+ <div class="govuk-grid-row">
3
+ <div class="govuk-grid-column-two-thirds">
3
4
 
4
- <%= render partial: 'metadata_presenter/attribute/section_heading' %>
5
+ <%= render partial: 'metadata_presenter/attribute/section_heading' %>
5
6
 
6
- <% if @page.heading.present? %>
7
7
  <h1 class="fb-editable govuk-heading-xl"
8
8
  data-fb-content-type="element"
9
9
  data-fb-content-id="page[heading]">
10
10
  <%= @page.heading %>
11
11
  </h1>
12
- <% end %>
13
12
 
14
- <%= form_for @page, url: reserved_submissions_path do |f| %>
13
+ <%= form_for @page, url: reserved_submissions_path do |f| %>
15
14
 
16
- <%= render partial: 'metadata_presenter/component/components',
17
- locals: {
18
- f: f,
19
- components: @page.extra_components,
20
- tag: nil,
21
- classes: nil,
22
- input_components: @page.input_components,
23
- content_components: @page.content_components
24
- } %>
15
+ <%= render partial: 'metadata_presenter/component/components',
16
+ locals: {
17
+ f: f,
18
+ components: @page.extra_components,
19
+ tag: nil,
20
+ classes: nil,
21
+ input_components: @page.input_components,
22
+ content_components: @page.content_components
23
+ } %>
25
24
 
26
- <div data-block-id="page.checkanswers.answers" data-block-type="answers">
27
- <dl class="fb-block fb-block-answers govuk-summary-list">
28
- <% pages_presenters.each do |page_answers_presenters| %>
29
- <% page_answers_presenters.each_with_index do |page_answers_presenter, index| %>
25
+ <div data-block-id="page.checkanswers.answers" data-block-type="answers">
26
+ <dl class="fb-block fb-block-answers govuk-summary-list">
27
+ <% pages_presenters.each do |page_answers_presenters| %>
28
+ <% page_answers_presenters.each_with_index do |page_answers_presenter, index| %>
30
29
 
31
- <% if page_answers_presenter.display_heading?(index) %>
32
- </dl>
30
+ <% if page_answers_presenter.display_heading?(index) %>
31
+ </dl>
33
32
 
34
- <h3 class="govuk-heading-m"><%= page_answers_presenter.page.heading %></h3>
33
+ <h3 class="govuk-heading-m"><%= page_answers_presenter.page.heading %></h3>
35
34
 
36
- <dl class="fb-block fb-block-answers govuk-summary-list">
37
- <% end %>
35
+ <dl class="fb-block fb-block-answers govuk-summary-list">
36
+ <% end %>
38
37
 
39
- <div class="govuk-summary-list__row">
40
- <dt class="govuk-summary-list__key">
41
- <%= page_answers_presenter.humanised_title %>
42
- </dt>
38
+ <div class="govuk-summary-list__row">
39
+ <dt class="govuk-summary-list__key">
40
+ <%= page_answers_presenter.humanised_title %>
41
+ </dt>
43
42
 
44
- <dd class="govuk-summary-list__value">
45
- <%= page_answers_presenter.answer %>
46
- </dd>
47
- <dd class="govuk-summary-list__actions">
48
- <%= link_to(
49
- change_answer_path(url: page_answers_presenter.url),
50
- class: 'govuk-link'
51
- ) do %>
52
- Change<span class="govuk-visually-hidden"> Your answer for <%= page_answers_presenter.humanised_title %></span>
53
- <% end %>
54
- </a>
55
- </dd>
56
- </div>
43
+ <dd class="govuk-summary-list__value">
44
+ <%= page_answers_presenter.answer %>
45
+ </dd>
46
+ <dd class="govuk-summary-list__actions">
47
+ <%= link_to(
48
+ change_answer_path(url: page_answers_presenter.url),
49
+ class: 'govuk-link'
50
+ ) do %>
51
+ Change<span class="govuk-visually-hidden"> Your answer for <%= page_answers_presenter.humanised_title %></span>
52
+ <% end %>
53
+ </dd>
54
+ </div>
55
+ <% end %>
57
56
  <% end %>
58
- <% end %>
59
- </dl>
60
- </div>
57
+ </dl>
58
+ </div>
61
59
 
62
- <% if @page.send_heading.present? %>
63
- <h2 class="fb-send-heading fb-editable govuk-heading-m"
64
- data-fb-content-type="element"
65
- data-fb-content-id="page[send_heading]">
66
- <%= @page.send_heading %>
67
- </h2>
68
- <% end %>
60
+ <% if @page.send_heading.present? %>
61
+ <h2 class="fb-send-heading fb-editable govuk-heading-m"
62
+ data-fb-content-type="element"
63
+ data-fb-content-id="page[send_heading]">
64
+ <%= @page.send_heading %>
65
+ </h2>
66
+ <% end %>
69
67
 
70
- <% if @page.send_body.present? %>
71
- <div class="fb-send-body fb-editable"
72
- data-fb-content-type="content"
73
- data-fb-content-id="page[send_body]">
74
- <%= @page.send_body %>
75
- </div>
76
- <% end %>
68
+ <% if @page.send_body.present? %>
69
+ <div class="fb-send-body fb-editable"
70
+ data-fb-content-type="content"
71
+ data-fb-content-id="page[send_body]">
72
+ <%= @page.send_body %>
73
+ </div>
74
+ <% end %>
77
75
 
78
- <%= render partial: 'metadata_presenter/component/components',
79
- locals: {
76
+ <%= render partial: 'metadata_presenter/component/components',
77
+ locals: {
80
78
  f: f,
81
79
  components: @page.components,
82
80
  tag: nil,
@@ -85,9 +83,11 @@
85
83
  content_components: @page.content_components
86
84
  } %>
87
85
 
88
- <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">
86
+ <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">
89
87
  Accept and send application
90
- </button>
91
- <% end %>
88
+ </button>
89
+ <% end %>
90
+
91
+ </div>
92
92
  </div>
93
93
  </div>
@@ -1,21 +1,22 @@
1
- <div class="govuk-panel govuk-panel--confirmation" data-block-id="<%= @page.id %>" data-block-property="heading" data-block-property-class="govuk-panel__body:lede">
2
- <h1 class="fb-editable govuk-panel__title"
3
- data-fb-content-type="element"
4
- data-fb-content-id="page[heading]">
5
- <%= @page.heading %>
6
- </h1>
1
+ <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
2
+ <div class="govuk-panel govuk-panel--confirmation">
3
+ <h1 class="fb-editable govuk-panel__title"
4
+ data-fb-content-type="element"
5
+ data-fb-content-id="page[heading]">
6
+ <%= @page.heading %>
7
+ </h1>
7
8
 
8
- <%= render 'metadata_presenter/attribute/lede' %>
9
- </div>
9
+ <%= render 'metadata_presenter/attribute/lede' %>
10
+ </div>
10
11
 
11
- <div class="govuk-grid-row">
12
- <div class="govuk-grid-column-two-thirds">
13
- <%= render 'metadata_presenter/attribute/body' %>
12
+ <div class="govuk-grid-row">
13
+ <div class="govuk-grid-column-two-thirds">
14
+ <%= render 'metadata_presenter/attribute/body' %>
15
+ </div>
14
16
  </div>
15
- </div>
16
17
 
17
- <%= render partial: 'metadata_presenter/component/components',
18
- locals: {
18
+ <%= render partial: 'metadata_presenter/component/components',
19
+ locals: {
19
20
  f: nil,
20
21
  components: @page.components,
21
22
  tag: nil,
@@ -23,3 +24,4 @@
23
24
  input_components: @page.input_components,
24
25
  content_components: @page.content_components
25
26
  } %>
27
+ </div>
@@ -4,16 +4,13 @@
4
4
 
5
5
  <%= render 'metadata_presenter/attribute/section_heading' %>
6
6
 
7
- <% if @page.heading %>
8
- <h1 class="fb-editable govuk-heading-xl"
9
- data-fb-content-id="page[heading]"
10
- data-fb-content-type="element">
11
- <%= @page.heading %>
12
- </h1>
13
- <% end %>
14
-
7
+ <h1 class="fb-editable govuk-heading-xl"
8
+ data-fb-content-id="page[heading]"
9
+ data-fb-content-type="element">
10
+ <%= @page.heading %>
11
+ </h1>
12
+
15
13
  <%= render 'metadata_presenter/attribute/lede' %>
16
-
17
14
  <%= render 'metadata_presenter/attribute/body' %>
18
15
 
19
16
  <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
@@ -1,9 +1,9 @@
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.body %>
5
5
  <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="body">
6
- <%= to_markdown(@page.body) %>
6
+ <%= to_html(@page.body) %>
7
7
  </p>
8
8
  <%- end %>
9
9
  <%= form_tag(reserved_answers_path, method: :post) do %>
@@ -1,4 +1,4 @@
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
 
@@ -1,4 +1,4 @@
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
  <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
@@ -20,7 +20,7 @@
20
20
  <div class="fb-editable"
21
21
  data-fb-content-id="page[before_you_start]"
22
22
  data-fb-content-type="content">
23
- <%= to_markdown(@page.before_you_start) %>
23
+ <%= to_html(@page.before_you_start) %>
24
24
  </div>
25
25
  <%- end %>
26
26
  </div>
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "_id": "component.content",
3
3
  "_type": "content",
4
- "html": "[Optional content]"
4
+ "content": "[Optional content]"
5
5
  }
@@ -2,6 +2,8 @@
2
2
  "section_heading": "[Optional section heading]",
3
3
  "lede": "[Optional lede paragraph]",
4
4
  "body": "[Optional content]",
5
- "html": "[Optional content]",
6
- "hint": "[Optional hint text]"
5
+ "content": "[Optional content]",
6
+ "hint": "[Optional hint text]",
7
+ "option": "[Required option text]",
8
+ "option_hint": "[Optional hint text]"
7
9
  }
@@ -330,7 +330,7 @@
330
330
  {
331
331
  "_id": "how-many-lights_content_1",
332
332
  "_type": "content",
333
- "html": "What lights?"
333
+ "content": "What lights?"
334
334
  }
335
335
  ],
336
336
  "url": "how-many-lights"
@@ -348,7 +348,7 @@
348
348
  {
349
349
  "_id": "check-answers_content_1",
350
350
  "_type": "content",
351
- "html": "Check yourself before you wreck yourself."
351
+ "content": "Check yourself before you wreck yourself."
352
352
  }
353
353
  ],
354
354
  "extra_components": []
@@ -365,7 +365,7 @@
365
365
  {
366
366
  "_id": "confirmation_content_1",
367
367
  "_type": "content",
368
- "html": "Some day I will be the most powerful Jedi ever!"
368
+ "content": "Some day I will be the most powerful Jedi ever!"
369
369
  }
370
370
  ]
371
371
  }
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '0.26.0'.freeze
2
+ VERSION = '0.27.3'.freeze
3
3
  end
@@ -11,7 +11,7 @@
11
11
  "_type": {
12
12
  "const": "content"
13
13
  },
14
- "html": {
14
+ "content": {
15
15
  "title": "Content",
16
16
  "description": "Content to display - use [markdown](https://www.gov.uk/guidance/how-to-publish-on-gov-uk/markdown) to format text or add hyperlinks",
17
17
  "type": "string",
@@ -25,6 +25,6 @@
25
25
  }
26
26
  ],
27
27
  "required": [
28
- "html"
28
+ "content"
29
29
  ]
30
30
  }
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.26.0
4
+ version: 0.27.3
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-04-01 00:00:00.000000000 Z
11
+ date: 2021-04-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder