From d2ba1205e633a15336c99f4c89f376e710e4657f Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 08:58:38 +0000 Subject: [PATCH 01/14] AP-5608: Update proceedings_sca interrupt Add interrupt card styling from moj design system. Update page template helper to allow class to be added to page heading. Update view to use moj interrupt --- app/assets/stylesheets/application.scss | 1 + app/helpers/page_template_helper.rb | 4 ++-- .../proceedings_sca/interrupts/show.html.erb | 24 +++++++++---------- config/locales/en/providers.yml | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a6aaae2d8f..ffbff8a9b1 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -9,6 +9,7 @@ $govuk-assets-path: "/"; @import "@ministryofjustice/frontend/moj/components/sub-navigation/sub-navigation"; @import "@ministryofjustice/frontend/moj/components/sortable-table/sortable-table"; @import "@ministryofjustice/frontend/moj/components/primary-navigation/primary-navigation"; +@import "@ministryofjustice/frontend/moj/components/interruption-card/interruption-card"; // Project specific diff --git a/app/helpers/page_template_helper.rb b/app/helpers/page_template_helper.rb index 0e802d03e5..e41309c8fa 100644 --- a/app/helpers/page_template_helper.rb +++ b/app/helpers/page_template_helper.rb @@ -79,10 +79,10 @@ def page_template( ) end - def page_heading(heading: :h1, size: :xl, margin_bottom: nil) + def page_heading(heading: :h1, size: :xl, margin_bottom: nil, classes: nil) return unless page_title - classes = ["govuk-heading-#{size}"] + classes = ["govuk-heading-#{size} #{classes}"] classes << "govuk-!-margin-bottom-#{margin_bottom}" if margin_bottom content_tag heading, page_title, class: classes.join(" ") end diff --git a/app/views/providers/proceedings_sca/interrupts/show.html.erb b/app/views/providers/proceedings_sca/interrupts/show.html.erb index 9fe5198672..03aaa0a7d9 100644 --- a/app/views/providers/proceedings_sca/interrupts/show.html.erb +++ b/app/views/providers/proceedings_sca/interrupts/show.html.erb @@ -1,17 +1,17 @@ -
- <%= page_template(page_title: t(".#{@type}.title_html"), column_width: "full", template: :basic) do %> - <%= page_heading(size: "l") %> +
+
+ <%= page_template(page_title: t(".#{@type}.title_html"), column_width: "full", template: :basic) do %> + <%= page_heading(size: "l", classes: "moj-interruption-card__heading") %> -
<% if I18n.exists?("providers.proceedings_sca.interrupts.show.#{@type}.paragraph") %> -

<%= t(".#{@type}.paragraph") %>

+

<%= t(".#{@type}.paragraph") %>

<% end %> -

<%= t(".#{@type}.options") %>

- <%= govuk_list t(".#{@type}.option_bullets_html"), type: :bullet %> -
+

<%= t(".#{@type}.options") %>

+ <%= govuk_list t(".#{@type}.option_bullets_html"), type: :bullet, classes: "moj-interruption-card__body" %> -
- <%= govuk_button_link_to t(".#{@type}.proceedings"), providers_legal_aid_application_sca_interrupt_path(@legal_aid_application, @type), method: :delete, inverse: true, role: "button" %> -
- <% end %> +
+ <%= govuk_button_link_to t(".#{@type}.proceedings"), providers_legal_aid_application_sca_interrupt_path(@legal_aid_application, @type), method: :delete, inverse: true, role: "button" %> +
+ <% end %> +
diff --git a/config/locales/en/providers.yml b/config/locales/en/providers.yml index 48ba937b29..ec23a97e2e 100644 --- a/config/locales/en/providers.yml +++ b/config/locales/en/providers.yml @@ -1912,7 +1912,7 @@ en: title_html: You cannot submit this application under special children act paragraph: This is because it needs to be means and merits tested. option_bullets_html: - - check for a different matter type in this service or use CCMS + - check for a different matter type in this service or use CCMS - go back and change your answer proceedings: Check for another matter type supervision: From e9594f89200913b0cfab90cc56632b140051b2e2 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 09:29:34 +0000 Subject: [PATCH 02/14] AP-5608: Update use_ccms Update to use govuk component for bullet lists and moj design system interrupt styling --- app/views/shared/_use_ccms.html.erb | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/app/views/shared/_use_ccms.html.erb b/app/views/shared/_use_ccms.html.erb index 7bfe982549..8f107ca7e1 100644 --- a/app/views/shared/_use_ccms.html.erb +++ b/app/views/shared/_use_ccms.html.erb @@ -1,21 +1,17 @@ -
- <%= page_template(page_title: t(".title_html"), head_title: t(".head_title"), column_width: "full", template: :basic) do %> - <%= page_heading(size: "l") %> +
+
+ <%= page_template(page_title: t(".title_html"), head_title: t(".head_title"), column_width: "full", template: :basic) do %> + <%= page_heading(size: "l", classes: "moj-interruption-card__heading") %> -
-

<%= body_text %>

+

<%= body_text %>

<% if local_assigns[:list] %> -
    - <% list.each do |bullet| %> -
  • <%= bullet %>
    • - <% end %> -
+ <%= govuk_list list, type: :bullet, classes: "moj-interruption-card__body" %> <% end %> -
-
- <%= govuk_button_link_to t(".continue_in_ccms_html"), "https://portal.legalservices.gov.uk", inverse: true, role: "button" %> - <%= govuk_link_to t(".back_to_applications"), submitted_providers_legal_aid_applications_path, inverse: true %> -
- <% end %> +
+ <%= govuk_button_link_to t(".continue_in_ccms_html"), "https://portal.legalservices.gov.uk", inverse: true, role: "button" %> + <%= govuk_link_to t(".back_to_applications"), submitted_providers_legal_aid_applications_path, inverse: true %> +
+ <% end %> +
From bbe2f21c7e7e2502625050e56474440b34cebff1 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 09:35:24 +0000 Subject: [PATCH 03/14] AP-5608: Update contact_providers interrupt --- app/views/citizens/contact_providers/show.html.erb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/citizens/contact_providers/show.html.erb b/app/views/citizens/contact_providers/show.html.erb index 4d9b39ed3a..e65fff92b6 100644 --- a/app/views/citizens/contact_providers/show.html.erb +++ b/app/views/citizens/contact_providers/show.html.erb @@ -1,6 +1,8 @@ -
- <%= page_template(template: :basic) do %> -

<%= t(".title") %>

-

<%= t(".they_will_check") %>

- <% end %> +
+
+ <%= page_template(template: :basic) do %> +

<%= t(".title") %>

+

<%= t(".they_will_check") %>

+ <% end %> +
From d1e6ac1f6dec942cc9926042224869462331bf4c Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 09:40:38 +0000 Subject: [PATCH 04/14] AP-5608: Update dwp non passported interrupt --- .../confirm_dwp_non_passported_applications/show.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb b/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb index 7672f27891..4289d76619 100644 --- a/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb +++ b/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb @@ -12,8 +12,10 @@ form:, ) do %> -
-

<%= t(".title_html") %>

+
+
+

<%= t(".title_html") %>

+
<%= form.govuk_radio_buttons_fieldset(:confirm_dwp_result, From e6b99dd4d35ebac40302df9df4a6f95611878f14 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 12:39:50 +0000 Subject: [PATCH 05/14] AP-5608: Update assessement results --- .../capital_assessment_results/show.html.erb | 6 +++-- .../show.html.erb | 6 +++-- ..._and_income_contribution_required.html.erb | 21 ++++++++--------- .../_capital_contribution_required.html.erb | 4 ++-- .../assessment_results/_eligible.html.erb | 4 ++-- .../_income_contribution_required.html.erb | 4 ++-- .../assessment_results/_ineligible.html.erb | 4 ++-- .../_manual_check_required.html.erb | 14 +++++------ .../_no_cfe_result.html.erb | 8 +++---- .../_partially_eligible_capital.html.erb | 4 ++-- ...partially_eligible_capital_income.html.erb | 23 +++++++++---------- .../_partially_eligible_income.html.erb | 4 ++-- 12 files changed, 52 insertions(+), 50 deletions(-) diff --git a/app/views/providers/capital_assessment_results/show.html.erb b/app/views/providers/capital_assessment_results/show.html.erb index c8033b1c05..6010eae598 100644 --- a/app/views/providers/capital_assessment_results/show.html.erb +++ b/app/views/providers/capital_assessment_results/show.html.erb @@ -4,8 +4,10 @@ column_width: :full, ) do %> -
- <%= render @result_partial %> +
+
+ <%= render @result_partial %> +
<%= render "result_details" %> diff --git a/app/views/providers/capital_income_assessment_results/show.html.erb b/app/views/providers/capital_income_assessment_results/show.html.erb index d99a62a9b9..ab1e0eca0c 100644 --- a/app/views/providers/capital_income_assessment_results/show.html.erb +++ b/app/views/providers/capital_income_assessment_results/show.html.erb @@ -5,8 +5,10 @@ column_width: :full, ) do %> -
- <%= render @result_partial %> +
+
+ <%= render @result_partial %> +
<%= render "result_details" %> diff --git a/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb b/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb index 1242f1b300..2985c3e981 100644 --- a/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb +++ b/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb @@ -1,18 +1,17 @@
-

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

-

-

<%= t(".line_1") %>

-
    - <% t(".details", - capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), - income_contribution: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> -
  • <%= detail %>
    • - <% end %> -
-

<%= t(".line_2") %>

+
+

<%= t(".line_1") %>

+ <%= govuk_list t(".details", + capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), + income_contribution: gds_number_to_currency(@cfe_result.income_contribution)), + type: :bullet, + classes: "moj-interruption-card__body" %> + +

<%= t(".line_2") %>

diff --git a/app/views/shared/assessment_results/_capital_contribution_required.html.erb b/app/views/shared/assessment_results/_capital_contribution_required.html.erb index 170236f5b3..b31f8edea1 100644 --- a/app/views/shared/assessment_results/_capital_contribution_required.html.erb +++ b/app/views/shared/assessment_results/_capital_contribution_required.html.erb @@ -1,12 +1,12 @@
-

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

<% t(".details", amount: gds_number_to_currency(@cfe_result.capital_contribution)).each do |detail| %> -

<%= detail %>

+

<%= detail %>

<% end %>
diff --git a/app/views/shared/assessment_results/_eligible.html.erb b/app/views/shared/assessment_results/_eligible.html.erb index 23f5c62168..ec0f9a019b 100644 --- a/app/views/shared/assessment_results/_eligible.html.erb +++ b/app/views/shared/assessment_results/_eligible.html.erb @@ -1,11 +1,11 @@ -

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

<% t(".details").each do |detail| %> -

<%= detail %>

+

<%= detail %>

<% end %>
diff --git a/app/views/shared/assessment_results/_income_contribution_required.html.erb b/app/views/shared/assessment_results/_income_contribution_required.html.erb index e7cab9bb27..639efccee1 100644 --- a/app/views/shared/assessment_results/_income_contribution_required.html.erb +++ b/app/views/shared/assessment_results/_income_contribution_required.html.erb @@ -1,12 +1,12 @@
-

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

<% t(".details", amount: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> -

<%= detail %>

+

<%= detail %>

<% end %>
diff --git a/app/views/shared/assessment_results/_ineligible.html.erb b/app/views/shared/assessment_results/_ineligible.html.erb index a407bbcb9d..aecbf554ac 100644 --- a/app/views/shared/assessment_results/_ineligible.html.erb +++ b/app/views/shared/assessment_results/_ineligible.html.erb @@ -1,9 +1,9 @@ -

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

-

<%= sanitize(t(".detail", ineligible_reasons: ineligible_reasons(@cfe_result))) %>

+

<%= sanitize(t(".detail", ineligible_reasons: ineligible_reasons(@cfe_result))) %>

diff --git a/app/views/shared/assessment_results/_manual_check_required.html.erb b/app/views/shared/assessment_results/_manual_check_required.html.erb index 64dc9c2838..cd281e34b3 100644 --- a/app/views/shared/assessment_results/_manual_check_required.html.erb +++ b/app/views/shared/assessment_results/_manual_check_required.html.erb @@ -1,20 +1,20 @@ -

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

<% if @legal_aid_application.cfe_result.assessment_result == 'eligible' %> -

<%= t(".line1_eligible") %>

+

<%= t(".line1_eligible") %>

<% elsif @details.length > 1 %> -

<%= t(".line1_multi") %>

+

<%= t(".line1_multi") %>

<% @details.each do |detail| %> -

<%= t(".detail", detail:) %>

+

<%= t(".detail", detail:) %>

<% end %> <% else %> -

<%= t(".line1", detail: @details[0]) %>

+

<%= t(".line1", detail: @details[0]) %>

<% end %> -

<%= t(".line2") %>

-

<%= t(".line3") %>

+

<%= t(".line2") %>

+

<%= t(".line3") %>

diff --git a/app/views/shared/assessment_results/_no_cfe_result.html.erb b/app/views/shared/assessment_results/_no_cfe_result.html.erb index c9e848e90c..cd98b6c324 100644 --- a/app/views/shared/assessment_results/_no_cfe_result.html.erb +++ b/app/views/shared/assessment_results/_no_cfe_result.html.erb @@ -1,11 +1,11 @@ -

+

<%= t(".heading") %>

-

<%= t(".cannot_calculate") %>

-

<%= t(".caseworker_check") %>

-

<%= t(".continue") %>

+

<%= t(".cannot_calculate") %>

+

<%= t(".caseworker_check") %>

+

<%= t(".continue") %>

diff --git a/app/views/shared/assessment_results/_partially_eligible_capital.html.erb b/app/views/shared/assessment_results/_partially_eligible_capital.html.erb index 170236f5b3..b31f8edea1 100644 --- a/app/views/shared/assessment_results/_partially_eligible_capital.html.erb +++ b/app/views/shared/assessment_results/_partially_eligible_capital.html.erb @@ -1,12 +1,12 @@
-

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

<% t(".details", amount: gds_number_to_currency(@cfe_result.capital_contribution)).each do |detail| %> -

<%= detail %>

+

<%= detail %>

<% end %>
diff --git a/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb b/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb index 0d2a745724..7f6bf743cf 100644 --- a/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb +++ b/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb @@ -1,19 +1,18 @@
-

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

-

-

<%= t(".line_1") %>

-
    - <% t(".details", - capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), - income_contribution: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> -
  • <%= detail %>
    • - <% end %> -
-

<%= t(".line_2") %>

-

<%= t(".line_3") %>

+
+

<%= t(".line_1") %>

+ <%= govuk_list t(".details", + capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), + income_contribution: gds_number_to_currency(@cfe_result.income_contribution)), + type: :bullet, + classes: "moj-interruption-card__body" %> + +

<%= t(".line_2") %>

+

<%= t(".line_3") %>

diff --git a/app/views/shared/assessment_results/_partially_eligible_income.html.erb b/app/views/shared/assessment_results/_partially_eligible_income.html.erb index e7cab9bb27..639efccee1 100644 --- a/app/views/shared/assessment_results/_partially_eligible_income.html.erb +++ b/app/views/shared/assessment_results/_partially_eligible_income.html.erb @@ -1,12 +1,12 @@
-

+

<%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

<% t(".details", amount: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> -

<%= detail %>

+

<%= detail %>

<% end %>
From 59aab129a903c2f371011cd5db6836c258f76d56 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:27:42 +0000 Subject: [PATCH 06/14] AP-5608: Update no national insurance page --- .../show.html.erb | 28 ++++++++++--------- config/locales/en/providers.yml | 3 +- features/providers/no_nino_flow.feature | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/views/providers/no_national_insurance_numbers/show.html.erb b/app/views/providers/no_national_insurance_numbers/show.html.erb index 6656464f47..0adfcd846f 100644 --- a/app/views/providers/no_national_insurance_numbers/show.html.erb +++ b/app/views/providers/no_national_insurance_numbers/show.html.erb @@ -1,15 +1,17 @@ -
- <%= page_template(page_title: t(".tab_title"), column_width: :full, template: :basic) do %> -

- <%= t(".title") %> -

+
+
+ <%= page_template(page_title: t(".tab_title"), column_width: :full, template: :basic) do %> +

<%= t(".title") %>

- <%= next_action_buttons_with_form( - url: providers_legal_aid_application_no_national_insurance_number_path, - method: :patch, - show_draft: true, - inverse_continue: true, - continue_button_text: t("generic.continue"), - ) %> - <% end %> +

<%= t(".body") %>

+ + <%= next_action_buttons_with_form( + url: providers_legal_aid_application_no_national_insurance_number_path, + method: :patch, + show_draft: true, + inverse_continue: true, + continue_button_text: t("generic.continue"), + ) %> + <% end %> +
diff --git a/config/locales/en/providers.yml b/config/locales/en/providers.yml index ec23a97e2e..81b4baa602 100644 --- a/config/locales/en/providers.yml +++ b/config/locales/en/providers.yml @@ -1584,7 +1584,8 @@ en: no_national_insurance_numbers: show: - title: You will have to do a full means test as part of this application. This is because you do not have a National Insurance number for your client. + title: You will have to do a full means test as part of this application + body: This is because you do not have a National Insurance number for your client. tab_title: We need to check your client's financial eligibility offline_accounts: diff --git a/features/providers/no_nino_flow.feature b/features/providers/no_nino_flow.feature index 7c4294e98e..d3a3872083 100644 --- a/features/providers/no_nino_flow.feature +++ b/features/providers/no_nino_flow.feature @@ -65,7 +65,7 @@ Feature: No national insurance number for applicant Then I should be on a page with title 'Check your answers' When I click 'Save and continue' - Then I should be on a page showing "You will have to do a full means test as part of this application. This is because you do not have a National Insurance number for your client" + Then I should be on a page showing "You will have to do a full means test as part of this application" When I click link 'Back' Then I should be on a page with title 'Check your answers' From 72c086678a5d22d1bcb68d10187a6c94b7ce6bdd Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:28:14 +0000 Subject: [PATCH 07/14] AP-5608: Update change of names page --- .../change_of_names_interrupts/show.html.erb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/providers/change_of_names_interrupts/show.html.erb b/app/views/providers/change_of_names_interrupts/show.html.erb index 53fd614a70..30c8b6ca52 100644 --- a/app/views/providers/change_of_names_interrupts/show.html.erb +++ b/app/views/providers/change_of_names_interrupts/show.html.erb @@ -1,14 +1,14 @@ -
- <%= page_template(page_title: t(".title_html"), column_width: "full", template: :basic) do %> - <%= page_heading(size: "l") %> +
+
+ <%= page_template(page_title: t(".title_html"), template: :basic) do %> + <%= page_heading(size: "l", classes: "moj-interruption-card__heading") %> -
-

<%= t(".paragraph") %>

-
+

<%= t(".paragraph") %>

-
- <%= govuk_button_link_to t(".change"), providers_legal_aid_application_change_of_names_path, inverse: true, role: "button" %> - <%= govuk_button_link_to t(".applications"), in_progress_providers_legal_aid_applications_path, inverse: true, role: "button" %> -
- <% end %> +
+ <%= govuk_button_link_to t(".change"), providers_legal_aid_application_change_of_names_path, inverse: true, role: "button" %> + <%= govuk_button_link_to t(".applications"), in_progress_providers_legal_aid_applications_path, inverse: true, role: "button" %> +
+ <% end %> +
From 322cc60da38a09052bab1393612a4ee8e89babfe Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:38:26 +0000 Subject: [PATCH 08/14] AP-5608: Update blocks interrupt page --- .../providers/interrupt/blocks/show.html.erb | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/app/views/providers/interrupt/blocks/show.html.erb b/app/views/providers/interrupt/blocks/show.html.erb index 7f8dd5f647..c41e476590 100644 --- a/app/views/providers/interrupt/blocks/show.html.erb +++ b/app/views/providers/interrupt/blocks/show.html.erb @@ -1,19 +1,16 @@ -
- <%= page_template(page_title: t(".title_html"), column_width: "full", template: :basic) do %> - <%= page_heading(size: "l") %> +
+
+ <%= page_template(page_title: t(".title_html"), column_width: "full", template: :basic) do %> + <%= page_heading(size: "l", classes: "moj-interruption-card__heading") %> -
-

<%= t(".body_text") %>

-

<%= t(".options") %>

-
    - <% t(".option_bullets").each do |bullet| %> -
  • <%= bullet %>
    • - <% end %> -
-
+

<%= t(".body_text") %>

+

<%= t(".options") %>

-
- <%= govuk_button_link_to t(".applications"), submitted_providers_legal_aid_applications_path, inverse: true, role: "button" %> -
- <% end %> + <%= govuk_list t(".option_bullets"), type: :bullet, classes: "moj-interruption-card__body" %> + +
+ <%= govuk_button_link_to t(".applications"), submitted_providers_legal_aid_applications_path, inverse: true, role: "button" %> +
+ <% end %> +
From 0a6f35c786e19fe2a563d4aa7e6f4a4bebd8b5d7 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:46:01 +0000 Subject: [PATCH 09/14] AP-5608: Update non means tested interrupt page --- .../show.html.erb | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/app/views/providers/confirm_non_means_tested_applications/show.html.erb b/app/views/providers/confirm_non_means_tested_applications/show.html.erb index db5a97b5d1..9fb4a74aad 100644 --- a/app/views/providers/confirm_non_means_tested_applications/show.html.erb +++ b/app/views/providers/confirm_non_means_tested_applications/show.html.erb @@ -1,21 +1,23 @@ -
- <%= page_template(page_title: t(".tab_title"), column_width: :full, template: :basic) do %> -

- <% if @legal_aid_application.special_children_act_proceedings? %> - <%= t(".title.sca_proceeding") %> - <% elsif @legal_aid_application.used_delegated_functions? %> - <%= t(".title.under_18_when_delegated_functions_used") %> - <% else %> - <%= t(".title.under_18_now") %> - <% end %> -

+
+
+ <%= page_template(page_title: t(".tab_title"), column_width: :full, template: :basic) do %> +

+ <% if @legal_aid_application.special_children_act_proceedings? %> + <%= t(".title.sca_proceeding") %> + <% elsif @legal_aid_application.used_delegated_functions? %> + <%= t(".title.under_18_when_delegated_functions_used") %> + <% else %> + <%= t(".title.under_18_now") %> + <% end %> +

- <%= next_action_buttons_with_form( - url: providers_legal_aid_application_confirm_non_means_tested_applications_path, - method: :patch, - show_draft: true, - inverse_continue: true, - continue_button_text: t("generic.continue"), - ) %> - <% end %> + <%= next_action_buttons_with_form( + url: providers_legal_aid_application_confirm_non_means_tested_applications_path, + method: :patch, + show_draft: true, + inverse_continue: true, + continue_button_text: t("generic.continue"), + ) %> + <% end %> +
From f46affc50e72e329d09c2a2d5c4463bfe9c676c7 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:08:14 +0000 Subject: [PATCH 10/14] AP-5608: Update check_benefits interrupt page --- .../providers/check_benefits/index.html.erb | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/views/providers/check_benefits/index.html.erb b/app/views/providers/check_benefits/index.html.erb index d3ae290737..d550816335 100644 --- a/app/views/providers/check_benefits/index.html.erb +++ b/app/views/providers/check_benefits/index.html.erb @@ -1,16 +1,17 @@ <% result_namespace = @legal_aid_application.applicant_receives_benefit? ? ".positive_result" : ".negative_result" %> -
- <%= page_template(page_title: t("#{result_namespace}.tab_title"), column_width: :full, template: :basic) do %> -

- <%= t("#{result_namespace}.title") %> -

- <%= next_action_buttons_with_form( - url: providers_legal_aid_application_check_benefit_path, - method: :patch, - show_draft: true, - inverse_continue: true, - continue_button_text: t("generic.continue"), - ) %> - <% end %> +
+
+ <%= page_template(page_title: t("#{result_namespace}.tab_title"), template: :basic) do %> +

<%= t("#{result_namespace}.title") %>

+ + <%= next_action_buttons_with_form( + url: providers_legal_aid_application_check_benefit_path, + method: :patch, + show_draft: true, + inverse_continue: true, + continue_button_text: t("generic.continue"), + ) %> + <% end %> +
From 4319423a720a74e5b4dd99ed2ac2415d3e5b442c Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:34:58 +0000 Subject: [PATCH 11/14] AP-5608: Update page widths to follow designs --- .../confirm_dwp_non_passported_applications/show.html.erb | 6 +++++- .../confirm_non_means_tested_applications/show.html.erb | 2 +- app/views/providers/interrupt/blocks/show.html.erb | 2 +- .../providers/no_national_insurance_numbers/show.html.erb | 2 +- .../providers/proceedings_sca/interrupts/show.html.erb | 2 +- app/views/shared/_use_ccms.html.erb | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb b/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb index 4289d76619..78699c794c 100644 --- a/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb +++ b/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb @@ -14,7 +14,11 @@
-

<%= t(".title_html") %>

+
+
+

<%= t(".title_html") %>

+
+
diff --git a/app/views/providers/confirm_non_means_tested_applications/show.html.erb b/app/views/providers/confirm_non_means_tested_applications/show.html.erb index 9fb4a74aad..ff145205f8 100644 --- a/app/views/providers/confirm_non_means_tested_applications/show.html.erb +++ b/app/views/providers/confirm_non_means_tested_applications/show.html.erb @@ -1,6 +1,6 @@
- <%= page_template(page_title: t(".tab_title"), column_width: :full, template: :basic) do %> + <%= page_template(page_title: t(".tab_title"), template: :basic) do %>

<% if @legal_aid_application.special_children_act_proceedings? %> <%= t(".title.sca_proceeding") %> diff --git a/app/views/providers/interrupt/blocks/show.html.erb b/app/views/providers/interrupt/blocks/show.html.erb index c41e476590..31128ae2f1 100644 --- a/app/views/providers/interrupt/blocks/show.html.erb +++ b/app/views/providers/interrupt/blocks/show.html.erb @@ -1,6 +1,6 @@
- <%= page_template(page_title: t(".title_html"), column_width: "full", template: :basic) do %> + <%= page_template(page_title: t(".title_html"), template: :basic) do %> <%= page_heading(size: "l", classes: "moj-interruption-card__heading") %>

<%= t(".body_text") %>

diff --git a/app/views/providers/no_national_insurance_numbers/show.html.erb b/app/views/providers/no_national_insurance_numbers/show.html.erb index 0adfcd846f..c90657deb2 100644 --- a/app/views/providers/no_national_insurance_numbers/show.html.erb +++ b/app/views/providers/no_national_insurance_numbers/show.html.erb @@ -1,6 +1,6 @@
- <%= page_template(page_title: t(".tab_title"), column_width: :full, template: :basic) do %> + <%= page_template(page_title: t(".tab_title"), template: :basic) do %>

<%= t(".title") %>

<%= t(".body") %>

diff --git a/app/views/providers/proceedings_sca/interrupts/show.html.erb b/app/views/providers/proceedings_sca/interrupts/show.html.erb index 03aaa0a7d9..c93f22b84c 100644 --- a/app/views/providers/proceedings_sca/interrupts/show.html.erb +++ b/app/views/providers/proceedings_sca/interrupts/show.html.erb @@ -1,6 +1,6 @@
- <%= page_template(page_title: t(".#{@type}.title_html"), column_width: "full", template: :basic) do %> + <%= page_template(page_title: t(".#{@type}.title_html"), template: :basic) do %> <%= page_heading(size: "l", classes: "moj-interruption-card__heading") %> <% if I18n.exists?("providers.proceedings_sca.interrupts.show.#{@type}.paragraph") %> diff --git a/app/views/shared/_use_ccms.html.erb b/app/views/shared/_use_ccms.html.erb index 8f107ca7e1..fa86925c50 100644 --- a/app/views/shared/_use_ccms.html.erb +++ b/app/views/shared/_use_ccms.html.erb @@ -1,6 +1,6 @@
- <%= page_template(page_title: t(".title_html"), head_title: t(".head_title"), column_width: "full", template: :basic) do %> + <%= page_template(page_title: t(".title_html"), head_title: t(".head_title"), template: :basic) do %> <%= page_heading(size: "l", classes: "moj-interruption-card__heading") %>

<%= body_text %>

From 613dfb7219651c69d9e9ca4bcfc1529f740cbd47 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 14:40:04 +0000 Subject: [PATCH 12/14] AP-5608: Update confirm dwp non passported widths --- .../show.html.erb | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb b/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb index 78699c794c..2bdeaf179f 100644 --- a/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb +++ b/app/views/providers/confirm_dwp_non_passported_applications/show.html.erb @@ -22,22 +22,27 @@
- <%= form.govuk_radio_buttons_fieldset(:confirm_dwp_result, - legend: { size: "l", tag: "h2", text: t(".is_this_correct") }, - classes: "govuk-!-margin-bottom-6") do %> +
+
- <% if display_hmrc_text? %> -

<%= t(".hmrc_text") %>

- <% end %> + <%= form.govuk_radio_buttons_fieldset(:confirm_dwp_result, + legend: { size: "l", tag: "h2", text: t(".is_this_correct") }, + classes: "govuk-!-margin-bottom-6") do %> - <%= form.govuk_radio_button :confirm_dwp_result, "dwp_correct", link_errors: true, label: { text: t("generic.yes") } %> - <%= form.govuk_radio_button :confirm_dwp_result, "joint_with_partner_false", label: { text: t(".option_no") } %> - <% if @legal_aid_application.applicant.has_partner? %> - <%= form.govuk_radio_button :confirm_dwp_result, "joint_with_partner_true", label: { text: t(".option_partner") } %> - <% end %> + <% if display_hmrc_text? %> +

<%= t(".hmrc_text") %>

+ <% end %> - <% end %> + <%= form.govuk_radio_button :confirm_dwp_result, "dwp_correct", link_errors: true, label: { text: t("generic.yes") } %> + <%= form.govuk_radio_button :confirm_dwp_result, "joint_with_partner_false", label: { text: t(".option_no") } %> + <% if @legal_aid_application.applicant.has_partner? %> + <%= form.govuk_radio_button :confirm_dwp_result, "joint_with_partner_true", label: { text: t(".option_partner") } %> + <% end %> - <%= next_action_buttons(show_draft: true, form:) %> + <% end %> + + <%= next_action_buttons(show_draft: true, form:) %> +
+
<% end %> <% end %> From a95e980d429396755081ce181fd4de4a4f4dc6b6 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:10:37 +0000 Subject: [PATCH 13/14] AP-5608: Update width for capital assessments --- .../capital_assessment_results/show.html.erb | 6 +++- .../show.html.erb | 6 +++- ..._and_income_contribution_required.html.erb | 19 ++++++------- .../_capital_contribution_required.html.erb | 11 +++----- .../assessment_results/_eligible.html.erb | 10 ++----- .../_income_contribution_required.html.erb | 11 +++----- .../assessment_results/_ineligible.html.erb | 6 +--- .../_manual_check_required.html.erb | 28 ++++++++----------- .../_no_cfe_result.html.erb | 10 ++----- .../_partially_eligible_capital.html.erb | 11 +++----- ...partially_eligible_capital_income.html.erb | 21 ++++++-------- .../_partially_eligible_income.html.erb | 11 +++----- 12 files changed, 62 insertions(+), 88 deletions(-) diff --git a/app/views/providers/capital_assessment_results/show.html.erb b/app/views/providers/capital_assessment_results/show.html.erb index 6010eae598..91d249ab76 100644 --- a/app/views/providers/capital_assessment_results/show.html.erb +++ b/app/views/providers/capital_assessment_results/show.html.erb @@ -6,7 +6,11 @@
- <%= render @result_partial %> +
+
+ <%= render @result_partial %> +
+
diff --git a/app/views/providers/capital_income_assessment_results/show.html.erb b/app/views/providers/capital_income_assessment_results/show.html.erb index ab1e0eca0c..80bb64d495 100644 --- a/app/views/providers/capital_income_assessment_results/show.html.erb +++ b/app/views/providers/capital_income_assessment_results/show.html.erb @@ -7,7 +7,11 @@
- <%= render @result_partial %> +
+
+ <%= render @result_partial %> +
+
diff --git a/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb b/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb index 2985c3e981..e8c2e0eef1 100644 --- a/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb +++ b/app/views/shared/assessment_results/_capital_and_income_contribution_required.html.erb @@ -3,15 +3,12 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %>

-
-
-

<%= t(".line_1") %>

- <%= govuk_list t(".details", - capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), - income_contribution: gds_number_to_currency(@cfe_result.income_contribution)), - type: :bullet, - classes: "moj-interruption-card__body" %> -

<%= t(".line_2") %>

-
-
+

<%= t(".line_1") %>

+<%= govuk_list t(".details", + capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), + income_contribution: gds_number_to_currency(@cfe_result.income_contribution)), + type: :bullet, + classes: "moj-interruption-card__body" %> + +

<%= t(".line_2") %>

diff --git a/app/views/shared/assessment_results/_capital_contribution_required.html.erb b/app/views/shared/assessment_results/_capital_contribution_required.html.erb index b31f8edea1..bec56bee51 100644 --- a/app/views/shared/assessment_results/_capital_contribution_required.html.erb +++ b/app/views/shared/assessment_results/_capital_contribution_required.html.erb @@ -3,10 +3,7 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
- <% t(".details", amount: gds_number_to_currency(@cfe_result.capital_contribution)).each do |detail| %> -

<%= detail %>

- <% end %> -
-
+ +<% t(".details", amount: gds_number_to_currency(@cfe_result.capital_contribution)).each do |detail| %> +

<%= detail %>

+<% end %> diff --git a/app/views/shared/assessment_results/_eligible.html.erb b/app/views/shared/assessment_results/_eligible.html.erb index ec0f9a019b..2f320973a0 100644 --- a/app/views/shared/assessment_results/_eligible.html.erb +++ b/app/views/shared/assessment_results/_eligible.html.erb @@ -2,10 +2,6 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
- <% t(".details").each do |detail| %> -

<%= detail %>

- <% end %> -
-
+<% t(".details").each do |detail| %> +

<%= detail %>

+<% end %> diff --git a/app/views/shared/assessment_results/_income_contribution_required.html.erb b/app/views/shared/assessment_results/_income_contribution_required.html.erb index 639efccee1..73413e43a6 100644 --- a/app/views/shared/assessment_results/_income_contribution_required.html.erb +++ b/app/views/shared/assessment_results/_income_contribution_required.html.erb @@ -3,10 +3,7 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
- <% t(".details", amount: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> -

<%= detail %>

- <% end %> -
-
+ +<% t(".details", amount: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> +

<%= detail %>

+<% end %> diff --git a/app/views/shared/assessment_results/_ineligible.html.erb b/app/views/shared/assessment_results/_ineligible.html.erb index aecbf554ac..cdddddc0ae 100644 --- a/app/views/shared/assessment_results/_ineligible.html.erb +++ b/app/views/shared/assessment_results/_ineligible.html.erb @@ -2,8 +2,4 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
-

<%= sanitize(t(".detail", ineligible_reasons: ineligible_reasons(@cfe_result))) %>

-
-
+

<%= sanitize(t(".detail", ineligible_reasons: ineligible_reasons(@cfe_result))) %>

diff --git a/app/views/shared/assessment_results/_manual_check_required.html.erb b/app/views/shared/assessment_results/_manual_check_required.html.erb index cd281e34b3..2a2b18125e 100644 --- a/app/views/shared/assessment_results/_manual_check_required.html.erb +++ b/app/views/shared/assessment_results/_manual_check_required.html.erb @@ -2,19 +2,15 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
- <% if @legal_aid_application.cfe_result.assessment_result == 'eligible' %> -

<%= t(".line1_eligible") %>

- <% elsif @details.length > 1 %> -

<%= t(".line1_multi") %>

- <% @details.each do |detail| %> -

<%= t(".detail", detail:) %>

- <% end %> - <% else %> -

<%= t(".line1", detail: @details[0]) %>

- <% end %> -

<%= t(".line2") %>

-

<%= t(".line3") %>

-
-
+<% if @legal_aid_application.cfe_result.assessment_result == 'eligible' %> +

<%= t(".line1_eligible") %>

+<% elsif @details.length > 1 %> +

<%= t(".line1_multi") %>

+ <% @details.each do |detail| %> +

<%= t(".detail", detail:) %>

+ <% end %> +<% else %> +

<%= t(".line1", detail: @details[0]) %>

+<% end %> +

<%= t(".line2") %>

+

<%= t(".line3") %>

diff --git a/app/views/shared/assessment_results/_no_cfe_result.html.erb b/app/views/shared/assessment_results/_no_cfe_result.html.erb index cd98b6c324..7773fae425 100644 --- a/app/views/shared/assessment_results/_no_cfe_result.html.erb +++ b/app/views/shared/assessment_results/_no_cfe_result.html.erb @@ -2,10 +2,6 @@ <%= t(".heading") %> -
-
-

<%= t(".cannot_calculate") %>

-

<%= t(".caseworker_check") %>

-

<%= t(".continue") %>

-
-
+

<%= t(".cannot_calculate") %>

+

<%= t(".caseworker_check") %>

+

<%= t(".continue") %>

diff --git a/app/views/shared/assessment_results/_partially_eligible_capital.html.erb b/app/views/shared/assessment_results/_partially_eligible_capital.html.erb index b31f8edea1..bec56bee51 100644 --- a/app/views/shared/assessment_results/_partially_eligible_capital.html.erb +++ b/app/views/shared/assessment_results/_partially_eligible_capital.html.erb @@ -3,10 +3,7 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
- <% t(".details", amount: gds_number_to_currency(@cfe_result.capital_contribution)).each do |detail| %> -

<%= detail %>

- <% end %> -
-
+ +<% t(".details", amount: gds_number_to_currency(@cfe_result.capital_contribution)).each do |detail| %> +

<%= detail %>

+<% end %> diff --git a/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb b/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb index 7f6bf743cf..f2a1c35fee 100644 --- a/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb +++ b/app/views/shared/assessment_results/_partially_eligible_capital_income.html.erb @@ -3,16 +3,13 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
-

<%= t(".line_1") %>

- <%= govuk_list t(".details", - capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), - income_contribution: gds_number_to_currency(@cfe_result.income_contribution)), - type: :bullet, - classes: "moj-interruption-card__body" %> -

<%= t(".line_2") %>

-

<%= t(".line_3") %>

-
-
+

<%= t(".line_1") %>

+<%= govuk_list t(".details", + capital_contribution: gds_number_to_currency(@cfe_result.capital_contribution), + income_contribution: gds_number_to_currency(@cfe_result.income_contribution)), + type: :bullet, + classes: "moj-interruption-card__body" %> + +

<%= t(".line_2") %>

+

<%= t(".line_3") %>

diff --git a/app/views/shared/assessment_results/_partially_eligible_income.html.erb b/app/views/shared/assessment_results/_partially_eligible_income.html.erb index 639efccee1..73413e43a6 100644 --- a/app/views/shared/assessment_results/_partially_eligible_income.html.erb +++ b/app/views/shared/assessment_results/_partially_eligible_income.html.erb @@ -3,10 +3,7 @@ <%= t(".heading", name: @legal_aid_application.applicant_full_name) %> -
-
- <% t(".details", amount: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> -

<%= detail %>

- <% end %> -
-
+ +<% t(".details", amount: gds_number_to_currency(@cfe_result.income_contribution)).each do |detail| %> +

<%= detail %>

+<% end %> From 7f899d73c1604eb11df90dfcc6b5895933fe5241 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:14:18 +0000 Subject: [PATCH 14/14] AP-5608: Remove custom interruption styling Remove div with class from start page which is in now deleted interrupt stylesheet. There are no obvious visual changes after deletion --- app/assets/stylesheets/application.scss | 3 +- .../stylesheets/interruption-panel.scss | 63 ------------------- app/views/providers/start/index.html.erb | 40 ++++++------ 3 files changed, 20 insertions(+), 86 deletions(-) delete mode 100644 app/assets/stylesheets/interruption-panel.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ffbff8a9b1..b6fa2c5362 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -22,7 +22,6 @@ $govuk-assets-path: "/"; @import "check-your-answers"; @import "govuk-mods"; @import "helpers"; -@import "interruption-panel"; @import "language-switcher"; @import "layout"; @import "long-email-truncation"; @@ -43,4 +42,4 @@ $govuk-assets-path: "/"; @import "dropzone/src/dropzone"; @import "dropzone/src/basic"; @import "providers/summary_list_action_width"; -@import "primary_navigation"; +@import "primary_navigation"; \ No newline at end of file diff --git a/app/assets/stylesheets/interruption-panel.scss b/app/assets/stylesheets/interruption-panel.scss deleted file mode 100644 index c559a44260..0000000000 --- a/app/assets/stylesheets/interruption-panel.scss +++ /dev/null @@ -1,63 +0,0 @@ -// stylelint-disable selector-max-id, selector-no-qualifying-type - -.interruption-panel { - padding: 30px; - background-color: #1d70b8; - - p, - h1, - h2, - ul, - label { - color: govuk-colour("white"); - } - - label { - font-size: 24px; - } - - .govuk-error-summary, - .govuk-error-message { - display: none; - } - - .govuk-error-summary + .govuk-grid-row .govuk-form-group { - padding-left: 15px; - border-left: 5px solid govuk-colour("white"); - } - - h2 { - font-size: 28px; - } - - .maximize-text-width { - padding: 1em 0; - float: none; - } - - .govuk-radios__label::before, - & ::after { - border-color: govuk-colour("black"); - color: govuk-colour("black"); - background-color: govuk-colour("white"); - } - - .govuk-inset-text { - border-left: $govuk-border-width-wide solid govuk-colour("white"); - color: govuk-colour("white"); - } - - .govuk-list--bullet{ - a, a:visited{ - color: govuk-colour("white"); - } - } -} - -@media (min-width: 769px) { - .interruption-panel { - padding: 60px; - } -} - -// stylelint-enable selector-max-id, selector-no-qualifying-type diff --git a/app/views/providers/start/index.html.erb b/app/views/providers/start/index.html.erb index 8dafa88d46..8bbc49bd69 100644 --- a/app/views/providers/start/index.html.erb +++ b/app/views/providers/start/index.html.erb @@ -4,29 +4,27 @@

<%= t(".intro") %>

-
-

<%= t(".use_service.list_title") %>

-
    - <% t(".use_service.list").each do |item| %> -
  • <%= item %>
    • - <% end %> - <% if Setting.special_childrens_act? && current_provider&.sca_permissions? %> -
  • <%= t(".use_service.sca_option") %>
    • - <% end %> -
+

<%= t(".use_service.list_title") %>

+
    + <% t(".use_service.list").each do |item| %> +
  • <%= item %>
    • + <% end %> + <% if Setting.special_childrens_act? && current_provider&.sca_permissions? %> +
  • <%= t(".use_service.sca_option") %>
    • + <% end %> +
-

<%= t(".dont_use_service.list_title") %>

-
    - <% if Setting.linked_applications? %> - <% t(".dont_use_service.linked_applications_list").each do |item| %> -
  • <%= item %>
    • - <% end %> - <% else t(".dont_use_service.list").each do |item| %> -
  • <%= item %>
    • - <% end %> +

    <%= t(".dont_use_service.list_title") %>

    +
      + <% if Setting.linked_applications? %> + <% t(".dont_use_service.linked_applications_list").each do |item| %> +
    • <%= item %>
      • <% end %> -
    -
+ <% else t(".dont_use_service.list").each do |item| %> +
  • <%= item %>
    • + <% end %> + <% end %> +

    <%= t(".use_ccms_para_html") %>

    <%= t(".progress_saved") %>