From e80eba6e1b1ab1859392c8e62bbbb7f455b2be05 Mon Sep 17 00:00:00 2001
From: Frankie Roberto <frankie@frankieroberto.com>
Date: Tue, 3 Mar 2026 10:57:33 +0000
Subject: [PATCH 1/5] Fix 2 content bugs in Manage users

These 2 were accidentally not updated when updating the other views.
---
 app/views/user-admin/index.html   | 2 +-
 app/views/user-admin/invited.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/user-admin/index.html b/app/views/user-admin/index.html
index b33343c2..af9bf82d 100644
--- a/app/views/user-admin/index.html
+++ b/app/views/user-admin/index.html
@@ -92,7 +92,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
               Name
             </th>
             <th role="columnheader" class="" scope="col">
-              Email address
+              Email
             </th>
             <th role="columnheader" class="" scope="col">
               Vaccinator
diff --git a/app/views/user-admin/invited.html b/app/views/user-admin/invited.html
index 102f0bad..e17add10 100644
--- a/app/views/user-admin/invited.html
+++ b/app/views/user-admin/invited.html
@@ -70,7 +70,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
                         Email
                       </th>
                       <th role="columnheader" class="" scope="col">
-                        Clinician
+                        Vaccinator
                       </th>
                       <th role="columnheader" class="" scope="col">
                         Permission

From 4f35dc1b94f85f69ad083a685ad0963c2fc7981b Mon Sep 17 00:00:00 2001
From: Frankie Roberto <frankie@frankieroberto.com>
Date: Tue, 3 Mar 2026 11:06:00 +0000
Subject: [PATCH 2/5] Fix capitalisation

---
 app/views/user-admin/deactivated.html | 2 +-
 app/views/user-admin/invited.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/user-admin/deactivated.html b/app/views/user-admin/deactivated.html
index e2ff6a4b..77bfb418 100644
--- a/app/views/user-admin/deactivated.html
+++ b/app/views/user-admin/deactivated.html
@@ -54,7 +54,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
 
           <br>
 
-            <caption class="nhsuk-table__caption">3 Deactivated users</caption>
+            <caption class="nhsuk-table__caption">3 deactivated users</caption>
 
             <thead class="nhsuk-table__head" role="rowgroup">
                 <thead role="rowgroup" class="nhsuk-table__head">
diff --git a/app/views/user-admin/invited.html b/app/views/user-admin/invited.html
index e17add10..8bcc80f5 100644
--- a/app/views/user-admin/invited.html
+++ b/app/views/user-admin/invited.html
@@ -57,7 +57,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
             <br>
 
 
-            <caption class="nhsuk-table__caption">4 Invited users</caption>
+            <caption class="nhsuk-table__caption">4 invited users</caption>
 
             <thead class="nhsuk-table__head" role="rowgroup">
                 <thead role="rowgroup" class="nhsuk-table__head">

From eb57edb1a3d8ff58b21bcc8d6311d6f8ce4b4d61 Mon Sep 17 00:00:00 2001
From: Frankie Roberto <frankie@frankieroberto.com>
Date: Tue, 3 Mar 2026 12:46:19 +0000
Subject: [PATCH 3/5] Added size m to all captions

---
 app/views/user-admin/deactivated.html | 2 +-
 app/views/user-admin/invited.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/user-admin/deactivated.html b/app/views/user-admin/deactivated.html
index 77bfb418..24c67db5 100644
--- a/app/views/user-admin/deactivated.html
+++ b/app/views/user-admin/deactivated.html
@@ -54,7 +54,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
 
           <br>
 
-            <caption class="nhsuk-table__caption">3 deactivated users</caption>
+            <caption class="nhsuk-table__caption nhsuk-table__caption--m">3 deactivated users</caption>
 
             <thead class="nhsuk-table__head" role="rowgroup">
                 <thead role="rowgroup" class="nhsuk-table__head">
diff --git a/app/views/user-admin/invited.html b/app/views/user-admin/invited.html
index 8bcc80f5..755e501e 100644
--- a/app/views/user-admin/invited.html
+++ b/app/views/user-admin/invited.html
@@ -57,7 +57,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
             <br>
 
 
-            <caption class="nhsuk-table__caption">4 invited users</caption>
+            <caption class="nhsuk-table__caption nhsuk-table__caption--m">4 invited users</caption>
 
             <thead class="nhsuk-table__head" role="rowgroup">
                 <thead role="rowgroup" class="nhsuk-table__head">

From 1ee3488cb399ffa290c3e7f7104587a8b1994357 Mon Sep 17 00:00:00 2001
From: Frankie Roberto <frankie@frankieroberto.com>
Date: Tue, 3 Mar 2026 20:30:34 +0000
Subject: [PATCH 4/5] Refactor search filter into a partial

---
 app/views/user-admin/_search-filter.html | 23 ++++++++++++++++++++++
 app/views/user-admin/deactivated.html    | 19 +-----------------
 app/views/user-admin/index.html          | 25 ++----------------------
 app/views/user-admin/invited.html        | 21 +-------------------
 4 files changed, 27 insertions(+), 61 deletions(-)
 create mode 100644 app/views/user-admin/_search-filter.html

diff --git a/app/views/user-admin/_search-filter.html b/app/views/user-admin/_search-filter.html
new file mode 100644
index 00000000..2f245249
--- /dev/null
+++ b/app/views/user-admin/_search-filter.html
@@ -0,0 +1,23 @@
+<div class="app-filters nhsuk-u-margin-top-5">
+  <form action="/user-admin" method="get" novalidate>
+
+    {{ input({
+      name: "q",
+      value: data.q,
+      classes: "nhsuk-input--width-20",
+      label: {
+        text: "Search " + currentSubSection + " users by name or email"
+      },
+      formGroup: {
+        classes: "nhsuk-u-margin-bottom-0",
+        afterInput: {
+          html: button({
+            text: "Search",
+            classes: "nhsuk-button--secondary nhsuk-button--small"
+          })
+        }
+      }
+    }) }}
+
+  </form>
+</div>
diff --git a/app/views/user-admin/deactivated.html b/app/views/user-admin/deactivated.html
index 24c67db5..2601a7d7 100644
--- a/app/views/user-admin/deactivated.html
+++ b/app/views/user-admin/deactivated.html
@@ -25,24 +25,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
             <p>For security, we deactivate users who have not logged in for 90 days. <a href="/user-admin/reactivate-all">Reactivate users (2)</a></p>
       </div>
 
-      <div class="app-filters nhsuk-u-margin-top-5">
-        <form action="/user-admin" method="get" novalidate>
-          <div class="nhsuk-form-group nhsuk-u-margin-bottom-0">
-            <label class="nhsuk-label" for="q">
-              Search deactivated users by name or email
-            </label>
-            <input class="nhsuk-input nhsuk-input--width-20" id="q" name="q" type="search" value="{{ q }}">
-
-            {{ button({
-              text: "Search",
-              classes: "nhsuk-button--secondary nhsuk-u-margin-left-2 nhsuk-button--small"
-            })}}
-          </div>
-        </form>
-      </div>
-      <br>
-
-
+      {% include "user-admin/_search-filter.html" %}
 
       <div class="nhsuk-grid-row">
         <div class="nhsuk-grid-column-full">
diff --git a/app/views/user-admin/index.html b/app/views/user-admin/index.html
index af9bf82d..42e4a7f3 100644
--- a/app/views/user-admin/index.html
+++ b/app/views/user-admin/index.html
@@ -38,30 +38,9 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
             <p>For security, we deactivate users who have not logged in for 90 days. <a href="/user-admin/reactivate-all">Reactivate users (2)</a></p>
       </div>
 
+      {% include "user-admin/_search-filter.html" %}
+
 
-      <div class="app-filters nhsuk-u-margin-top-5">
-        <form action="/user-admin" method="get" novalidate>
-
-          {{ input({
-            name: "q",
-            value: data.q,
-            classes: "nhsuk-input--width-20",
-            label: {
-              text: "Search active users by name or email"
-            },
-            formGroup: {
-              classes: "nhsuk-u-margin-bottom-0",
-              afterInput: {
-                html: button({
-                  text: "Search",
-                  classes: "nhsuk-button--secondary nhsuk-button--small"
-                })
-              }
-            }
-          }) }}
-
-        </form>
-      </div>
 
       <br>
 
diff --git a/app/views/user-admin/invited.html b/app/views/user-admin/invited.html
index 755e501e..a628e7b3 100644
--- a/app/views/user-admin/invited.html
+++ b/app/views/user-admin/invited.html
@@ -25,26 +25,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
             <p>For security, we deactivate users who have not logged in for 90 days. <a href="/user-admin/reactivate-all">Reactivate users (2)</a></p>
       </div>
 
-
-      <div class="app-filters nhsuk-u-margin-top-5">
-        <form action="/user-admin" method="get" novalidate>
-          <div class="nhsuk-form-group nhsuk-u-margin-bottom-0">
-            <label class="nhsuk-label" for="q">
-              Search invited users by name or email
-            </label>
-            <input class="nhsuk-input nhsuk-input--width-20" id="q" name="q" type="search" value="{{ q }}">
-
-            {{ button({
-              text: "Search",
-              classes: "nhsuk-button--secondary nhsuk-u-margin-left-2 nhsuk-button--small"
-            })}}
-          </div>
-        </form>
-      </div>
-      <br>
-
-
-
+      {% include "user-admin/_search-filter.html" %}
 
       <div class="nhsuk-grid-row">
         <div class="nhsuk-grid-column-full">

From c3021c32d43502285a922d6b2b67c362a4aed90d Mon Sep 17 00:00:00 2001
From: Frankie Roberto <frankie@frankieroberto.com>
Date: Tue, 3 Mar 2026 20:36:42 +0000
Subject: [PATCH 5/5] Refactor deactivated users inset text

Use the Nunjucks macro, and refactor into a shared partial.
---
 app/views/user-admin/_deactivated-users-notice.html |  9 +++++++++
 app/views/user-admin/deactivated.html               |  6 +-----
 app/views/user-admin/index.html                     | 13 +------------
 app/views/user-admin/invited.html                   |  8 +-------
 4 files changed, 12 insertions(+), 24 deletions(-)
 create mode 100644 app/views/user-admin/_deactivated-users-notice.html

diff --git a/app/views/user-admin/_deactivated-users-notice.html b/app/views/user-admin/_deactivated-users-notice.html
new file mode 100644
index 00000000..c0e3097e
--- /dev/null
+++ b/app/views/user-admin/_deactivated-users-notice.html
@@ -0,0 +1,9 @@
+{# This should only be shown if there is more than 1 user deactivated due to inactivity #}
+{% set insetTextHtml %}
+  <p>For security, we deactivate users who have not logged in for 90 days. <a href="/user-admin/reactivate-all">Reactivate users (2)</a></p>
+{% endset %}
+
+{{ insetText({
+  html: insetTextHtml,
+  classes: "nhsuk-u-margin-top-0"
+}) }}
diff --git a/app/views/user-admin/deactivated.html b/app/views/user-admin/deactivated.html
index 2601a7d7..919065d6 100644
--- a/app/views/user-admin/deactivated.html
+++ b/app/views/user-admin/deactivated.html
@@ -19,11 +19,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
         "href": "/user-admin/add-user"
       }) }}
 
-      <div class="nhsuk-inset-text">
-        <span class="nhsuk-u-visually-hidden">Information: </span>
-
-            <p>For security, we deactivate users who have not logged in for 90 days. <a href="/user-admin/reactivate-all">Reactivate users (2)</a></p>
-      </div>
+      {% include "user-admin/_deactivated-users-notice.html" %}
 
       {% include "user-admin/_search-filter.html" %}
 
diff --git a/app/views/user-admin/index.html b/app/views/user-admin/index.html
index 42e4a7f3..b936dfd1 100644
--- a/app/views/user-admin/index.html
+++ b/app/views/user-admin/index.html
@@ -32,20 +32,9 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
         "href": "/user-admin/add-user"
       }) }}
 
-      <div class="nhsuk-inset-text">
-        <span class="nhsuk-u-visually-hidden">Information: </span>
-
-            <p>For security, we deactivate users who have not logged in for 90 days. <a href="/user-admin/reactivate-all">Reactivate users (2)</a></p>
-      </div>
-
+      {% include "user-admin/_deactivated-users-notice.html" %}
       {% include "user-admin/_search-filter.html" %}
 
-
-
-      <br>
-
-
-
       <div class="nhsuk-grid-row">
         <div class="nhsuk-grid-column-full">
 
diff --git a/app/views/user-admin/invited.html b/app/views/user-admin/invited.html
index a628e7b3..137ef9f2 100644
--- a/app/views/user-admin/invited.html
+++ b/app/views/user-admin/invited.html
@@ -18,13 +18,7 @@ <h1 class="nhsuk-heading-l">Manage users</h1>
         "href": "/user-admin/add-user"
       }) }}
 
-
-      <div class="nhsuk-inset-text">
-        <span class="nhsuk-u-visually-hidden">Information: </span>
-
-            <p>For security, we deactivate users who have not logged in for 90 days. <a href="/user-admin/reactivate-all">Reactivate users (2)</a></p>
-      </div>
-
+      {% include "user-admin/_deactivated-users-notice.html" %}
       {% include "user-admin/_search-filter.html" %}
 
       <div class="nhsuk-grid-row">