From 1b6b4832ed6524fd001f7cfabec3fe2c75d69f58 Mon Sep 17 00:00:00 2001 From: Marco Roth Date: Fri, 27 Mar 2026 13:35:17 +0100 Subject: [PATCH 1/5] Address HTML markup issues reported by Herb --- app/views/casa_cases/_court_dates.html.erb | 4 +- app/views/casa_cases/show.html.erb | 28 +++++++------- app/views/casa_org/_languages.html.erb | 1 + .../_confirm_note_content_dialog.html.erb | 4 +- app/views/devise/invitations/edit.html.erb | 2 +- app/views/devise/sessions/new.html.erb | 4 +- app/views/emancipations/show.html.erb | 37 ++++++++++--------- app/views/imports/_cases.html.erb | 2 +- app/views/imports/_sms_opt_in_modal.html.erb | 2 +- app/views/imports/_supervisors.html.erb | 2 +- app/views/imports/_volunteers.html.erb | 2 +- .../layouts/_all_casa_admin_sidebar.html.erb | 1 - .../learning_hours/_confirm_note.html.erb | 4 +- app/views/other_duties/index.html.erb | 1 + app/views/shared/_manage_volunteers.html.erb | 2 +- app/views/supervisors/_manage_active.html.erb | 2 +- app/views/supervisors/index.html.erb | 2 +- app/views/users/edit.html.erb | 2 +- app/views/volunteers/index.html.erb | 4 +- public/404.html | 2 +- public/500.html | 2 +- 21 files changed, 55 insertions(+), 55 deletions(-) diff --git a/app/views/casa_cases/_court_dates.html.erb b/app/views/casa_cases/_court_dates.html.erb index 23b10075f4..759cc25fda 100644 --- a/app/views/casa_cases/_court_dates.html.erb +++ b/app/views/casa_cases/_court_dates.html.erb @@ -5,7 +5,7 @@ <% else %> <% end %> diff --git a/app/views/casa_cases/show.html.erb b/app/views/casa_cases/show.html.erb index 74d4892ed7..e69cdb3864 100644 --- a/app/views/casa_cases/show.html.erb +++ b/app/views/casa_cases/show.html.erb @@ -37,24 +37,24 @@ <% if !@casa_case.active %> <%= render "inactive_case", casa_case: @casa_case %> <% end %> -

+

Case number: <%= @casa_case.case_number %> <%= volunteer_badge(@casa_case, current_user) %>
-

+
<% if @casa_case.hearing_type %> -

+

Hearing Type: <%= @casa_case.hearing_type_name %>
-

+
<% end %> <% if @casa_case.has_judge_name? %> -

+

Judge: <%= @casa_case.judge_name %>
-

+
<% end %> -

+

Transition Aged Youth: <%= @casa_case.decorate.transition_aged_youth %>
-

+
@@ -64,7 +64,7 @@ <%= @casa_case.decorate.duration_in_care %>
-

+

Next Court Date: <%= I18n.l(@casa_case.next_court_date&.date, format: :day_and_date, default: '') %> @@ -73,22 +73,22 @@ tooltip: "Add Next Court Date to Calendar", title: "Next Court Date for [#{@casa_case.case_number}]" %>
-

-

+

+
Court Report Status: <%= @casa_case.decorate.court_report_submission %>
-

+
<% unless @casa_case.court_report_not_submitted? %> <% if @casa_case.court_report_submitted? && @casa_case.court_reports.attached? %> <%= link_to('Click to download', rails_blob_path(@casa_case.latest_court_report, disposition: 'attachment')) %> <% end %> -

+

Court Report Submitted Date: <%= @casa_case.decorate.court_report_submitted_date %>
-

+
<% end %> <% if @casa_case.case_court_orders.exists? %>
Court Orders:
diff --git a/app/views/casa_org/_languages.html.erb b/app/views/casa_org/_languages.html.erb index f76c8affa0..705de0b204 100644 --- a/app/views/casa_org/_languages.html.erb +++ b/app/views/casa_org/_languages.html.erb @@ -45,3 +45,4 @@ + diff --git a/app/views/case_contacts/_confirm_note_content_dialog.html.erb b/app/views/case_contacts/_confirm_note_content_dialog.html.erb index f3e7214def..894e9ab0ef 100644 --- a/app/views/case_contacts/_confirm_note_content_dialog.html.erb +++ b/app/views/case_contacts/_confirm_note_content_dialog.html.erb @@ -6,10 +6,10 @@
Please double check your notes to ensure they don't contain any identifying details about your youth or anyone else. -

+

Note
-

+
diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index 0ff5fcc9b2..666d34b104 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -22,7 +22,7 @@ type: "submit", class: "main-btn primary-btn btn-hover btn-sm" ) do %> - Set my password + Set my password <% end %>
<% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 4b62a5c109..9e2e3ffaf9 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -66,6 +66,8 @@ ) do %> Log In <% end %> + + <% end %>
@@ -73,8 +75,6 @@
-
- diff --git a/app/views/emancipations/show.html.erb b/app/views/emancipations/show.html.erb index 090d7f2b13..5c609970c8 100644 --- a/app/views/emancipations/show.html.erb +++ b/app/views/emancipations/show.html.erb @@ -18,11 +18,12 @@ <% @emancipation_form_data.each do |category| %>
">
- > + <%= input_tag( + type: "checkbox", + class: "emancipation-category-check-box form-check-input", + value: category.id, + disabled: emancipation_category_checkbox_checked(@current_case, category)) %> +
<%= category.name %>
<% if category.emancipation_options.count > 0 %> @@ -33,20 +34,20 @@ <% category.emancipation_options.each do |option| %>
<% if category.mutually_exclusive %> - > + <%= input_tag( + type: "radio", + id: "O#{option.id}", + class: "emancipation-radio-button", + name: "C#{category.id}", + value: option.id, + disabled: emancipation_category_checkbox_checked(@current_case, option)) %> <% else %> - > + <%= input_tag( + type: "checkbox", + id: "O#{option.id}", + class: "emancipation-option-check-box", + value: option.id, + disabled: emancipation_option_checkbox_checked(@current_case, option)) %> <% end %>
diff --git a/app/views/imports/_cases.html.erb b/app/views/imports/_cases.html.erb index f4ba0a6b1c..09ea55ba4c 100644 --- a/app/views/imports/_cases.html.erb +++ b/app/views/imports/_cases.html.erb @@ -26,7 +26,6 @@ class: 'form-control mt-4', type: 'file', style: "margin: auto;" %> - <%= button_tag id: "case-import-button", class: "main-btn primary-btn btn-hover pull-right", disabled: true, data: {disable_with: " Importing File"} do %> @@ -39,3 +38,4 @@ }) <% end %> + diff --git a/app/views/imports/_sms_opt_in_modal.html.erb b/app/views/imports/_sms_opt_in_modal.html.erb index 1f8cdabfa6..20263345aa 100644 --- a/app/views/imports/_sms_opt_in_modal.html.erb +++ b/app/views/imports/_sms_opt_in_modal.html.erb @@ -17,7 +17,7 @@ <%= form.label :sms_opt_in_label, "Opt into SMS notifications", { class: "form-check-label"} %> <%= form.check_box :sms_opt_in, { id: "sms-opt-in-checkbox", class: "form-check-input" } %> - +
<%= form.submit "Continue Import", diff --git a/app/views/imports/_supervisors.html.erb b/app/views/imports/_supervisors.html.erb index 632e27f51a..19fd4535e8 100644 --- a/app/views/imports/_supervisors.html.erb +++ b/app/views/imports/_supervisors.html.erb @@ -26,7 +26,6 @@ class: 'form-control mt-4', type: 'file', style: "margin: auto;" %> -
<%= render "sms_opt_in_modal", { form: f } if @sms_opt_in_warning == "supervisor" %> <%= button_tag id: "supervisor-import-button", class: "main-btn primary-btn btn-hover pull-right", @@ -34,3 +33,4 @@ Import Supervisors CSV <% end %> <% end %> + diff --git a/app/views/imports/_volunteers.html.erb b/app/views/imports/_volunteers.html.erb index 75643d452b..110dbb86bf 100644 --- a/app/views/imports/_volunteers.html.erb +++ b/app/views/imports/_volunteers.html.erb @@ -27,7 +27,6 @@ class: 'form-control mt-4', type: 'file', style: "margin: auto;" %> - <%= render "sms_opt_in_modal", { form: f } if @sms_opt_in_warning == "volunteer" %> <%= button_tag id: "volunteer-import-button", class: "main-btn primary-btn btn-hover pull-right", @@ -35,3 +34,4 @@ Import Volunteers CSV <% end %> <% end %> + diff --git a/app/views/layouts/_all_casa_admin_sidebar.html.erb b/app/views/layouts/_all_casa_admin_sidebar.html.erb index 1c6ebebd9e..733fabdf5f 100644 --- a/app/views/layouts/_all_casa_admin_sidebar.html.erb +++ b/app/views/layouts/_all_casa_admin_sidebar.html.erb @@ -15,7 +15,6 @@ Patch Notes <% end %> -
  • <%= link_to edit_all_casa_admins_path do %> diff --git a/app/views/learning_hours/_confirm_note.html.erb b/app/views/learning_hours/_confirm_note.html.erb index 916364563e..99263c3b6d 100644 --- a/app/views/learning_hours/_confirm_note.html.erb +++ b/app/views/learning_hours/_confirm_note.html.erb @@ -6,10 +6,10 @@
    New entry created -

    +

    Note
    -

    +
    diff --git a/app/views/other_duties/index.html.erb b/app/views/other_duties/index.html.erb index 2010aa6804..3a57593464 100644 --- a/app/views/other_duties/index.html.erb +++ b/app/views/other_duties/index.html.erb @@ -37,6 +37,7 @@ <% volunteer[:other_duties].decorate.each do |duty| %> + <%= I18n.l(duty.occurred_at, format: :full, default: nil) %> <%= I18n.l(duty.created_at, format: :full, default: nil) %> <%= duty.duration_in_minutes %> diff --git a/app/views/shared/_manage_volunteers.html.erb b/app/views/shared/_manage_volunteers.html.erb index 61520c1201..58ac5a0152 100644 --- a/app/views/shared/_manage_volunteers.html.erb +++ b/app/views/shared/_manage_volunteers.html.erb @@ -31,7 +31,7 @@ <% end %>

    Assign a Volunteer to Case

    -
    > +
    disabled <% end %>> <%= form_with(model: assignable_obj.new, url: assign_action) do |form| %>
    diff --git a/app/views/supervisors/_manage_active.html.erb b/app/views/supervisors/_manage_active.html.erb index 88538caf69..560aa599a9 100644 --- a/app/views/supervisors/_manage_active.html.erb +++ b/app/views/supervisors/_manage_active.html.erb @@ -33,5 +33,5 @@ Change to Admin <% end %> <% end %> -
    <% end %> +
    diff --git a/app/views/supervisors/index.html.erb b/app/views/supervisors/index.html.erb index 29b597afe5..e6425910f2 100644 --- a/app/views/supervisors/index.html.erb +++ b/app/views/supervisors/index.html.erb @@ -151,10 +151,10 @@ <% end %> + <% else %> There are no active volunteers without supervisors to display here <% end %> - diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 55b9f1683a..766568ad7d 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -73,6 +73,7 @@ data: {confirm: "Contact your administrator at Ruby For Good to deactivate this account."} %> <% end %> <% end %> + <% end %>
    @@ -119,7 +120,6 @@
    -
    <%= form_with(model: @user, scope: :user, url: users_path, method: :patch) do |form| %> diff --git a/app/views/volunteers/index.html.erb b/app/views/volunteers/index.html.erb index b90f53baa8..841e3a2c5d 100644 --- a/app/views/volunteers/index.html.erb +++ b/app/views/volunteers/index.html.erb @@ -242,8 +242,6 @@ <% end %>
    + - - - diff --git a/public/404.html b/public/404.html index d6cf0e19f4..43d1bbe421 100644 --- a/public/404.html +++ b/public/404.html @@ -83,7 +83,7 @@

    The page you were looking for doesn't exist.

    © CASA / Volunteer Tracking - +

    diff --git a/public/500.html b/public/500.html index 69aa248498..2fa58b0a85 100644 --- a/public/500.html +++ b/public/500.html @@ -83,7 +83,7 @@

    We're sorry, but something went wrong.

    © CASA / Volunteer Tracking - +

    From e447f4e80b3c49657da74bf03fe5cc6ad9064048 Mon Sep 17 00:00:00 2001 From: Marco Roth Date: Fri, 27 Mar 2026 13:49:16 +0100 Subject: [PATCH 2/5] Address some additional linter warnings --- .../all_casa_admins/patch_notes/_patch_note.html.erb | 10 +++------- app/views/casa_admins/index.html.erb | 2 +- app/views/casa_cases/_calendar_button.html.erb | 3 +-- app/views/case_contacts/_case_contact.html.erb | 2 +- app/views/case_contacts/_followup.html.erb | 12 +++++------- .../mailer/reset_password_instructions.html.erb | 2 +- app/views/layouts/_banner.html.erb | 2 +- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/views/all_casa_admins/patch_notes/_patch_note.html.erb b/app/views/all_casa_admins/patch_notes/_patch_note.html.erb index 00334238b0..70a8fad5b9 100644 --- a/app/views/all_casa_admins/patch_notes/_patch_note.html.erb +++ b/app/views/all_casa_admins/patch_notes/_patch_note.html.erb @@ -5,13 +5,9 @@ diff --git a/app/views/casa_admins/index.html.erb b/app/views/casa_admins/index.html.erb index 91e26740b1..b4d09f6684 100644 --- a/app/views/casa_admins/index.html.erb +++ b/app/views/casa_admins/index.html.erb @@ -34,7 +34,7 @@ <% @admins.each do |admin| %> - + <%= admin.email %> <% unless admin.active? %> diff --git a/app/views/casa_cases/_calendar_button.html.erb b/app/views/casa_cases/_calendar_button.html.erb index f0984b7d76..39949b81bb 100644 --- a/app/views/casa_cases/_calendar_button.html.erb +++ b/app/views/casa_cases/_calendar_button.html.erb @@ -1,5 +1,4 @@ <% if date.present? %> - <%= tag.div class: "cal-btn", id: id, data: { title: title, start: date[:start], end: date[:end], tooltip: tooltip } do %> - <% end %> + <%= tag.div class: "cal-btn", id: id, data: { title: title, start: date[:start], end: date[:end], tooltip: tooltip } %> <% end %> diff --git a/app/views/case_contacts/_case_contact.html.erb b/app/views/case_contacts/_case_contact.html.erb index c3324c52a4..fbabde64af 100644 --- a/app/views/case_contacts/_case_contact.html.erb +++ b/app/views/case_contacts/_case_contact.html.erb @@ -4,7 +4,7 @@
    <%= contact.decorate.medium_icon_classes %>"> -
    +
    "> <%= "[DELETE] " if policy(contact).restore? && contact.deleted? %> diff --git a/app/views/case_contacts/_followup.html.erb b/app/views/case_contacts/_followup.html.erb index af56b14f68..6b1459b459 100644 --- a/app/views/case_contacts/_followup.html.erb +++ b/app/views/case_contacts/_followup.html.erb @@ -1,11 +1,9 @@ -<% if followup %> -
    +
    + <% if followup %> <%= button_to resolve_followup_path(followup), method: :patch, class: "main-btn btn-sm success-btn btn-hover", id:"resolve", data: { turbo: false } do %> Resolve Reminder <% end %> -
    -<% else %> -
    + <% else %> -
    -<% end %> + <% end %> +
    diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index 43eb27a8a8..516fcc2aa5 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -52,7 +52,7 @@ - Logo + Logo diff --git a/app/views/layouts/_banner.html.erb b/app/views/layouts/_banner.html.erb index f1814ebae5..48416a2b18 100644 --- a/app/views/layouts/_banner.html.erb +++ b/app/views/layouts/_banner.html.erb @@ -1,6 +1,6 @@ <% if @active_banner %>
    -
    +
    <%= @active_banner.content %>
    From fb988446a65dd6b79bfb40549ce15c4ce41f5562 Mon Sep 17 00:00:00 2001 From: Marco Roth Date: Fri, 27 Mar 2026 14:06:53 +0100 Subject: [PATCH 3/5] `input_tag` -> `tag.input` --- app/views/emancipations/show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/emancipations/show.html.erb b/app/views/emancipations/show.html.erb index 5c609970c8..fd04d05e12 100644 --- a/app/views/emancipations/show.html.erb +++ b/app/views/emancipations/show.html.erb @@ -18,7 +18,7 @@ <% @emancipation_form_data.each do |category| %>
    ">
    - <%= input_tag( + <%= tag.input( type: "checkbox", class: "emancipation-category-check-box form-check-input", value: category.id, @@ -34,7 +34,7 @@ <% category.emancipation_options.each do |option| %>
    <% if category.mutually_exclusive %> - <%= input_tag( + <%= tag.input( type: "radio", id: "O#{option.id}", class: "emancipation-radio-button", @@ -42,7 +42,7 @@ value: option.id, disabled: emancipation_category_checkbox_checked(@current_case, option)) %> <% else %> - <%= input_tag( + <%= tag.input( type: "checkbox", id: "O#{option.id}", class: "emancipation-option-check-box", From 96a8a8041c6848958b6a53af71794e144aa4dea2 Mon Sep 17 00:00:00 2001 From: Marco Roth Date: Fri, 27 Mar 2026 14:57:11 +0100 Subject: [PATCH 4/5] Keep `selected="selected"` --- app/views/all_casa_admins/patch_notes/_patch_note.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/all_casa_admins/patch_notes/_patch_note.html.erb b/app/views/all_casa_admins/patch_notes/_patch_note.html.erb index 70a8fad5b9..f1298e1779 100644 --- a/app/views/all_casa_admins/patch_notes/_patch_note.html.erb +++ b/app/views/all_casa_admins/patch_notes/_patch_note.html.erb @@ -5,7 +5,7 @@