metadata_presenter 3.3.32 → 3.3.34
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 +4 -4
- data/app/views/metadata_presenter/attribute/_body.html.erb +3 -1
- data/app/views/metadata_presenter/component/_multiupload.html.erb +2 -2
- data/app/views/metadata_presenter/page/checkanswers.html.erb +8 -5
- data/app/views/metadata_presenter/page/confirmation.html.erb +0 -2
- data/app/views/metadata_presenter/page/content.html.erb +1 -1
- data/app/views/metadata_presenter/page/standalone.html.erb +2 -1
- data/app/views/metadata_presenter/page/start.html.erb +1 -1
- data/config/locales/cy.yml +9 -9
- data/default_metadata/page/start.json +6 -6
- data/default_metadata/string/error.pattern.json +2 -2
- data/lib/metadata_presenter/version.rb +1 -1
- metadata +2 -16
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c8518bc2fca3d0f5fec907a7b15c8eb032fc8c33e079809e778713765841010e
|
|
4
|
+
data.tar.gz: 2d27dcca2327531e0ecf8da4208cffc6456d96a91ab0d1ff71d2ec92032bb305
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c0d26fc240f57980e3282c9a7d4d30ba3e76abc121fde1139f64aa3159b5df8f4e82105df6141dc1f3d783a2091d4a4f0f5d0ae93b75e66d79ddc39048442bd4
|
|
7
|
+
data.tar.gz: 8cd9283fd1b7f93ab1bb51db351b84df694c3a9e23e0f98a50c22a652eca8cc18eba19d3d81548649f7af4385700f222ef22014b07c2d1915710e1abc34384dd
|
|
@@ -4,7 +4,9 @@
|
|
|
4
4
|
type="content"
|
|
5
5
|
default-content="<%= default_text('body') %>"
|
|
6
6
|
content="<%= page_body_content %>"
|
|
7
|
-
data-fb-content-id="<%= "page[body]" %>"
|
|
7
|
+
data-fb-content-id="<%= "page[body]" %>"
|
|
8
|
+
data-editor-label-key="aria.optional_content_label"
|
|
9
|
+
data-editor-description-key="aria.optional_content_description">
|
|
8
10
|
<div class="html">
|
|
9
11
|
<%= to_html(page_body_content) %>
|
|
10
12
|
</div>
|
|
@@ -31,9 +31,9 @@
|
|
|
31
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
|
+
<h2 class="govuk-heading-s govuk-!-margin-top-8"><%= t('presenter.questions.multiupload.add_another') %></h2>
|
|
35
35
|
<% else %>
|
|
36
|
-
<
|
|
36
|
+
<h2 class="govuk-visually-hidden"><%= t('presenter.questions.multiupload.add_another') %></h2>
|
|
37
37
|
<% end %>
|
|
38
38
|
<% end %>
|
|
39
39
|
</div>
|
|
@@ -65,10 +65,12 @@
|
|
|
65
65
|
</dl>
|
|
66
66
|
|
|
67
67
|
<% if @page.send_heading.present? %>
|
|
68
|
-
<h2
|
|
68
|
+
<h2>
|
|
69
|
+
<span class="fb-send-heading fb-editable govuk-heading-m"
|
|
69
70
|
data-fb-content-type="element"
|
|
70
71
|
data-fb-content-id="page[send_heading]">
|
|
71
|
-
|
|
72
|
+
<%= @page.send_heading %>
|
|
73
|
+
</span>
|
|
72
74
|
</h2>
|
|
73
75
|
<% end %>
|
|
74
76
|
|
|
@@ -102,9 +104,10 @@
|
|
|
102
104
|
<%end%>
|
|
103
105
|
<br><br>
|
|
104
106
|
<div class="govuk-button-group">
|
|
105
|
-
<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">
|
|
106
|
-
<%= t('presenter.actions.submit')
|
|
107
|
-
|
|
107
|
+
<button <%= 'aria-disabled=true' 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">
|
|
108
|
+
<%= t('presenter.actions.submit') -%>
|
|
109
|
+
</button>
|
|
110
|
+
<% if save_and_return_enabled? %>
|
|
108
111
|
<% if editor_preview? || editable? %>
|
|
109
112
|
<%= 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_check_answers', disabled: true %>
|
|
110
113
|
<% else %>
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
} %>
|
|
39
39
|
|
|
40
40
|
<div class="govuk-button-group">
|
|
41
|
-
<%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
|
|
41
|
+
<%= f.govuk_submit(t('presenter.actions.continue'), 'aria-disabled': editable?) %>
|
|
42
42
|
<% if save_and_return_enabled? %>
|
|
43
43
|
<% if editor_preview? || editable? %>
|
|
44
44
|
<%= 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 %>
|
|
@@ -29,11 +29,12 @@
|
|
|
29
29
|
<% end %>
|
|
30
30
|
<%# ORIGINAL TEMPLATE: Uses content from form metadata %>
|
|
31
31
|
<% if @page.heading %>
|
|
32
|
-
<h1 class="fb-editable govuk-heading-xl"
|
|
32
|
+
<h1> <span class="fb-editable govuk-heading-xl"
|
|
33
33
|
data-fb-content-id="page[heading]"
|
|
34
34
|
data-fb-content-type="element"
|
|
35
35
|
data-fb-default-value="<%= t("presenter.footer.#{@page.id.gsub('page.','')}.heading") %>">
|
|
36
36
|
<%= @page.heading %>
|
|
37
|
+
</span>
|
|
37
38
|
</h1>
|
|
38
39
|
<% end %>
|
|
39
40
|
<%= render 'metadata_presenter/attribute/body' %>
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
|
|
8
8
|
<%= form_tag(root_path, method: :post, authenticity_token: false) do %>
|
|
9
9
|
<%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
|
|
10
|
-
<button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
|
|
10
|
+
<button <%= 'aria-disabled=true' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
|
|
11
11
|
<%= t('presenter.actions.start') -%>
|
|
12
12
|
<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">
|
|
13
13
|
<path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z" />
|
data/config/locales/cy.yml
CHANGED
|
@@ -14,7 +14,7 @@ cy:
|
|
|
14
14
|
start: Dechrau nawr
|
|
15
15
|
continue: Parhau
|
|
16
16
|
submit: Cyflwyno
|
|
17
|
-
sign_in:
|
|
17
|
+
sign_in: Mewngofnodi
|
|
18
18
|
upload_options: Llwytho opsiynau
|
|
19
19
|
change_html: Newid <span class="govuk-visually-hidden">eich ateb ar gyfer %{question}</span>
|
|
20
20
|
errors:
|
|
@@ -40,12 +40,12 @@ cy:
|
|
|
40
40
|
maintenance_page_heading: Mae’n ddrwg gennym, nid yw’r ffurflen hon ar gael
|
|
41
41
|
maintenance_page_content: "Os oeddech chi yng nghanol llenwi’r ffurflen, nid yw eich data wedi’i chadw.\r\n\r\nBydd y ffurflen ar gael eto o 9am ar ddydd Llun 19 Tachwedd.\r\n\r\n\r\n\r\n### Other ways to apply\r\n\r\nCysylltwch â ni os yw eich cais yn frys \r\n\r\nEmail: \r\nTelephone: \r\nDydd Llun i ddydd Gwener, 9am i 5pm \r\n[Gwybodaeth am gost galwadau](https://www.gov.uk/costau-galwadau)"
|
|
42
42
|
authorisation:
|
|
43
|
-
heading:
|
|
44
|
-
lede:
|
|
45
|
-
warning:
|
|
43
|
+
heading: Mewngofnodi
|
|
44
|
+
lede: Mae gan y ffurflen hon ei henw defnyddiwr a’i chyfrinair ei hun. Cysylltwch â pherchennog y ffurflen os nad ydych yn siŵr beth yw’r rhain.
|
|
45
|
+
warning: Fersiwn Brawf o’r ffurflen yw hon ac ni ddylid ei rhannu heb ganiatâd perchennog y ffurflen.
|
|
46
46
|
labels:
|
|
47
|
-
username:
|
|
48
|
-
password:
|
|
47
|
+
username: Enw defnyddiwr
|
|
48
|
+
password: Cyfrinair
|
|
49
49
|
session_timeout_warning:
|
|
50
50
|
heading: Ydych chi eisiau mwy o amser?
|
|
51
51
|
timer: Byddwn yn ailosod eich ffurflen ac yn dileu eich gwybodaeth os na fyddwch yn parhau mewn
|
|
@@ -181,11 +181,11 @@ cy:
|
|
|
181
181
|
metadata_presenter/auth_form:
|
|
182
182
|
attributes:
|
|
183
183
|
base:
|
|
184
|
-
unauthorised:
|
|
184
|
+
unauthorised: Nid yw’r enw defnyddiwr a’r cyfrinair yn cyfateb. Rhowch gynnig arall arni
|
|
185
185
|
username:
|
|
186
|
-
blank:
|
|
186
|
+
blank: Rhowch enw defnyddiwr
|
|
187
187
|
password:
|
|
188
|
-
blank:
|
|
188
|
+
blank: Rhowch gyfrinair
|
|
189
189
|
attributes:
|
|
190
190
|
metadata_presenter/saved_form:
|
|
191
191
|
secret_question: Cwestiwn cudd
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
2
|
+
"_id": "page.start",
|
|
3
|
+
"_type": "page.start",
|
|
4
|
+
"heading": "Service name goes here",
|
|
5
|
+
"body": "Use this service to apply for a service or contact us about a case.\r\n\r\n## Before you start\r\nYou will need:\r\n\r\n* your 8-digit reference number\r\n* a copy of your photo ID\r\n* something else\r\n\r\nThis form will take around 5 minutes to complete. We will reply within 10 working days.",
|
|
6
|
+
"before_you_start": "## Other ways to get in touch\r\nYou can also apply or contact us about your case by:\r\n\r\n* telephone: 01234 567889\r\n* email: <example.service@justice.gov.uk>\r\n\r\nThis form is also [available in Welsh (Cymraeg)](https://example-service.form.service.justice.gov.uk/).",
|
|
7
|
+
"url": "/"
|
|
8
8
|
}
|
|
@@ -3,5 +3,5 @@
|
|
|
3
3
|
"_type": "string.error",
|
|
4
4
|
"description": "Input (string) does not match with the regular expression",
|
|
5
5
|
"value:en": "Your answer for \"%{control}\" must match the required format",
|
|
6
|
-
"value:cy": "
|
|
7
|
-
}
|
|
6
|
+
"value:cy": "Rhaid i’ch ateb ar gyfer \"%{control}\" gyfateb i’r fformat gofynnol"
|
|
7
|
+
}
|
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.
|
|
4
|
+
version: 3.3.34
|
|
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-04-
|
|
11
|
+
date: 2024-04-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: govuk_design_system_formbuilder
|
|
@@ -290,20 +290,6 @@ dependencies:
|
|
|
290
290
|
- - "<"
|
|
291
291
|
- !ruby/object:Gem::Version
|
|
292
292
|
version: '5.0'
|
|
293
|
-
- !ruby/object:Gem::Dependency
|
|
294
|
-
name: sqlite3
|
|
295
|
-
requirement: !ruby/object:Gem::Requirement
|
|
296
|
-
requirements:
|
|
297
|
-
- - ">="
|
|
298
|
-
- !ruby/object:Gem::Version
|
|
299
|
-
version: '0'
|
|
300
|
-
type: :development
|
|
301
|
-
prerelease: false
|
|
302
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
303
|
-
requirements:
|
|
304
|
-
- - ">="
|
|
305
|
-
- !ruby/object:Gem::Version
|
|
306
|
-
version: '0'
|
|
307
293
|
- !ruby/object:Gem::Dependency
|
|
308
294
|
name: yard
|
|
309
295
|
requirement: !ruby/object:Gem::Requirement
|