Skip to content

Commit

Permalink
Add actions: false or set actions conditionally for summary lists
Browse files Browse the repository at this point in the history
  • Loading branch information
Kizr authored and ollietreend committed May 30, 2024
1 parent 975b46e commit 7bd4c4d
Show file tree
Hide file tree
Showing 33 changed files with 39 additions and 37 deletions.
1 change: 1 addition & 0 deletions app/views/claims/pages/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</p>

<%= govuk_summary_list(
actions: false,
rows: [
{ key: { text: "Service" }, value: { text: "Claims" } },
{ key: { text: "Signed in as" }, value: { text: current_user&.first_name } },
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/schools/_additional_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "additional-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "additional-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t("claims.schools.show.group")) %>
<% row.with_value(**summary_row_value(value: @school.group)) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/schools/_contact_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "contact-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "contact-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t("claims.schools.show.email_address")) %>
<% if @school.email_address.present? %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/schools/_ofsted_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "ofsted-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "ofsted-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t("claims.schools.show.rating")) %>
<% row.with_value(**summary_row_value(value: @school.rating, empty_text: t("claims.schools.show.unknown"))) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/schools/_send_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "send-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "send-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t("claims.schools.show.special_classes")) %>
<% row.with_value(**summary_row_value(value: @school.special_classes)) %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/claims/schools/claims/check.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<%= @claim.draft? ? t(".declaration") : t(".page_title") %>
</label>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: !@claim.draft?) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: Claims::Claim.human_attribute_name(:school)) %>
<% row.with_value(text: @school.name) %>
Expand Down Expand Up @@ -54,7 +54,7 @@

<h2 class="govuk-heading-m"><%= t(".hours_of_training") %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: !@claim.draft?) do |summary_list| %>
<% @claim.mentor_trainings.order_by_mentor_full_name.each do |mentor_training| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: mentor_training.mentor.full_name) %>
Expand All @@ -76,7 +76,7 @@
<% end %>

<h2 class="govuk-heading-m"><%= t(".grant_funding") %></h2>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".total_hours")) %>
<% row.with_value(text: pluralize(@claim.mentor_trainings.sum(:hours_completed), t(".hour"))) %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/claims/schools/claims/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<p class="govuk-body"><%= t(".submitted_by", name: @claim.submitted_by.full_name, date: l(@claim.submitted_on, format: :long)) %></p>
<% end %>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: @claim.draft?) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: Claims::Claim.human_attribute_name(:school)) %>
<% row.with_value(text: @school.name) %>
Expand Down Expand Up @@ -69,7 +69,7 @@
<% end %>

<h2 class="govuk-heading-m"><%= t(".hours_of_training") %></h2>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: @claim.draft?) do |summary_list| %>
<%= @claim.mentor_trainings.order_by_mentor_full_name.each do |mentor_training| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: mentor_training.mentor.full_name) %>
Expand All @@ -91,7 +91,7 @@
<% end %>

<h2 class="govuk-heading-m"><%= t(".grant_funding") %></h2>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".total_hours")) %>
<% row.with_value(text: pluralize(@claim.mentor_trainings.sum(:hours_completed), t(".hour"))) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/schools/mentors/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="govuk-grid-column-two-thirds">
<h2 class="govuk-heading-l"><%= @mentor.full_name %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: Mentor.human_attribute_name(:first_name)) %>
<% row.with_value(text: @mentor.first_name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/schools/users/check.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<%= t(".title") %>
</label>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: User.human_attribute_name("first_name")) %>
<% row.with_value(text: @user_form.first_name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/schools/users/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<span class="govuk-caption-l"><%= @school.name %></span>
<h2 class="govuk-heading-l"><%= @user.full_name %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: User.human_attribute_name(:first_name)) %>
<% row.with_value(text: @user.first_name) %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/claims/support/claims/_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: policy(claim).edit?) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: Claims::Claim.human_attribute_name(:school)) %>
<% row.with_value(text: govuk_link_to(claim.school.name, claims_support_school_path(claim.school))) %>
Expand Down Expand Up @@ -43,7 +43,7 @@
<% end %>

<h2 class="govuk-heading-m"><%= t(".hours_of_training") %></h2>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: policy(claim).edit?) do |summary_list| %>
<%= claim.mentor_trainings.order_by_mentor_full_name.each do |mentor_training| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: mentor_training.mentor.full_name) %>
Expand All @@ -64,7 +64,7 @@
<% end %>

<h2 class="govuk-heading-m"><%= t(".grant_funding") %></h2>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".total_hours")) %>
<% row.with_value(text: pluralize(claim.mentor_trainings.sum(:hours_completed), t(".hour"))) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/support/schools/_contact_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "contact-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "contact-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t("placements.support.schools.show.email_address")) %>
<% if @school.email_address.present? %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/support/schools/check.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<%= t(".contact_details") %>
</h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".telephone")) %>
<% row.with_value(text: @school.telephone) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/support/schools/claims/check.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<% end %>

<h2 class="govuk-heading-m"><%= t(".grant_funding") %></h2>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".total_hours")) %>
<% row.with_value(text: pluralize(@claim.mentor_trainings.sum(:hours_completed), t(".hour"))) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/support/schools/mentors/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<span class="govuk-caption-l"><%= t(".caption", school_name: @school.name) %></span>
<h2 class="govuk-heading-l"><%= @mentor.full_name %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: Mentor.human_attribute_name(:first_name)) %>
<% row.with_value(text: @mentor.first_name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/support/schools/users/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<span class="govuk-caption-l"><%= @school.name %></span>
<h2 class="govuk-heading-l"><%= @user.full_name %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: User.human_attribute_name(:first_name)) %>
<% row.with_value(text: @user.first_name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/claims/support/support_users/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l"><%= @support_user.full_name %></h1>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: User.human_attribute_name(:first_name)) %>
<% row.with_value(text: @support_user.first_name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/placements/organisations/users/_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: User.human_attribute_name(:first_name)) %>
<% row.with_value(text: @user.first_name) %>
Expand Down
1 change: 1 addition & 0 deletions app/views/placements/pages/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</p>

<%= govuk_summary_list(
actions: false,
rows: [
{ key: { text: "Service" }, value: { text: "Placements" } },
{ key: { text: "Signed in as" }, value: { text: current_user&.first_name } },
Expand Down
2 changes: 1 addition & 1 deletion app/views/placements/placements/_school_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%# locals: (school:, placement:) -%>
<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".establishment_group")) %>
<% row.with_value(text: school.group) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/placements/schools/mentors/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="govuk-grid-column-two-thirds">
<h2 class="govuk-heading-l"><%= @mentor.full_name %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: Mentor.human_attribute_name("first_name")) %>
<% row.with_value(text: @mentor.first_name) %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<span class="govuk-caption-l"><%= organisation.name %></span>
<h2 class="govuk-heading-l"><%= user.full_name %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".attributes.users.first_name")) %>
<% row.with_value(text: user.first_name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/placements/support/schools/mentors/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<span class="govuk-caption-l"><%= t(".caption", school_name: @school.name) %></span>
<h2 class="govuk-heading-l"><%= @mentor.full_name %></h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: Mentor.human_attribute_name("first_name")) %>
<% row.with_value(text: @mentor.first_name) %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<%= @placement.subject_names %>
</h2>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% if !@school.primary_or_secondary_only? %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".attributes.placements.school_level")) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/placements/support/support_users/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l"><%= @support_user.full_name %></h1>

<%= govuk_summary_list do |summary_list| %>
<%= govuk_summary_list(actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: User.human_attribute_name(:first_name)) %>
<% row.with_value(text: @support_user.first_name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/organisations/_contact_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "contact-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "contact-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".email_address")) %>
<% if organisation.email_address.present? %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/organisations/_grant_conditions.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if organisation.claims_grant_conditions_accepted_at %>
<%= govuk_summary_list(html_attributes: { id: "grant-conditions" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "grant-conditions" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".agreed_by")) %>
<% row.with_value(**summary_row_value(value: organisation.claims_grant_conditions_accepted_by&.full_name)) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/organisations/_grant_funding.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "grant-funding" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "grant-funding" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".region")) %>
<% row.with_value(**summary_row_value(value: "#{organisation.region.name} (#{organisation.town})")) %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "organisation-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "organisation-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".organisation_name")) %>
<% row.with_value(**summary_row_value(value: organisation.name)) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/schools/_additional_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "additional-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "additional-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".establishment_group")) %>
<% row.with_value(**summary_row_value(value: school.group)) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/schools/_location_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%# locals: (school:) -%>
<%= govuk_summary_list(html_attributes: { id: "location-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "location-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".address")) %>
<% row.with_value(**summary_row_value(value: school.formatted_address)) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/schools/_ofsted_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "ofsted-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "ofsted-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".rating")) %>
<% row.with_value(**summary_row_value(value: school.rating, empty_text: t(".unknown"))) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/schools/_send_details.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= govuk_summary_list(html_attributes: { id: "send-details" }) do |summary_list| %>
<%= govuk_summary_list(html_attributes: { id: "send-details" }, actions: false) do |summary_list| %>
<% summary_list.with_row do |row| %>
<% row.with_key(text: t(".special_classes")) %>
<% row.with_value(**summary_row_value(value: school.special_classes)) %>
Expand Down

0 comments on commit 7bd4c4d

Please sign in to comment.