From e3006f62b2987eeedc7b47fc61a1837ece211818 Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Fri, 21 Aug 2020 16:52:35 +0100
Subject: [PATCH] Ensure H2 headings follow H1 headings

We had some cases where an H3 heading followed an H1. This was flagged
as something to change in the accessibility report.
---
 app/assets/stylesheets/views/users.scss                     | 2 +-
 app/templates/views/manage-users.html                       | 4 ++--
 .../views/organisations/organisation/users/index.html       | 4 ++--
 app/templates/views/service-settings/email_reply_to.html    | 4 ++--
 app/templates/views/service-settings/sms-senders.html       | 4 ++--
 tests/app/main/views/test_manage_users.py                   | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss
index 259d14bcc..4abef1993 100644
--- a/app/assets/stylesheets/views/users.scss
+++ b/app/assets/stylesheets/views/users.scss
@@ -11,7 +11,7 @@ $item-top-padding: govuk-spacing(3);
     border-top: 1px solid $border-colour;
     position: relative;
 
-    h3 {
+    &-heading {
 
       padding-right: govuk-spacing(3);
       white-space: nowrap;
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index afbe972a7..444361dcc 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -22,7 +22,7 @@
   <div class="user-list">
     {% for user in users %}
       <div class="user-list-item">
-        <h3 title="{{ user.email_address }}">
+        <h2 class="user-list-item-heading" title="{{ user.email_address }}">
           {%- if user.name -%}
             <span class="heading-small live-search-relevant">{{ user.name }}</span>&ensp;
           {%- endif -%}
@@ -37,7 +37,7 @@
               <span class="live-search-relevant">{{ user.email_address }}</span>
             {% endif %}
           </span>
-        </h3>
+        </h2>
         <ul class="tick-cross-list govuk-grid-row">
           <div class="tick-cross-list-permissions govuk-grid-column-three-quarters">
             {% for permission, label in permissions %}
diff --git a/app/templates/views/organisations/organisation/users/index.html b/app/templates/views/organisations/organisation/users/index.html
index 1c95f8046..7adb139f9 100644
--- a/app/templates/views/organisations/organisation/users/index.html
+++ b/app/templates/views/organisations/organisation/users/index.html
@@ -25,7 +25,7 @@
   <div class="user-list">
     {% for user in users %}
       <div class="user-list-item">
-        <h3>
+        <h2 class="user-list-item-heading">
           {%- if user.name -%}
             <span class="heading-small">{{ user.name }}</span>&ensp;
           {%- endif -%}
@@ -40,7 +40,7 @@
               {{ user.email_address }}
             {% endif %}
           </span>
-        </h3>
+        </h2>
         <ul class="tick-cross-list">
           <li class="tick-cross-list-edit-link">
             {% if user.status == 'pending' %}
diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html
index 67a929840..374386dd2 100644
--- a/app/templates/views/service-settings/email_reply_to.html
+++ b/app/templates/views/service-settings/email_reply_to.html
@@ -23,13 +23,13 @@
     {% endif %}
     {% for item in current_service.email_reply_to_addresses %}
       <div class="user-list-item">
-        <h3>
+        <h2 class="user-list-item-heading">
           <span class="heading-small">{{ item.email_address }}</span>&ensp;<span class="hint">
             {%- if item.is_default -%}
               (default)
             {% endif %}
           </span>
-        </h3>
+        </h2>
         {% if current_user.has_permissions('manage_service') %}
           <a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">Change</a>
         {% endif %}
diff --git a/app/templates/views/service-settings/sms-senders.html b/app/templates/views/service-settings/sms-senders.html
index 759311d93..097a254de 100644
--- a/app/templates/views/service-settings/sms-senders.html
+++ b/app/templates/views/service-settings/sms-senders.html
@@ -23,7 +23,7 @@
     {% endif %}
     {% for item in current_service.sms_senders_with_hints %}
       <div class="user-list-item">
-        <h3>
+        <h2 class="user-list-item-heading">
           <span class="heading-small">{{ item.sms_sender }}</span>
           {% if item.hint %}
             &ensp;
@@ -31,7 +31,7 @@
               {{ item.hint }}
             </span>
           {% endif %}
-        </h3>
+        </h2>
         {% if current_user.has_permissions('manage_service') %}
           <a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.service_edit_sms_sender', service_id=current_service.id, sms_sender_id = item.id) }}">Change</a>
         {% endif %}
diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py
index e09fd98ff..39a48d5ae 100644
--- a/tests/app/main/views/test_manage_users.py
+++ b/tests/app/main/views/test_manage_users.py
@@ -1170,7 +1170,7 @@ def test_manage_user_page_shows_how_many_folders_user_can_view(
 
     page = client_request.get('main.manage_users', service_id=service_one['id'])
 
-    user_div = page.select_one("h3[title='notify@digital.cabinet-office.gov.uk']").parent
+    user_div = page.select_one("h2[title='notify@digital.cabinet-office.gov.uk']").parent
     assert user_div.select_one('.tick-cross-list-hint:last-child').text.strip() == expected_message
 
 
@@ -1187,7 +1187,7 @@ def test_manage_user_page_doesnt_show_folder_hint_if_service_has_no_folders(
 
     page = client_request.get('main.manage_users', service_id=service_one['id'])
 
-    user_div = page.select_one("h3[title='notify@digital.cabinet-office.gov.uk']").parent
+    user_div = page.select_one("h2[title='notify@digital.cabinet-office.gov.uk']").parent
     assert user_div.find('.tick-cross-list-hint:last-child') is None
 
 
@@ -1206,7 +1206,7 @@ def test_manage_user_page_doesnt_show_folder_hint_if_service_cant_edit_folder_pe
 
     page = client_request.get('main.manage_users', service_id=service_one['id'])
 
-    user_div = page.select_one("h3[title='notify@digital.cabinet-office.gov.uk']").parent
+    user_div = page.select_one("h2[title='notify@digital.cabinet-office.gov.uk']").parent
     assert user_div.find('.tick-cross-list-hint:last-child') is None