From 4f32ec435f1de914391f7b2bfced697c4e7c7ac2 Mon Sep 17 00:00:00 2001
From: TNA-Allan <96120886+TNA-Allan@users.noreply.github.com>
Date: Tue, 2 Jan 2024 16:05:05 +0000
Subject: [PATCH] CHORE: sync 22 12 2023 - develop into etna-rosetta (#1499)

Co-authored-by: Andrew Hosgood <andrew.hosgood@nationalarchives.gov.uk>
Co-authored-by: GitHub Action <webmaster@nationalarchives.gov.uk>
Co-authored-by: JohnHeeryTNA <110600556+JohnHeeryTNA@users.noreply.github.com>
---
 pyproject.toml                                |   2 +-
 .../search/_catalogue-search-grid.scss        |   2 +-
 sass/includes/search/_search-results.scss     |   1 +
 .../search/_search-results__list-card.scss    |   2 +-
 .../includes/records/record-details.html      | 538 ++++++++++--------
 templates/records/record_detail.html          |  10 +-
 templates/search/blocks/search_filters.html   |   4 +-
 .../search_results__list-card--grid.html      |  57 +-
 .../blocks/search_results__list-card.html     |  35 +-
 .../blocks/search_sort_and_view_options.html  |   4 +-
 templates/search/featured_search.html         |   7 +-
 .../search/includes/results-details.html      |  57 ++
 12 files changed, 368 insertions(+), 351 deletions(-)
 create mode 100644 templates/search/includes/results-details.html

diff --git a/pyproject.toml b/pyproject.toml
index ddca0f661..d67da5353 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Etna"
-version = "23.12.05.25"
+version = "23.12.13.26"
 description = ""
 authors = ["James Biggs <james.biggs@nationalarchives.gov.uk>"]
 
diff --git a/sass/includes/search/_catalogue-search-grid.scss b/sass/includes/search/_catalogue-search-grid.scss
index 5fa76c155..96c41e6a0 100644
--- a/sass/includes/search/_catalogue-search-grid.scss
+++ b/sass/includes/search/_catalogue-search-grid.scss
@@ -20,7 +20,7 @@
 
     &__sidebar {
         -ms-grid-column: 1;
-        min-width: 300px;
+        min-width: 320px;
         @media only screen and (max-width: $screen__xl) {
             grid-column: 1 / -1;
             -ms-grid-column: 1;
diff --git a/sass/includes/search/_search-results.scss b/sass/includes/search/_search-results.scss
index 25d227c10..20dff184d 100644
--- a/sass/includes/search/_search-results.scss
+++ b/sass/includes/search/_search-results.scss
@@ -162,6 +162,7 @@
             margin-left: 2rem;
             margin-right: 2rem;
             display: block;
+            padding-top: 1rem;
         }
     }
 }
diff --git a/sass/includes/search/_search-results__list-card.scss b/sass/includes/search/_search-results__list-card.scss
index 4fd845794..27af75154 100644
--- a/sass/includes/search/_search-results__list-card.scss
+++ b/sass/includes/search/_search-results__list-card.scss
@@ -270,7 +270,7 @@ dd {
 
 .featured-search__website-results__head {
     @media only screen and (min-width: #{$screen__md + 1px}) {
-        padding-left: 1em;
+        padding-left: 1.75em;
         padding-bottom: 1em;
     }
 }
diff --git a/templates/includes/records/record-details.html b/templates/includes/records/record-details.html
index 931ff0bbb..312f1e239 100644
--- a/templates/includes/records/record-details.html
+++ b/templates/includes/records/record-details.html
@@ -1,255 +1,293 @@
 {% load records_tags %}
 
-<div class="record-details">
-    <table class="record-details__table">
-        <tbody>
-            {% if record.reference_number %}
-                <tr>
-                    <th scope="row">{{ 'reference_number'|as_label }}</th>
-                    <td id="analytics-record-reference">{{ record.reference_number }}</td>
-                </tr>
-            {% endif %}
-            {% if record.title %}
-            <tr>
-                <th scope="row">{{ 'title'|as_label }}</th>
-                <td id="analytics-record-reference">{{ record.title }}</td>
-            </tr>
-            {% endif %}
-            {% if record.date_created %}
-                <tr>
-                    <th scope="row">{{ 'date_created'|as_label }}</th>
-                    <td>{{ record.date_created }}</td>
-                </tr>
-            {% endif %}
-            {% if record.description %}
-                <tr>
-                    <th scope="row">{{ 'description'|as_label }}</th>
-                    <td class="xslt_patches">{{ record.description }}</td>
-                </tr>
-            {% endif %}
-            {% if record.note %}
-                <tr>
-                    <th scope="row">{{ 'note'|as_label }}</th>
-                    <td>
-                        {{ record.note }}
-                    </td>
-                </tr>
-            {% endif %}                        
-            {% if record.arrangement %}
-                <tr>
-                    <th scope="row">{{ 'arrangement'|as_label }}</th>
-                    <td>{{ record.arrangement }}</td>
-                </tr>
-            {% endif %}
-            {% if record.related_materials %}
-                <tr>
-                    <th scope="row">{{ 'related_materials'|as_label }}</th>
-                    <td>
-                        {% for related_material in record.related_materials %}
-                            {% if related_material.description %}
-                                <p>{{related_material.description}}
-                                {% if related_material.links %}
-                                    {% for link in related_material.links %}
-                                        <a href="{{ link.href }}">{{ link.text }}</a>
-                                    {% endfor %}
-                                {% endif %}
-                                </p>
-                            {% endif %}
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}            
-            {% if record.separated_materials %}
-                <tr>
-                    <th scope="row">{{ 'separated_materials'|as_label }}</th>
-                    <td>
-                        {% if record.separated_materials.description %}
-                            <p>{{ record.separated_materials.description }}</p>
-                        {% endif %}
-                        {% for link in record.separated_materials.links %}
-                            <p><a href="{{ link.href }}">{{ link.text }}</a></p>
+{% if record.reference_number %}
+    <tr>
+        <th scope="row">{{ 'reference_number'|as_label }}</th>
+        <td id="analytics-record-reference">{{ record.reference_number }}</td>
+    </tr>
+{% endif %}
+
+{% if record.title %}
+    <tr>
+        <th scope="row">{{ 'title'|as_label }}</th>
+        <td id="analytics-record-reference">{{ record.title }}</td>
+    </tr>
+{% endif %}
+
+{% if record.date_created %}
+    <tr>
+        <th scope="row">{{ 'date_created'|as_label }}</th>
+        <td>{{ record.date_created }}</td>
+    </tr>
+{% endif %}
+
+{% if record.description %}
+    <tr>
+        <th scope="row">{{ 'description'|as_label }}</th>
+        <td class="xslt_patches">{{ record.description }}</td>
+    </tr>
+{% endif %}
+
+{% if record.note %}
+    <tr>
+        <th scope="row">{{ 'note'|as_label }}</th>
+        <td>
+            {% for item in record.note %}
+                <p>{{ item }}</p>
+            {% endfor %}
+        </td>
+    </tr>
+{% endif %} 
+
+{% if record.arrangement %}
+    <tr>
+        <th scope="row">{{ 'arrangement'|as_label }}</th>
+        <td>{{ record.arrangement }}</td>
+    </tr>
+{% endif %}
+
+{% if record.related_materials %}
+    <tr>
+        <th scope="row">{{ 'related_materials'|as_label }}</th>
+        <td>
+            {% for related_material in record.related_materials %}
+                {% if related_material.description %}
+                    <p>{{related_material.description}}
+                    {% if related_material.links %}
+                        {% for link in related_material.links %}
+                            <a href="{{ link.href }}">{{ link.text }}</a>
                         {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if record.held_by %}
-                <tr>
-                    <th scope="row">{{ 'held_by'|as_label }}</th>
-                    <td>
-                    {% if record.held_by_url %}
-                        <a href="{{ record.held_by_url }}">{{ record.held_by }}</a>
-                    {% else %}
-                        {{ record.held_by }}
                     {% endif %}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if record.former_department_reference %}
-                <tr>
-                    <th scope="row">{{ 'former_department_reference'|as_label }}</th>
-                    <td>{{ record.former_department_reference }}</td>
-                </tr>
-            {% endif %}
-            {% if record.former_pro_reference %}
-                <tr>
-                    <th scope="row">{{ 'former_pro_reference'|as_label }}</th>
-                    <td>{{ record.former_pro_reference }}</td>
-                </tr>
-            {% endif %}
-            {% if record.location_of_originals %}
-                <tr>
-                    <th scope="row">{{ 'location_of_originals'|as_label }}</th>
-                    <td>
-                        {{ record.location_of_originals }}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if record.legal_status %}
-                <tr>
-                    <th scope="row">{{ 'legal_status'|as_label }}</th>
-                    <td>{{ record.legal_status }}</td>
-                </tr>
-            {% endif %}
-            {% if record.language %}
-                <tr>
-                    <th scope="row">{{ 'language'|as_label }}</th>
-                    <td>
-                    {% for item in record.language %}
-                        <p>{{ item }}</p>
-                    {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if record.map_designation %}
-                <tr>
-                    <th scope="row">{{ 'map_designation'|as_label }}</th>
-                    <<td>{{ record.map_designation }}</td>
-                </tr>
-            {% endif %}
-            {% if record.creator %}
-                <tr>
-                    <th scope="row">{{ 'creator'|as_label }}</th>
-                    <td>
-                    {% for item in record.creator %}
-                        <p>{{ item }}</p>
-                    {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if record.physical_description %}
-                <tr>
-                    <th scope="row">{{ 'physical_description'|as_label }}</th>
-                    <td>{{ record.physical_description }}</td>
-                </tr>
-            {% endif %}           
-            {% if record.restrictions_on_use %}
-                <tr>
-                    <th scope="row">{{ 'restrictions_on_use'|as_label }}</th>
-                    <td>{{ record.restrictions_on_use }}</td>
-                </tr>
-            {% endif %}
-            {% if record.dimensions %}
-                <tr>
-                    <th scope="row">{{ 'dimensions'|as_label }}</th>
-                    <td>{{ record.dimensions }}</td>
-                </tr>
-            {% endif %}
-            {% if record.access_conditions %}
-                <tr>
-                    <th scope="row">{{ 'access_conditions'|as_label }}</th>
-                    <td>{{ record.access_conditions }}</td>
-                </tr>
-            {% endif %}
-            {% if record.immediate_source_of_acquisition %}
-                <tr>
-                    <th scope="row">{{ 'immediate_source_of_acquisition'|as_label }}</th>
-                    <td>
-                    {% for item in record.immediate_source_of_acquisition %}
-                        <p>{{ item }}</p>
+                    </p>
+                {% endif %}
+            {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.separated_materials %}
+    <tr>
+        <th scope="row">{{ 'separated_materials'|as_label }}</th>
+        <td>
+            {% for separated_material in record.separated_materials %}
+                {% if separated_material.description %}
+                    <p>{{ separated_material.description }}</p>
+                {% endif %}
+                {% if separated_material.links %}
+                    {% for link in separated_material.links %}
+                        <p><a href="{{ link.href }}">{{ link.text }}</a></p>
                     {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if record.map_scale %}
-                <tr>
-                    <th scope="row">{{ 'map_scale'|as_label }}</th>
-                    <td>{{ record.map_scale }}</td>
-                </tr>
-            {% endif %}
-            {% if record.physical_condition %}
-                <tr>
-                    <th scope="row">{{ 'physical_condition'|as_label }}</th>
-                    <td>{{ record.physical_condition }}</td>
-                </tr>
-            {% endif %}            
-            {% if record.closure_status %}
-                <tr>
-                    <th scope="row">{{ 'closure'|as_label }}</th>
-                    <td>{{ record.closure_status }}</td>
-                </tr>
-            {% endif %} 
-            {% if record.custodial_history %}
-                <tr>
-                    <th scope="row">{{ 'custodial_history'|as_label }}</th>
-                    <td>{{ record.custodial_history }}</td>
-                </tr>
-            {% endif %}
-            {% if record.accumulation_dates %}
-                <tr>
-                    <th scope="row">{{ 'accumulation_dates'|as_label }}</th>
-                    <td>{{ record.accumulation_dates }}</td>
-                </tr>
-            {% endif %}
-            {% if record.accruals %}
-                <tr>
-                    <th scope="row">{{ 'accruals'|as_label }}</th>
-                    <td>{{ record.accruals }}</td>
-                </tr>
-            {% endif %}
-            {% if record.unpublished_finding_aids %}
-                <tr>
-                    <th scope="row">{{ 'unpublished_finding_aids'|as_label }}</th>
-                    <td>
-                        {{ record.unpublished_finding_aids }}
-                    </td>
-                </tr>
-            {% endif %}            
-            {% if record.appraisal_information %}
-                <tr>
-                    <th scope="row">{{ 'appraisal_information'|as_label }}</th>
-                    <td>{{ record.appraisal_information }}</td>
-                </tr>
-            {% endif %}
-            {% if record.administrative_background %}
-                <tr>
-                    <th scope="row">{{ 'administrative_background'|as_label }}</th>
-                    <td>{{ record.administrative_background }}</td>
-                </tr>
-            {% endif %}
-            {% if record.copies_information %}
-                <tr>
-                    <th scope="row">{{ 'copies_information'|as_label }}</th>
-                    <td>
-                        {% for item in record.copies_information %}
-                            <p>{{ item }}</p>
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}            
-            {% if record.publication_note %}
-                <tr>
-                    <th scope="row">{{ 'publication_note'|as_label }}</th>
-                    <td>
-                        {{ record.publication_note }}
-                    </td>
-                </tr>
-            {% endif %}            
-            {% if record.record_opening %}
-                <tr>
-                    <th scope="row">{{ 'record_opening'|as_label }}</th>
-                    <td>{{ record.record_opening }}</td>
-                </tr>
-            {% endif %}
-        </tbody>
-    </table>
-</div>
+                {% endif %}
+            {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.held_by %}
+    <tr>
+        <th scope="row">{{ 'held_by'|as_label }}</th>
+        <td>
+        {% if record.held_by_url %}
+            <a href="{{ record.held_by_url }}">{{ record.held_by }}</a>
+        {% else %}
+            {{ record.held_by }}
+        {% endif %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.former_department_reference %}
+    <tr>
+        <th scope="row">{{ 'former_department_reference'|as_label }}</th>
+        <td>{{ record.former_department_reference }}</td>
+    </tr>
+{% endif %}
+
+{% if record.former_pro_reference %}
+    <tr>
+        <th scope="row">{{ 'former_pro_reference'|as_label }}</th>
+        <td>{{ record.former_pro_reference }}</td>
+    </tr>
+{% endif %}
+
+{% if record.location_of_originals %}
+    <tr>
+        <th scope="row">{{ 'location_of_originals'|as_label }}</th>
+        <td>
+        {% for item in record.location_of_originals %}
+            <p>{{ item }}</p>
+        {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.legal_status %}
+    <tr>
+        <th scope="row">{{ 'legal_status'|as_label }}</th>
+        <td>{{ record.legal_status }}</td>
+    </tr>
+{% endif %}
+
+{% if record.language %}
+    <tr>
+        <th scope="row">{{ 'language'|as_label }}</th>
+        <td>
+        {% for item in record.language %}
+            <p>{{ item }}</p>
+        {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.map_designation %}
+    <tr>
+        <th scope="row">{{ 'map_designation'|as_label }}</th>
+        <<td>{{ record.map_designation }}</td>
+    </tr>
+{% endif %}
+
+{% if record.creator %}
+    <tr>
+        <th scope="row">{{ 'creator'|as_label }}</th>
+        <td>
+        {% for item in record.creator %}
+            <p>{{ item }}</p>
+        {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.physical_description %}
+    <tr>
+        <th scope="row">{{ 'physical_description'|as_label }}</th>
+        <td>{{ record.physical_description }}</td>
+    </tr>
+{% endif %}
+
+{% if record.restrictions_on_use %}
+    <tr>
+        <th scope="row">{{ 'restrictions_on_use'|as_label }}</th>
+        <td>{{ record.restrictions_on_use }}</td>
+    </tr>
+{% endif %}
+
+{% if record.dimensions %}
+    <tr>
+        <th scope="row">{{ 'dimensions'|as_label }}</th>
+        <td>{{ record.dimensions }}</td>
+    </tr>
+{% endif %}
+
+{% if record.access_condition %}
+    <tr>
+        <th scope="row">{{ 'access_condition'|as_label }}</th>
+        <td>{{ record.access_condition }}</td>
+    </tr>
+{% endif %}
+
+{% if record.immediate_source_of_acquisition %}
+    <tr>
+        <th scope="row">{{ 'immediate_source_of_acquisition'|as_label }}</th>
+        <td>
+        {% for item in record.immediate_source_of_acquisition %}
+            <p>{{ item }}</p>
+        {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.map_scale %}
+    <tr>
+        <th scope="row">{{ 'map_scale'|as_label }}</th>
+        <td>{{ record.map_scale }}</td>
+    </tr>
+{% endif %}
+
+{% if record.physical_condition %}
+    <tr>
+        <th scope="row">{{ 'physical_condition'|as_label }}</th>
+        <td>{{ record.physical_condition }}</td>
+    </tr>
+{% endif %}
+
+{% if record.closure_status %}
+    <tr>
+        <th scope="row">{{ 'closure'|as_label }}</th>
+        <td>{{ record.closure_status }}</td>
+    </tr>
+{% endif %}
+
+{% if record.custodial_history %}
+    <tr>
+        <th scope="row">{{ 'custodial_history'|as_label }}</th>
+        <td>{{ record.custodial_history }}</td>
+    </tr>
+{% endif %}
+
+{% if record.accumulation_dates %}
+    <tr>
+        <th scope="row">{{ 'accumulation_dates'|as_label }}</th>
+        <td>{{ record.accumulation_dates }}</td>
+    </tr>
+{% endif %}
+
+{% if record.accruals %}
+    <tr>
+        <th scope="row">{{ 'accruals'|as_label }}</th>
+        <td>{{ record.accruals }}</td>
+    </tr>
+{% endif %}
+
+{% if record.unpublished_finding_aids %}
+    <tr>
+        <th scope="row">{{ 'unpublished_finding_aids'|as_label }}</th>
+        <td>
+            {% for item in record.unpublished_finding_aids %}
+                <p>{{ item }}</p>
+            {% endfor %}
+        </td>
+    </tr>
+{% endif %} 
+
+{% if record.appraisal_information %}
+    <tr>
+        <th scope="row">{{ 'appraisal_information'|as_label }}</th>
+        <td>{{ record.appraisal_information }}</td>
+    </tr>
+{% endif %}
+
+{% if record.administrative_background %}
+    <tr>
+        <th scope="row">{{ 'administrative_background'|as_label }}</th>
+        <td>{{ record.administrative_background }}</td>
+    </tr>
+{% endif %}
+
+{% if record.copies_information %}
+    <tr>
+        <th scope="row">{{ 'copies_information'|as_label }}</th>
+        <td>
+            {% for item in record.copies_information %}
+                <p>{{ item }}</p>
+            {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.publication_note %}
+    <tr>
+        <th scope="row">{{ 'publication_note'|as_label }}</th>
+        <td>
+            {% for item in record.publication_note %}
+                <p>{{ item }}</p>
+            {% endfor %}
+        </td>
+    </tr>
+{% endif %}
+
+{% if record.record_opening %}
+    <tr>
+        <th scope="row">{{ 'record_opening'|as_label }}</th>
+        <td>{{ record.record_opening }}</td>
+    </tr>
+{% endif %}
diff --git a/templates/records/record_detail.html b/templates/records/record_detail.html
index 04c664353..78686312f 100644
--- a/templates/records/record_detail.html
+++ b/templates/records/record_detail.html
@@ -19,8 +19,14 @@
 
         <h2 id="record-details-heading" class="tna-heading-l">Description and record details</h2>
 
-        {% include "includes/records/record-details.html" %}
-        {% include "includes/records/record-crosslink-panel.html" %}
+        <div class="record-details">
+            <table class="record-details__table">
+                <tbody>
+                    {% include "includes/records/record-details.html" %}            
+                </tbody>
+            </table>
+        </div>
+        {% include "includes/records/record-crosslink-panel.html" %}        
 
         {% if record.hierarchy %}
             {% if record.hierarchy|length > 2 %}
diff --git a/templates/search/blocks/search_filters.html b/templates/search/blocks/search_filters.html
index fe58d2f7e..a5ae09755 100644
--- a/templates/search/blocks/search_filters.html
+++ b/templates/search/blocks/search_filters.html
@@ -2,7 +2,7 @@
 
 <div class="search-sort-view">
     <form method="GET" class="search-sort-view__form search-sort-view__mobile" data-id="sort-form-mobile" id="catalogue-sort-form-mobile" data-search-type="{{ view.search_tab }}" data-search-bucket="{{ buckets.current.label }}" data-search-filter-name="Sort results" data-search-filter-value="">
-        <h2 class="tna-heading-l search-sort-view__heading">
+        <h2 class="tna-heading-l search-sort-view__heading sr-only">
             <label for="id_sort_by_mobile">Sort by</label>
         </h2>
         {{ form.sort_by.errors }}
@@ -11,7 +11,7 @@ <h2 class="tna-heading-l search-sort-view__heading">
         {# render hidden inputs for fields controlled by other forms #}
         {% render_fields_as_hidden form exclude='sort_by' %}
 
-        <input type="submit" value="Update" class="search-sort-view__form-submit">
+        <input type="submit" value="Sort by" class="search-sort-view__form-submit">
     </form>
 </div>
 
diff --git a/templates/search/blocks/search_results__list-card--grid.html b/templates/search/blocks/search_results__list-card--grid.html
index b79cf164d..8a2416ff1 100644
--- a/templates/search/blocks/search_results__list-card--grid.html
+++ b/templates/search/blocks/search_results__list-card--grid.html
@@ -36,62 +36,7 @@ <h4 class="tna-heading-s">
             {{ record.listing_description }}
         </p>
         <dl class="search-results__list-card-metadata">
-            {% if record.held_by %}
-                <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-held-by-icon">
-                    Held by:
-                </dt>
-                <dd>{{ record.held_by }}</dd>
-            {% endif %}
-
-            {% if record.date_created %}
-                <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-date-icon">
-                    Date:
-                </dt>
-                <dd> {{ record.date_created }}</dd>
-            {% endif %}
-
-            {% if record.reference_number %}
-            <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-data-icon">
-
-                {% if form.group.value == 'archive' %}
-                Archon code:
-                {% else %}
-                Reference:
-                {% endif %}
-
-
-            </dt>
-            <dd>{{ record.reference_number }}</dd>
-            {% endif %}
-
-            <!--
-            {% if record.record_opening %}
-                <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-subjects-icon">
-                    Record opening date:
-                </dt>
-                <dd>{{ record.record_opening }}</dd>
-            {% endif %}
-            -->
-            {% if form.group.value == bucketkeys.CREATOR.value and record.type %}
-                <dt class="search-results__list-card-metadata-item">
-                    Type:
-                </dt>
-                <dd>{{ record.type }}</dd>
-            {% endif %}
-
-            {% comment %}Debug attributes. Output to allow k-int to adjust the ES index{% endcomment %}
-            <!--
-            <dt class="search-results__list-card-metadata-item">
-                IAID:
-            </dt>
-
-            <dd>{{ record.iaid }}</dd>>
-            <dt class="search-results__list-card-metadata-item">
-                Score:
-            </dt>
-            <dd;>{{ record.score }}</dd>
-            -->
-            {% comment %}End debug attributes.{% endcomment %}
+            {% include "search/includes/results-details.html" %}
         </dl>
 
 
diff --git a/templates/search/blocks/search_results__list-card.html b/templates/search/blocks/search_results__list-card.html
index 6a2071be8..4bf001b28 100644
--- a/templates/search/blocks/search_results__list-card.html
+++ b/templates/search/blocks/search_results__list-card.html
@@ -26,40 +26,7 @@ <h3 class="tna-heading-m">
         </p>
 
         <dl class="search-results__list-card-metadata">
-            {% if record.held_by %}
-            <dt class="search-results__list-card-metadata-item-held-by-icon">Held by:</dt>
-            <dd>{{ record.held_by }}</dd>
-            {% endif %}
-
-
-
-            {% if record.date_created %}
-            <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-date-icon">
-                Date:</dt>
-            <dd>
-                <date>{{ record.date_created }}</date></dd>
-            {% endif %}
-
-            {% if record.reference_number %}
-            <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-data-icon">
-                {% if form.group.value == 'archive' %}
-                Archon code:
-                {% else %}
-                Reference:
-                {% endif %}
-            </dt>
-            <dd>{{ record.reference_number }}
-            </dd>
-            {% endif %}
-
-            {% if form.group.value == bucketkeys.CREATOR.value and record.type %}
-            <dt class="search-results__list-card-metadata-item">
-                Type:</dt>
-            <dd>{{ record.type }}
-            </dd>
-            {% endif %}
-
-
+            {% include "search/includes/results-details.html" %}
         </dl>
 
     </div>
diff --git a/templates/search/blocks/search_sort_and_view_options.html b/templates/search/blocks/search_sort_and_view_options.html
index 841c7b2b3..b404d5cf6 100644
--- a/templates/search/blocks/search_sort_and_view_options.html
+++ b/templates/search/blocks/search_sort_and_view_options.html
@@ -5,7 +5,7 @@
 <!--    <p class="search-results__explainer">Results for everything on our website that matches your search term.</p>-->
     <form method="GET" class="search-sort-view__form search-sort-view__desktop" data-id="sort-form-desktop" id="catalogue-sort-form-desktop" data-search-type="{{ view.search_tab }}" data-search-bucket="{{ buckets.current.label }}" data-search-filter-name="Sort results" data-search-filter-value="">
 
-        <h2 class="tna-heading-l search-sort-view__heading">
+        <h2 class="tna-heading-l search-sort-view__heading sr-only">
            <label for="id_sort_by_desktop">Sort by</label>
         </h2>
 
@@ -14,7 +14,7 @@ <h2 class="tna-heading-l search-sort-view__heading">
 
         {% render_fields_as_hidden form exclude='sort_by' %}
 
-        <input type="submit" value="Update" class="search-sort-view__form-submit">
+        <input type="submit" value="Sort by" class="search-sort-view__form-submit">
     </form>
 
     <h2 class="tna-heading-l search-sort-view__heading"><span class="sr-only">Display as:</span></h2>
diff --git a/templates/search/featured_search.html b/templates/search/featured_search.html
index 8ac932675..24c2ab726 100644
--- a/templates/search/featured_search.html
+++ b/templates/search/featured_search.html
@@ -18,7 +18,10 @@
     <p class="search-results__explainer">Results for everything across our catalogue and website that matches your search term.</p>
 </div>
 
-    <div class="container-fluid tna-!--margin-top-l tna-container">
+
+    <div class="container-fluid tna-container">
+
+
     <section class="featured-search__website-results">
         <header class="featured-search__website-results__head">
             <h2 class="tna-heading-l featured-search__website-results__heading">Catalogue results</h2>
@@ -54,7 +57,7 @@ <h2 class="tna-heading-l featured-search__website-results__heading">Website resu
                 </a>
             </header>
 
-            <div class="row">
+            <div class="tna-container row">
             <ul class="featured-search__website-results-list">
                 {% for result in website_results %}
                     {% include "search/blocks/native_website_result--grid.html" with heading_tag='h3' %}
diff --git a/templates/search/includes/results-details.html b/templates/search/includes/results-details.html
new file mode 100644
index 000000000..ba669bcb5
--- /dev/null
+++ b/templates/search/includes/results-details.html
@@ -0,0 +1,57 @@
+{% if record.held_by %}
+    <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-held-by-icon">
+        Held by:
+    </dt>
+    <dd>{{ record.held_by }}</dd>
+{% endif %}
+
+{% if record.date_created %}
+    <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-date-icon">
+        Date:
+    </dt>
+    <dd> {{ record.date_created }}</dd>
+{% endif %}
+
+{% if record.reference_number %}
+    <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-data-icon">
+
+        {% if form.group.value == 'archive' %}
+        Archon code:
+        {% else %}
+        Reference:
+        {% endif %}
+
+
+    </dt>
+    <dd>{{ record.reference_number }}</dd>
+{% endif %}
+
+<!--
+{% if record.record_opening %}
+    <dt class="search-results__list-card-metadata-item search-results__list-card-metadata-item-subjects-icon">
+        Record opening date:
+    </dt>
+    <dd>{{ record.record_opening }}</dd>
+{% endif %}
+-->
+
+{% if form.group.value == bucketkeys.CREATOR.value and record.type %}
+    <dt class="search-results__list-card-metadata-item">
+        Type:
+    </dt>
+    <dd>{{ record.type }}</dd>
+{% endif %}
+
+{% comment %}Debug attributes. Output to allow k-int to adjust the ES index{% endcomment %}
+<!--
+<dt class="search-results__list-card-metadata-item">
+    IAID:
+</dt>
+
+<dd>{{ record.iaid }}</dd>>
+<dt class="search-results__list-card-metadata-item">
+    Score:
+</dt>
+<dd;>{{ record.score }}</dd>
+-->
+{% comment %}End debug attributes.{% endcomment %}
\ No newline at end of file