From 3f413bc74283b1ae1c4a179d73fa44d3ab285306 Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Tue, 19 Sep 2023 12:14:00 +0100
Subject: [PATCH 1/9] <fieldset> structures within the catalogue search results
 page.

---
 templates/search/blocks/search_filters.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index ed8b0818f..9fc46e9d8 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -54,7 +54,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                         <div>{{ form.covering_date_from.label_tag }}</div>
 
                         <div class="search-filters__creation-date-section">
-                            
+                            <fieldset>
                             {% if form.covering_date_from.errors %}
                                 <div
                                     data-tracking-errors
@@ -64,9 +64,11 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                                 </div>
                             {% endif %}
                             {{ form.covering_date_from }}
+                            </fieldset>
                         </div>
 
                         <div class="search-filters__creation-date-section">
+                            <fieldset>
                             {{ form.covering_date_to.label_tag }}
                             {% if form.covering_date_to.errors %}
                                 <div
@@ -77,6 +79,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                                 </div>
                             {% endif %}
                             {{ form.covering_date_to }}
+                            </fieldset>
                         </div>
 
                         <input type="submit" value="Update" class="search-filters__submit">
@@ -111,6 +114,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                         </legend>
 
                         <div class="search-filters__opening-date-section">
+                            <fieldset>
                             <span class="example-text">For example, 27 3 2007</span><br>
                             {{ form.opening_start_date.label_tag }}
                             {% if form.opening_start_date.errors %}
@@ -122,10 +126,12 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                                 </div>
                             {% endif %}
                             {{ form.opening_start_date }}
+                            </fieldset>
                         </div>
                         
 
                         <div class="search-filters__opening-date-section">
+                            <fieldset>
                             {{ form.opening_end_date.label_tag }}
                             {% if form.opening_end_date.errors %}
                                 <div
@@ -136,6 +142,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                                 </div>
                             {% endif %}
                             {{ form.opening_end_date }}
+                            </fieldset>
                         </div>
 
                         <input type="submit" value="Update" class="search-filters__submit">

From f5bbc28cb7927cacf5aebecccea68e624b5abd6a Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Wed, 20 Sep 2023 10:36:43 +0100
Subject: [PATCH 2/9] adding in role="group" to fieldsets

---
 templates/search/blocks/search_filters.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index 9fc46e9d8..74effbb41 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -45,7 +45,7 @@ <h3 class="tna-heading sr-only">Edit filters</h3>
 
             {% if form.group.value == 'tna' or form.group.value == 'digitised' or form.group.value == 'nonTna' %}
                 <div class="search-filters__accordion-section">
-                    <fieldset>
+                    <fieldset role="group">
                         <legend>
                             <h4 class="tna-heading search-filters__accordion-section-heading" id="record_covering_date">Dates</h4>
                         </legend>
@@ -54,7 +54,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                         <div>{{ form.covering_date_from.label_tag }}</div>
 
                         <div class="search-filters__creation-date-section">
-                            <fieldset>
+                            <fieldset role="group">
                             {% if form.covering_date_from.errors %}
                                 <div
                                     data-tracking-errors
@@ -68,7 +68,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                         </div>
 
                         <div class="search-filters__creation-date-section">
-                            <fieldset>
+                            <fieldset role="group">
                             {{ form.covering_date_to.label_tag }}
                             {% if form.covering_date_to.errors %}
                                 <div
@@ -108,13 +108,13 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
 
             {% if form.group.value == 'tna' or form.group.value == 'digitised' %}
                 <div class="search-filters__accordion-section">
-                    <fieldset>
+                    <fieldset role="group">
                         <legend>
                             <h4 class="tna-heading search-filters__accordion-section-heading" id="record_opening_date">Record opening date</h4>
                         </legend>
 
                         <div class="search-filters__opening-date-section">
-                            <fieldset>
+                            <fieldset role="group">
                             <span class="example-text">For example, 27 3 2007</span><br>
                             {{ form.opening_start_date.label_tag }}
                             {% if form.opening_start_date.errors %}
@@ -131,7 +131,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                         
 
                         <div class="search-filters__opening-date-section">
-                            <fieldset>
+                            <fieldset role="group">
                             {{ form.opening_end_date.label_tag }}
                             {% if form.opening_end_date.errors %}
                                 <div

From bdee317a812ca6a5d073df2f2300ff5e11b3541e Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Wed, 20 Sep 2023 10:39:58 +0100
Subject: [PATCH 3/9] fieldset roles

---
 templates/search/blocks/search_filters.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index 74effbb41..e87705d83 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -173,3 +173,4 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
 
     {% comment %} {% include './search_export_and_share.html' %} {% endcomment %}
 </div>
+

From 48e4e7d8e62b4777e26c24f0a50673d9fbaf4259 Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Wed, 20 Sep 2023 11:02:36 +0100
Subject: [PATCH 4/9] aria roles and id's

---
 templates/search/blocks/search_filters.html | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index e87705d83..5460e6837 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -53,8 +53,8 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                         <span class="example-text">For example, 27 3 2007</span>
                         <div>{{ form.covering_date_from.label_tag }}</div>
 
-                        <div class="search-filters__creation-date-section">
-                            <fieldset role="group">
+                        <div class="search-filters__creation-date-section" id="from-date">
+                            <fieldset role="group" aria-describedby="from-date">
                             {% if form.covering_date_from.errors %}
                                 <div
                                     data-tracking-errors
@@ -67,8 +67,8 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                             </fieldset>
                         </div>
 
-                        <div class="search-filters__creation-date-section">
-                            <fieldset role="group">
+                        <div class="search-filters__creation-date-section" id="to-date">
+                            <fieldset role="group" aria-describedby="to-date">
                             {{ form.covering_date_to.label_tag }}
                             {% if form.covering_date_to.errors %}
                                 <div
@@ -113,8 +113,8 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                             <h4 class="tna-heading search-filters__accordion-section-heading" id="record_opening_date">Record opening date</h4>
                         </legend>
 
-                        <div class="search-filters__opening-date-section">
-                            <fieldset role="group">
+                        <div class="search-filters__opening-date-section" id="opening-start-date">
+                            <fieldset role="group" aria-describedby="opening-start-date">
                             <span class="example-text">For example, 27 3 2007</span><br>
                             {{ form.opening_start_date.label_tag }}
                             {% if form.opening_start_date.errors %}
@@ -130,8 +130,8 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                         </div>
                         
 
-                        <div class="search-filters__opening-date-section">
-                            <fieldset role="group">
+                        <div class="search-filters__opening-date-section" id="opening-end-date">
+                            <fieldset role="group" aria-describedby="opening-end-date">
                             {{ form.opening_end_date.label_tag }}
                             {% if form.opening_end_date.errors %}
                                 <div
@@ -173,4 +173,3 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
 
     {% comment %} {% include './search_export_and_share.html' %} {% endcomment %}
 </div>
-

From a18fb1a1260aef05f6f3cdee63bf495eb1dad697 Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Wed, 20 Sep 2023 11:16:25 +0100
Subject: [PATCH 5/9] removal of unreferenced class

---
 templates/search/blocks/search_filters.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index 5460e6837..15f9d06dc 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -53,7 +53,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                         <span class="example-text">For example, 27 3 2007</span>
                         <div>{{ form.covering_date_from.label_tag }}</div>
 
-                        <div class="search-filters__creation-date-section" id="from-date">
+                        <div id="from-date">
                             <fieldset role="group" aria-describedby="from-date">
                             {% if form.covering_date_from.errors %}
                                 <div
@@ -67,7 +67,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                             </fieldset>
                         </div>
 
-                        <div class="search-filters__creation-date-section" id="to-date">
+                        <div id="to-date">
                             <fieldset role="group" aria-describedby="to-date">
                             {{ form.covering_date_to.label_tag }}
                             {% if form.covering_date_to.errors %}

From be9c89af1b966998a5ddd5930b80b1eaf8b8e9cf Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Wed, 20 Sep 2023 13:50:15 +0100
Subject: [PATCH 6/9] removing nested <fieldset>'s

---
 templates/search/blocks/search_filters.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index 15f9d06dc..ffb1191f7 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -54,7 +54,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                         <div>{{ form.covering_date_from.label_tag }}</div>
 
                         <div id="from-date">
-                            <fieldset role="group" aria-describedby="from-date">
+
                             {% if form.covering_date_from.errors %}
                                 <div
                                     data-tracking-errors
@@ -64,11 +64,11 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                                 </div>
                             {% endif %}
                             {{ form.covering_date_from }}
-                            </fieldset>
+
                         </div>
 
                         <div id="to-date">
-                            <fieldset role="group" aria-describedby="to-date">
+
                             {{ form.covering_date_to.label_tag }}
                             {% if form.covering_date_to.errors %}
                                 <div
@@ -79,7 +79,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
                                 </div>
                             {% endif %}
                             {{ form.covering_date_to }}
-                            </fieldset>
+
                         </div>
 
                         <input type="submit" value="Update" class="search-filters__submit">
@@ -114,7 +114,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                         </legend>
 
                         <div class="search-filters__opening-date-section" id="opening-start-date">
-                            <fieldset role="group" aria-describedby="opening-start-date">
+
                             <span class="example-text">For example, 27 3 2007</span><br>
                             {{ form.opening_start_date.label_tag }}
                             {% if form.opening_start_date.errors %}
@@ -126,12 +126,12 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                                 </div>
                             {% endif %}
                             {{ form.opening_start_date }}
-                            </fieldset>
+
                         </div>
                         
 
                         <div class="search-filters__opening-date-section" id="opening-end-date">
-                            <fieldset role="group" aria-describedby="opening-end-date">
+
                             {{ form.opening_end_date.label_tag }}
                             {% if form.opening_end_date.errors %}
                                 <div
@@ -142,7 +142,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                                 </div>
                             {% endif %}
                             {{ form.opening_end_date }}
-                            </fieldset>
+                            
                         </div>
 
                         <input type="submit" value="Update" class="search-filters__submit">

From 37507f370a9145a3cb1bb79e43d42800c3ceef15 Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Wed, 20 Sep 2023 14:33:50 +0100
Subject: [PATCH 7/9] fieldset refactoring

---
 templates/search/blocks/search_filters.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index ffb1191f7..0005dd284 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -44,8 +44,8 @@ <h2 class="tna-heading search-filters__heading">Refine results</h2>
             <h3 class="tna-heading sr-only">Edit filters</h3>
 
             {% if form.group.value == 'tna' or form.group.value == 'digitised' or form.group.value == 'nonTna' %}
-                <div class="search-filters__accordion-section">
-                    <fieldset role="group">
+                <div class="search-filters__accordion-section" id="from-and-to-dates">
+                    <fieldset role="group" aria-describedby="from-and-to-dates">
                         <legend>
                             <h4 class="tna-heading search-filters__accordion-section-heading" id="record_covering_date">Dates</h4>
                         </legend>
@@ -67,7 +67,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
 
                         </div>
 
-                        <div id="to-date">
+                        <div>
 
                             {{ form.covering_date_to.label_tag }}
                             {% if form.covering_date_to.errors %}
@@ -107,8 +107,8 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
 
 
             {% if form.group.value == 'tna' or form.group.value == 'digitised' %}
-                <div class="search-filters__accordion-section">
-                    <fieldset role="group">
+                <div class="search-filters__accordion-section" id="opening-and-closing-dates">
+                    <fieldset role="group" aria-describedby="opening-and-closing-dates">
                         <legend>
                             <h4 class="tna-heading search-filters__accordion-section-heading" id="record_opening_date">Record opening date</h4>
                         </legend>
@@ -130,7 +130,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                         </div>
                         
 
-                        <div class="search-filters__opening-date-section" id="opening-end-date">
+                        <div class="search-filters__opening-date-section">
 
                             {{ form.opening_end_date.label_tag }}
                             {% if form.opening_end_date.errors %}
@@ -142,7 +142,7 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_ope
                                 </div>
                             {% endif %}
                             {{ form.opening_end_date }}
-                            
+
                         </div>
 
                         <input type="submit" value="Update" class="search-filters__submit">

From bf1c4db98bec769bbca95ddac38b3a2d5e49cb84 Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Thu, 21 Sep 2023 10:50:02 +0100
Subject: [PATCH 8/9] fieldset amendments

---
 templates/search/blocks/search_filters.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index 0005dd284..f5d45293d 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -44,16 +44,16 @@ <h2 class="tna-heading search-filters__heading">Refine results</h2>
             <h3 class="tna-heading sr-only">Edit filters</h3>
 
             {% if form.group.value == 'tna' or form.group.value == 'digitised' or form.group.value == 'nonTna' %}
-                <div class="search-filters__accordion-section" id="from-and-to-dates">
-                    <fieldset role="group" aria-describedby="from-and-to-dates">
+                <div class="search-filters__accordion-section">
+                    <fieldset role="group" aria-describedby="from-date">
                         <legend>
                             <h4 class="tna-heading search-filters__accordion-section-heading" id="record_covering_date">Dates</h4>
                         </legend>
 
-                        <span class="example-text">For example, 27 3 2007</span>
+                        <span class="example-text" id="from-date">For example, 27 3 2007</span>
                         <div>{{ form.covering_date_from.label_tag }}</div>
 
-                        <div id="from-date">
+                        <div>
 
                             {% if form.covering_date_from.errors %}
                                 <div

From 9e7449d27ebc7cecc6fa116f369e5d7d32a58664 Mon Sep 17 00:00:00 2001
From: JohnHeeryTNA <john.heery@nationalarchives.gov.uk>
Date: Thu, 21 Sep 2023 15:04:23 +0100
Subject: [PATCH 9/9] fieldset amendments

---
 templates/search/blocks/search_filters.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index f5d45293d..0b9984540 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -107,15 +107,15 @@ <h4 class="tna-heading search-filters__accordion-section-heading" id="record_cov
 
 
             {% if form.group.value == 'tna' or form.group.value == 'digitised' %}
-                <div class="search-filters__accordion-section" id="opening-and-closing-dates">
-                    <fieldset role="group" aria-describedby="opening-and-closing-dates">
+                <div class="search-filters__accordion-section">
+                    <fieldset role="group" aria-describedby="opening-start-date">
                         <legend>
                             <h4 class="tna-heading search-filters__accordion-section-heading" id="record_opening_date">Record opening date</h4>
                         </legend>
 
-                        <div class="search-filters__opening-date-section" id="opening-start-date">
+                        <div class="search-filters__opening-date-section">
 
-                            <span class="example-text">For example, 27 3 2007</span><br>
+                            <span class="example-text" id="opening-start-date">For example, 27 3 2007</span><br>
                             {{ form.opening_start_date.label_tag }}
                             {% if form.opening_start_date.errors %}
                                 <div