Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DF-815-<fieldset> structures within the catalogue search results page. #1330

Merged
merged 15 commits into from
Sep 22, 2023
Merged

DF-815-<fieldset> structures within the catalogue search results page. #1330

Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3f413bc
<fieldset> structures within the catalogue search results page.
JohnHeeryTNA Sep 19, 2023
2c74c89
Merge branch 'develop' into fix/fix-fieldset-accessibility
JohnHeeryTNA Sep 19, 2023
f5bbc28
adding in role="group" to fieldsets
JohnHeeryTNA Sep 20, 2023
6e91f4b
Merge branch 'fix/fix-fieldset-accessibility' of https://github.com/n…
JohnHeeryTNA Sep 20, 2023
bdee317
fieldset roles
JohnHeeryTNA Sep 20, 2023
48e4e7d
aria roles and id's
JohnHeeryTNA Sep 20, 2023
a18fb1a
removal of unreferenced class
JohnHeeryTNA Sep 20, 2023
950976c
Merge branch 'develop' into fix/fix-fieldset-accessibility
JohnHeeryTNA Sep 20, 2023
be9c89a
removing nested <fieldset>'s
JohnHeeryTNA Sep 20, 2023
9191ffc
Merge branch 'fix/fix-fieldset-accessibility' of https://github.com/n…
JohnHeeryTNA Sep 20, 2023
37507f3
fieldset refactoring
JohnHeeryTNA Sep 20, 2023
bf1c4db
fieldset amendments
JohnHeeryTNA Sep 21, 2023
b315e35
Merge branch 'develop' into fix/fix-fieldset-accessibility
JohnHeeryTNA Sep 21, 2023
9e7449d
fieldset amendments
JohnHeeryTNA Sep 21, 2023
71e4a9a
Merge branch 'fix/fix-fieldset-accessibility' of https://github.com/n…
JohnHeeryTNA Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions templates/search/blocks/search_filters.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ <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>

<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">

<div id="from-date">
<fieldset role="group" aria-describedby="from-date">
ahosgood marked this conversation as resolved.
Show resolved Hide resolved
{% if form.covering_date_from.errors %}
<div
data-tracking-errors
Expand All @@ -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">
<div id="to-date">
<fieldset role="group" aria-describedby="to-date">
{{ form.covering_date_to.label_tag }}
{% if form.covering_date_to.errors %}
<div
Expand All @@ -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">
Expand Down Expand Up @@ -105,12 +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">
<div class="search-filters__opening-date-section" id="opening-start-date">
ahosgood marked this conversation as resolved.
Show resolved Hide resolved
<fieldset role="group" aria-describedby="opening-start-date">
<span class="example-text">For example, 27 3 2007</span><br>
JohnHeeryTNA marked this conversation as resolved.
Show resolved Hide resolved
ahosgood marked this conversation as resolved.
Show resolved Hide resolved
{{ form.opening_start_date.label_tag }}
{% if form.opening_start_date.errors %}
Expand All @@ -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">
<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
Expand All @@ -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">
Expand Down