From 541f13f8325b8a17181e0d0c9d559a58b892298b Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 14 Oct 2020 02:38:29 -0700 Subject: html: structure more semantic --- fatcat_scholar/templates/base.html | 16 ++++++++-------- fatcat_scholar/templates/search.html | 23 ++++++++++++----------- fatcat_scholar/templates/search_macros.html | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/fatcat_scholar/templates/base.html b/fatcat_scholar/templates/base.html index 5da594b..9eee76d 100644 --- a/fatcat_scholar/templates/base.html +++ b/fatcat_scholar/templates/base.html @@ -128,7 +128,7 @@ - + {% block fullbody %}
@@ -209,7 +209,7 @@
diff --git a/fatcat_scholar/templates/search.html b/fatcat_scholar/templates/search.html index dd7fcd6..56e33c6 100644 --- a/fatcat_scholar/templates/search.html +++ b/fatcat_scholar/templates/search.html @@ -10,16 +10,17 @@ {%- endmacro %} {% block fullmain %} -
- - {{ search_macros.query_hidden(query.time_options, query.filter_time) }} - {{ search_macros.query_hidden(query.type_options, query.filter_type) }} - {{ search_macros.query_hidden(query.availability_options, query.filter_availability) }} - {{ search_macros.query_hidden(query.sort_options, query.sort_order) }} - {% if query.debug %} - - {% endif %} + +{{ search_macros.query_hidden(query.time_options, query.filter_time) }} +{{ search_macros.query_hidden(query.type_options, query.filter_type) }} +{{ search_macros.query_hidden(query.availability_options, query.filter_availability) }} +{{ search_macros.query_hidden(query.sort_options, query.sort_order) }} +{% if query.debug %} + +{% endif %} + +
{{ _("Filters") }} @@ -42,7 +43,7 @@
-
+
+
{% if search_error %} diff --git a/fatcat_scholar/templates/search_macros.html b/fatcat_scholar/templates/search_macros.html index 9559303..80d3bfc 100644 --- a/fatcat_scholar/templates/search_macros.html +++ b/fatcat_scholar/templates/search_macros.html @@ -313,7 +313,7 @@ {% endmacro %} {% macro query_option(options, selected) -%} -{{ _(options.label) }} +