From 9aa6ec6566680d9ee7288da3c47f18801bf853af Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Wed, 1 May 2024 08:41:17 +0100 Subject: [PATCH 1/7] Adds hover styles to radio buttons and labels --- app/assets/stylesheets/admin/forms.scss | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/assets/stylesheets/admin/forms.scss b/app/assets/stylesheets/admin/forms.scss index 19aa8296f3..614ec61c61 100644 --- a/app/assets/stylesheets/admin/forms.scss +++ b/app/assets/stylesheets/admin/forms.scss @@ -40,3 +40,20 @@ input.form-control, select.form-control, margin-right: 15px !important; } } + +span.govuk-radios__item { + min-height: 24px; + :hover { + background-color: #e6e6e6; + border-color: grey; + border-width: 1px; + border-style: solid; + border-radius: 5px; + margin-left: -5px; + padding-left: 24px; + padding-right: 4px; + } + input { + top: 1.5px; + } +} From c9a60ca50aab483966b8f3ae66abfa42812c517f Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Wed, 1 May 2024 08:54:23 +0100 Subject: [PATCH 2/7] Show correct error message for deactive dt assessors --- app/controllers/admin/assessors_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/assessors_controller.rb b/app/controllers/admin/assessors_controller.rb index 353b1c1032..d0c9517ea3 100644 --- a/app/controllers/admin/assessors_controller.rb +++ b/app/controllers/admin/assessors_controller.rb @@ -152,7 +152,7 @@ def bulk_activate_dt def bulk_deactivate_dt authorize Assessor, :deactivate? - @form = ConfirmationForm.new("bulk_activate_assessors", params[:confirmation_form]) + @form = ConfirmationForm.new("bulk_deactivate_assessors", params[:confirmation_form]) if @form.valid? if @form.confirmed? From be14df13ec98877f916d91a25ab94d02617166ff Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Wed, 1 May 2024 09:38:37 +0100 Subject: [PATCH 3/7] Use hide class instead of visuallyhidden --- app/views/admin/figures_and_vat_returns/_vat_returns.html.slim | 2 +- app/views/admin/form_answers/_section_documents.html.slim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim b/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim index 9d2e27bc5f..d58644712c 100644 --- a/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim +++ b/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim @@ -3,7 +3,7 @@ label div[data-controller="inline-flash"] .document-list.space-y-3 - p.p-empty class="#{'visuallyhidden' if figures_form.vat_returns_files.any?}" + p.p-empty class="#{'hide' if figures_form.vat_returns_files.any?}" ' No documents have been attached. ul.list-unstyled.list-actions - if figures_form.vat_returns_files.any? diff --git a/app/views/admin/form_answers/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim index c9a9280218..679906d757 100644 --- a/app/views/admin/form_answers/_section_documents.html.slim +++ b/app/views/admin/form_answers/_section_documents.html.slim @@ -61,7 +61,7 @@ ' Other Docs div[data-controller="inline-flash"] .document-list - p.p-empty class="#{'visuallyhidden' if @form_answer.form_answer_attachments.any?}" + p.p-empty class="#{'hide' if @form_answer.form_answer_attachments.any?}" ' No documents have been attached. ul.list-unstyled.list-actions - if @form_answer.form_answer_attachments.uploaded_not_by_user.any? From d6216bc03cac691044a9fa8ba86aebfa5f64afa1 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Thu, 9 May 2024 12:01:00 +0100 Subject: [PATCH 4/7] Accessibility changes on file attachment uploads --- .../javascripts/admin/form_answers.js.coffee | 6 +-- .../_vat_returns.html.slim | 2 +- .../_form_answer_attachment.html.slim | 2 +- .../form_answers/_section_documents.html.slim | 45 ++++++++++--------- ..._application_and_supporting_docs.html.slim | 4 +- .../docs/_post_shortlisting_docs.html.slim | 4 +- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee index 3dcd60f04f..434c5d4470 100644 --- a/app/assets/javascripts/admin/form_answers.js.coffee +++ b/app/assets/javascripts/admin/form_answers.js.coffee @@ -176,7 +176,7 @@ ready = -> section.find(".document-list .p-empty").removeClass("visuallyhidden") $('#commercial-figures-attachment-form').toggleClass('visuallyhidden', $('.commercial-figures-file').length != 0) initializeFileUpload() - + toggleCommercialFiguresButtonVisibility() if $("html").hasClass("lte-ie7") @@ -228,7 +228,7 @@ ready = -> if $('.vat-returns-file').length == 0 section.find(".document-list .p-empty").removeClass("visuallyhidden") $('#shortlisted-documents-status').attr('data-status-reversible', 'false') - else + else $('#shortlisted-documents-status').attr('data-status-reversible', 'true') $(document).on 'click', "#shortlisted-documents-status a", (e) -> @@ -440,7 +440,7 @@ showErrorForInvalidField = (field, values, containerSelector = '.form-container' buildBannerHtml = (message, type, identifier = null) -> id = identifier || "alert__#{String(Math.random()).slice(2, -1)}" - + "