Design review (#789)

app/views/locations/index.html.erb

@@ -13,6 +13,8 @@
 
 <%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
 
+<h2 class="govuk-visually-hidden">Locations</h2>
+
 <%= render SearchComponent.new(current_user:, search_label: "Search by location name or postcode", value: @searched) %>
 
 <%= govuk_section_break(visible: true, size: "m") %>

app/views/organisations/index.html.erb

@@ -5,8 +5,6 @@
 
 <%= render partial: "organisations/headings", locals: request.path == "/organisations" ? { main: "Organisations", sub: nil } : { main: @organisation.name, sub: "Organisations" } %>
 
-<h2 class="govuk-visually-hidden">Organisations</h2>
-
 <% if current_user.support? %>
   <%= govuk_button_link_to "Create a new organisation", new_organisation_path, html: { method: :get } %>
 <% end %>

app/views/organisations/logs.html.erb

@@ -5,11 +5,12 @@
 
 <%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
 
+<% if current_user.support? %>
   <%= render SubNavigationComponent.new(
     items: secondary_items(request.path, @organisation.id),
   ) %>
-
   <h2 class="govuk-visually-hidden">Logs</h2>
+<% end %>
 
 <div class="app-filter-layout" data-controller="filter-layout">
   <div class="govuk-button-group app-filter-toggle">

app/views/organisations/schemes.html.erb

@@ -3,17 +3,22 @@
 
 <% content_for :title, title %>
 
-<%= render partial: "organisations/headings", locals: current_user.support? ? { main: @organisation.name, sub: nil } : { main: "Schemes", sub: current_user.organisation.name } %>
+<%= render partial: "organisations/headings", locals: current_user.support? ? { main: @organisation.name, sub: nil } : { main: "Supported housing schemes", sub: current_user.organisation.name } %>
 
 <% if current_user.support? %>
   <%= render SubNavigationComponent.new(
     items: secondary_items(request.path, @organisation.id),
   ) %>
+  <h2 class="govuk-visually-hidden">Supported housing schemes</h2>
 <% end %>
 
 <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
 
-<h2 class="govuk-visually-hidden">Supported housing schemes</h2>
+<%= govuk_details(
+  classes: "govuk-!-width-two-thirds",
+  summary_text: "What is a supported housing scheme?",
+  text: "A supported housing scheme (also known as a ‘supported housing service’) provides shared or self-contained housing for a particular client group, for example younger or vulnerable people. A single scheme can contain multiple units, for example bedrooms in shared houses or a bungalow with 3 bedrooms.",
+) %>
 
 <%= render SearchComponent.new(current_user:, search_label: "Search by scheme name, code or postcode", value: @searched) %>
 

app/views/organisations/show.html.erb

@@ -8,9 +8,8 @@
   <%= render SubNavigationComponent.new(
     items: secondary_items(request.path, @organisation.id),
   ) %>
-<% end %>
-
   <h2 class="govuk-visually-hidden">About this organisation</h2>
+<% end %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds-from-desktop">

app/views/organisations/users.html.erb

@@ -5,11 +5,12 @@
 
 <%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
 
+<% if current_user.support? %>
   <%= render SubNavigationComponent.new(
     items: secondary_items(request.path, @organisation.id),
   ) %>
-
   <h2 class="govuk-visually-hidden">Users</h2>
+<% end %>
 
 <% if current_user.data_coordinator? || current_user.support? %>
   <%= govuk_button_link_to "Invite user", new_user_path(organisation_id: @organisation.id), html: { method: :get } %>

app/views/schemes/check_answers.html.erb

@@ -2,10 +2,10 @@
 <%= render partial: "organisations/headings", locals: { main: "Check your changes before creating this scheme", sub: @scheme.service_name } %>
 
 <%= form_for(@scheme, as: :scheme, method: :patch) do |f| %>
-  <div class="govuk-grid-row">
   <%= f.govuk_error_summary %>
   <%= govuk_tabs(title: "Check your answers before creating this scheme") do |component| %>
     <% component.tab(label: "Scheme") do %>
+      <h2 class="govuk-visually-hidden">Scheme</h2>
       <dl class="govuk-summary-list">
         <% @scheme.check_details_attributes.each do |attr| %>
           <% next if current_user.data_coordinator? && attr[:name] == ("owned by") %>
@@ -33,6 +33,7 @@
       </dl>
     <% end %>
     <% component.tab(label: "Locations") do %>
+      <h2 class="govuk-visually-hidden">Locations</h2>
       <%= govuk_table do |table| %>
         <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
           <strong><%= @scheme.locations.count %></strong> <%= @scheme.locations.count.eql?(1) ? "location" : "locations" %>
@@ -71,7 +72,6 @@
       <%= govuk_button_link_to "Add a location", new_location_path(id: @scheme.id), secondary: true %>
     <% end %>
   <% end %>
-  </div>
   <%= f.hidden_field :page, value: "check-answers" %>
   <%= f.hidden_field :confirmed, value: "true" %>
   <% button_label = @scheme.confirmed? ? "Save" : "Create scheme" %>

app/views/schemes/index.html.erb

@@ -5,8 +5,6 @@
 
 <%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Supported housing schemes", sub: nil } : { main: "Supported housing schemes", sub: current_user.organisation.name } %>
 
-<h2 class="govuk-visually-hidden">Supported housing schemes</h2>
-
 <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
 
 <%= render SearchComponent.new(current_user:, search_label: "Search by scheme name, code or postcode", value: @searched) %>

app/views/schemes/show.html.erb

@@ -12,7 +12,8 @@
 
 <%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
 
-<div class="govuk-grid-row">
+<h2 class="govuk-visually-hidden">Scheme</h2>
+
 <%= govuk_summary_list do |summary_list| %>
   <% @scheme.display_attributes.each do |attr| %>
     <% next if current_user.data_coordinator? && attr[:name] == ("Housing stock owned by") %>
@@ -23,4 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-</div>

app/views/users/index.html.erb

@@ -3,9 +3,7 @@
 
 <% content_for :title, title %>
 
-<%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Users", sub: nil } : { main: "User", sub: current_user.organisation.name } %>
-
-<h2 class="govuk-visually-hidden">Users</h2>
+<%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Users", sub: nil } : { main: "Users", sub: current_user.organisation.name } %>
 
 <% if current_user.data_coordinator? || current_user.support? %>
   <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>

config/locales/en.yml

@@ -325,7 +325,7 @@ en:
       name: "Location name (optional)"
       units: "Total number of units at this location"
       type_of_unit: "What is the most common type of unit at this location?"
-      startdate: "When did the first property in this location become available under this scheme?"
+      startdate: "When did the first property in this location become available under this scheme? (optional)"
       add_another_location: "Do you want to add another location?"
       mobility_type: "What are the mobility standards for the majority of units in this location?"
     descriptions:

spec/requests/organisations_controller_spec.rb

@@ -116,11 +116,6 @@ RSpec.describe OrganisationsController, type: :request do
           expect(page).to have_field("search", type: "search")
         end
 
-        it "has hidden accessibility field with description" do
-          expected_field = "<h2 class=\"govuk-visually-hidden\">Supported housing schemes</h2>"
-          expect(CGI.unescape_html(response.body)).to include(expected_field)
-        end
-
         it "shows only schemes belonging to the same organisation" do
           expect(page).to have_content(same_org_scheme.id_to_display)
           schemes.each do |scheme|

spec/requests/schemes_controller_spec.rb

@@ -93,11 +93,6 @@ RSpec.describe SchemesController, type: :request do
         expect(CGI.unescape_html(response.body)).to match("<strong>#{schemes.count}</strong> total schemes.")
       end
 
-      it "has hidden accebility field with description" do
-        expected_field = "<h2 class=\"govuk-visually-hidden\">Supported housing schemes</h2>"
-        expect(CGI.unescape_html(response.body)).to include(expected_field)
-      end
-
       context "when params scheme_id is present" do
         it "shows a success banner" do
           get "/schemes", params: { scheme_id: schemes.first.id }