Skip to content

Commit 5f62265

Browse files
author
Jane
committed
Revert "begin updating search template"
This reverts commit 982a134.
1 parent 56b0013 commit 5f62265

9 files changed

+107
-101
lines changed

‎sass/includes/search/_search-landing-hero.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.search-landing-hero {
2+
background-color: $color__grey-100;
23
padding-top: 2rem;
34
padding-bottom: 5rem;
45
margin-bottom: 2rem;

‎sass/includes/search/_search-results-hero.scss

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.search-results-hero {
2+
background-color: $color__grey-200;
23
padding: 2rem;
34
padding-bottom: 0;
45
width: 100%;
@@ -49,11 +50,15 @@
4950

5051
&-list {
5152
padding-left: 0;
53+
display: flex;
54+
align-items: center;
55+
flex-wrap: wrap;
5256
font-size: 1.2rem;
5357
margin-bottom: 0;
5458

5559
&-item {
5660
display: inline-block;
61+
margin-right: 2rem;
5762
font-family: $font__supria-sans;
5863

5964
@media only screen and (max-width: 38rem) {
@@ -87,6 +92,7 @@
8792
margin-right: 0;
8893

8994
div {
95+
background-color: $color__white;
9096
margin-right: -2rem;
9197
margin-left: -2rem;
9298
padding: 1rem 2rem 0 1rem;
@@ -116,8 +122,10 @@
116122
width: 100%;
117123
height: 100%;
118124
padding: 0.5rem;
119-
margin-bottom: 0.1rem;
120125
text-decoration: none;
126+
color: rgb(0 0 0 / 73%);
127+
border-top: 0.3rem solid $color__grey-500;
128+
background-color: #ffffff85;
121129

122130
@media only screen and (max-width: 34rem) {
123131
min-height: 70px;
@@ -129,15 +137,16 @@
129137
padding-right: 0.5rem;
130138
}
131139

132-
// &:visited,
133-
// &:hover {
134-
// color: $color__black;
135-
// }
140+
&:visited,
141+
&:hover {
142+
color: $color__black;
143+
}
136144

137145
&[aria-current="true"],
138146
&:hover,
139147
&:focus {
140-
border-bottom: 0.3rem solid $color__white;
148+
background-color: $color__white;
149+
border-top: 0.3rem solid $color__yellow;
141150
border-left: 0;
142151
border-right: 0;
143152
color: $color__black;

‎templates/records/record_detail_full.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{% endblock extra_gtm_js %}
1010

1111
{% block content %}
12-
<section class="tna-background-accent">
12+
<section class="section tna-background-accent">
1313
<div class="tna-container">
1414
<div class="tna-column">
1515
{% include "includes/records/record-title.html" %}

‎templates/search/blocks/search_landing_buckets.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="tna-container">
2-
<nav class="search-landing-buckets__container" aria-label="Record categories">
3-
<div class="tna-column tna-column--full tna-column--no-padding search-landing-buckets">
4-
<ul class="search-landing-buckets__list" data-id="search-buckets-list">
5-
{% for bucket in buckets %}
6-
<li class="tna-column search-landing-buckets__list-item">
7-
<a href="{% url 'search-catalogue' %}?group={{ bucket.key }}" class="search-landing-buckets__link">
8-
{{ bucket.label_with_count }}
9-
</a>
10-
</li>
11-
{% endfor %}
12-
</ul>
13-
</div>
14-
</nav>
2+
<nav class="search-landing-buckets__container" aria-label="Record categories">
3+
<div class="tna-column tna-column--full tna-column--no-padding search-landing-buckets">
4+
<ul class="search-landing-buckets__list" data-id="search-buckets-list">
5+
{% for bucket in buckets %}
6+
<li class="tna-column search-landing-buckets__list-item">
7+
<a href="{% url 'search-catalogue' %}?group={{ bucket.key }}" class="search-landing-buckets__link">
8+
{{ bucket.label_with_count }}
9+
</a>
10+
</li>
11+
{% endfor %}
12+
</ul>
13+
</div>
14+
</nav>
1515
</div>

‎templates/search/blocks/search_landing_hero.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<form action="/search/featured" method="GET" id="analytics-search-landing-hero">
2-
<div class="search-landing-hero tna-background-accent">
2+
<div class="search-landing-hero">
33
<div class="tna-container">
44
<div class="tna-column tna-column--full">
55
<div class="search-landing-hero__container">

‎templates/search/blocks/search_results_hero.html

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
{% load search_tags %}
2-
<div class="section tna-background-accent">
3-
<div class="tna-container">
4-
<div class="search-results-hero">
5-
<h1 class="tna-heading-l search-results-hero__heading">{{search_tab|search_title}}</h1>
6-
<form method="GET" class="search-results-hero__form tna-!--margin-top-s" data-id="search-form" id="catalogue-search-form">
2+
<div class="container-fluid-grey">
3+
<div class="tna-container">
4+
<div class="search-results-hero">
5+
<h1 class="tna-heading-l search-results-hero__heading">{{search_tab|search_title}}</h1>
6+
<form method="GET" class="search-results-hero__form tna-!--margin-top-s" data-id="search-form" id="catalogue-search-form">
77

8-
<label for="{{form.q.id_for_label}}" class="sr-only">Search term</label>
9-
{{ form.q.errors }}
10-
{{ form.q }}
8+
<label for="{{form.q.id_for_label}}" class="sr-only">Search term</label>
9+
{{ form.q.errors }}
10+
{{ form.q }}
1111

12-
{% render_fields_as_hidden form exclude='q' %}
12+
{% render_fields_as_hidden form exclude='q' %}
1313

14-
<input type="submit" value="Search" class="search-results-hero__form-submit">
15-
</form>
14+
<input type="submit" value="Search" class="search-results-hero__form-submit">
15+
</form>
1616

17-
{% with request.resolver_match.url_name as url_name %}
18-
<nav class="search-results-hero__nav" aria-label="Search result types">
19-
<ul class="search-results-hero__nav-list">
20-
<li class="search-results-hero__nav-list-item">
21-
{% if url_name == 'search-featured' %}
22-
<span aria-current="true" class="search-results-hero__nav-link">{{searchtabs.ALL.value}}</span>
23-
{% else %}
24-
<a class="search-results-hero__nav-link" href="{% url 'search-featured' %}{% if form.q.value %}?q={{ form.q.value }}{% endif %}">{{searchtabs.ALL.value}}</a>
25-
{% endif %}
26-
</li>
27-
<li class="search-results-hero__nav-list-item">
28-
{% if url_name == 'search-catalogue' %}
29-
<span aria-current="true" class="search-results-hero__nav-link">{{searchtabs.CATALOGUE.value}}</span>
30-
{% else %}
31-
<a class="search-results-hero__nav-link" href="{% url 'search-catalogue' %}{% if form.q.value %}?q={{ form.q.value }}{% endif %}">{{searchtabs.CATALOGUE.value}}</a>
32-
{% endif %}
33-
</li>
34-
<li class="search-results-hero__nav-list-item">
35-
{% if url_name == 'search-website' %}
36-
<span aria-current="true" class="search-results-hero__nav-link">{{searchtabs.WEBSITE.value}}</span>
37-
{% else %}
38-
<a class="search-results-hero__nav-link" href="{% url 'search-website' %}{% if form.q.value %}?q={{ form.q.value }}{% endif %}">{{searchtabs.WEBSITE.value}}</a>
39-
{% endif %}
40-
</li>
41-
<li class="search-results-hero__nav-list-item">
42-
<div>
43-
<a href="/search/featured/" data-link-type="Link" data-link="Start a new search">Start new search</a>
44-
</div>
45-
</li>
46-
</ul>
47-
</nav>
48-
{% endwith %}
49-
</div>
50-
</div>
17+
{% with request.resolver_match.url_name as url_name %}
18+
<nav class="search-results-hero__nav" aria-label="Search result types">
19+
<ul class="search-results-hero__nav-list">
20+
<li class="search-results-hero__nav-list-item">
21+
{% if url_name == 'search-featured' %}
22+
<span aria-current="true" class="search-results-hero__nav-link">{{searchtabs.ALL.value}}</span>
23+
{% else %}
24+
<a class="search-results-hero__nav-link" href="{% url 'search-featured' %}{% if form.q.value %}?q={{ form.q.value }}{% endif %}">{{searchtabs.ALL.value}}</a>
25+
{% endif %}
26+
</li>
27+
<li class="search-results-hero__nav-list-item">
28+
{% if url_name == 'search-catalogue' %}
29+
<span aria-current="true" class="search-results-hero__nav-link">{{searchtabs.CATALOGUE.value}}</span>
30+
{% else %}
31+
<a class="search-results-hero__nav-link" href="{% url 'search-catalogue' %}{% if form.q.value %}?q={{ form.q.value }}{% endif %}">{{searchtabs.CATALOGUE.value}}</a>
32+
{% endif %}
33+
</li>
34+
<li class="search-results-hero__nav-list-item">
35+
{% if url_name == 'search-website' %}
36+
<span aria-current="true" class="search-results-hero__nav-link">{{searchtabs.WEBSITE.value}}</span>
37+
{% else %}
38+
<a class="search-results-hero__nav-link" href="{% url 'search-website' %}{% if form.q.value %}?q={{ form.q.value }}{% endif %}">{{searchtabs.WEBSITE.value}}</a>
39+
{% endif %}
40+
</li>
41+
<li class="search-results-hero__nav-list-item">
42+
<div>
43+
<a href="/search/featured/" data-link-type="Link" data-link="Start a new search">Start new search</a>
44+
</div>
45+
</li>
46+
</ul>
47+
</nav>
48+
{% endwith %}
49+
</div>
50+
</div>
5151
</div>

‎templates/search/catalogue_search.html

+31-31
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
{% load humanize datalayer_tags search_tags static %}
44

5-
{% block html_class %}tna-template--light-theme tna-template--blue-accent{% endblock %}
6-
75
{% comment %} prepend number of search results to page title {% endcomment %}
86
{% block prepend_title %}
97
{% with count=page.paginator.count %}
@@ -27,41 +25,43 @@
2725
{% with search_tab=searchtabs.CATALOGUE.value %}
2826
{% include './blocks/search_results_hero.html' %}
2927

30-
{% comment %} {% if buckets.current.result_count %}
31-
{% if form.group.value == 'tna' %}
32-
<div class="tna-container">
33-
<p class="search-results__explainer">Results for records held at The National Archives that match your search term.</p>
34-
</div>
35-
{% endif %}
28+
{% if buckets.current.result_count %}
3629

37-
{% if form.group.value == 'digitised' %}
30+
{% if form.group.value == 'tna' %}
3831
<div class="tna-container">
39-
<p class="search-results__explainer">Results for records available to download at The National Archives that match your search term.</p>
32+
<p class="search-results__explainer">Results for records held at The National Archives that match your search term.</p>
4033
</div>
41-
{% endif %}
34+
{% endif %}
35+
36+
{% if form.group.value == 'digitised' %}
37+
<div class="tna-container">
38+
<p class="search-results__explainer">Results for records available to download at The National Archives that match your search term.</p>
39+
</div>
40+
{% endif %}
41+
42+
{% if form.group.value == 'nonTna' %}
43+
<div class="tna-container">
44+
<p class="search-results__explainer">Records held at other UK archives that match your search term.</p>
45+
</div>
46+
{% endif %}
47+
48+
{% if form.group.value == 'creator' %}
49+
<div class="tna-container">
50+
<p class="search-results__explainer">A business, family, manor, organisation or person who has created records that match your search term.</p>
51+
</div>
52+
{% endif %}
53+
54+
{% if form.group.value == 'archive' %}
55+
<div class="tna-container">
56+
<p class="search-results__explainer">Archives across the UK that match your search term.</p>
57+
</div>
58+
{% endif %}
4259

43-
{% if form.group.value == 'nonTna' %}
44-
<div class="tna-container">
45-
<p class="search-results__explainer">Records held at other UK archives that match your search term.</p>
46-
</div>
47-
{% endif %}
48-
49-
{% if form.group.value == 'creator' %}
50-
<div class="tna-container">
51-
<p class="search-results__explainer">A business, family, manor, organisation or person who has created records that match your search term.</p>
52-
</div>
53-
{% endif %}
54-
55-
{% if form.group.value == 'archive' %}
56-
<div class="tna-container">
57-
<p class="search-results__explainer">Archives across the UK that match your search term.</p>
58-
</div>
59-
{% endif %}
60-
{% endif %} {% endcomment %}
60+
{% endif %}
6161

62-
{% comment %} {% if buckets_contain_results %}
62+
{% if buckets_contain_results %}
6363
{% include './blocks/catalogue_search_buckets.html' %}
64-
{% endif %} {% endcomment %}
64+
{% endif %}
6565

6666
{% if buckets.current.result_count > 0 %}
6767
{% include './blocks/search_sort_and_view_options.html' %}

‎templates/search/search.html

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{% extends "base.html" %}
22
{% load alert_tags datalayer_tags search_tags humanize %}
33

4-
{% block html_class %}tna-template--light-theme tna-template--blue-accent{% endblock %}
5-
64
{% block extra_gtm_js %}
75
{% render_gtm_datalayer view %}
86
{% endblock extra_gtm_js %}

‎templates/search/website_search.html

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
{% load humanize datalayer_tags search_tags static %}
44

5-
{% block html_class %}tna-template--light-theme tna-template--blue-accent{% endblock %}
6-
75
{% comment %} prepend number of search results to page title {% endcomment %}
86
{% block prepend_title %}
97
{% with count=page.paginator.count %}

0 commit comments

Comments
 (0)