diff options
| author | Bryan Newbold <bnewbold@archive.org> | 2020-10-14 02:38:29 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@archive.org> | 2020-10-14 02:38:29 -0700 |
| commit | 541f13f8325b8a17181e0d0c9d559a58b892298b (patch) | |
| tree | bd37948a29966b9b4a3799e570ae4d7b4a5e899e | |
| parent | 66716ff9ca395d1eb9293529d7cdc612ba86bf6e (diff) | |
| download | fatcat-scholar-541f13f8325b8a17181e0d0c9d559a58b892298b.tar.gz fatcat-scholar-541f13f8325b8a17181e0d0c9d559a58b892298b.zip | |
html: structure more semantic
| -rw-r--r-- | fatcat_scholar/templates/base.html | 16 | ||||
| -rw-r--r-- | fatcat_scholar/templates/search.html | 23 | ||||
| -rw-r--r-- | 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 @@ </head> <body> -<header class="ui inverted menu" style="margin: 0;"> +<nav class="ui inverted menu" style="margin: 0;"> <div class="ui container"> {% if settings.SCHOLAR_ENV != "prod" %} <div class="ui left corner {% if settings.SCHOLAR_ENV == "qa" %}orange{% else %}pink{% endif %} small label"> @@ -164,7 +164,7 @@ </div> </div> </div> -</header> +</nav> {% block fullbody %} <div class="ui vertical stripe segment" style="background-color: #dedede;"> @@ -209,7 +209,7 @@ <footer class="ui inverted vertical footer segment" style="padding: 4em 0em; margin-top: 3em; width: 100%;"> <div class="ui container"> <div class="ui stackable mobile reversed inverted divided equal height grid"> - <div class="nine wide column"> + <nav class="nine wide column"> <div class="ui grid"> <div class="tablet-hide two wide column" style="padding-top: 4em; padding-right: 0;"> <img class="logo" src="/static/ia-logo.svg" alt="" style="width: 100%; opacity: 0.5;"> @@ -229,8 +229,8 @@ </div> </div> </div> - </div> - <div class="three wide column"> + </nav> + <nav class="three wide column"> <h4 class="ui inverted header">{% trans %}Open Infrastructure{% endtrans %}</h4> <div class="ui inverted link list"> <a target="_blank" rel="noopener" href="https://fatcat.wiki" class="item">{{ _("Editable Catalog (Fatcat)") }}</a> @@ -239,8 +239,8 @@ <a target="_blank" rel="noopener noreferrer" href="https://status.fatcat.wiki" class="item">{{ _("Service Status") }}</a> <a target="_blank" rel="noopener noreferrer" href="https://github.com/internetarchive/fatcat-scholar" class="item">{{ _("Source Code") }}</a> </div> - </div> - <div class="three wide column"> + </nav> + <nav class="three wide column"> <h4 class="ui inverted header">scholar.archive.org</h4> <div class="ui inverted link list"> <a href="{{ lang_prefix }}/about#howitworks" class="item">{{ _("How It Works") }}</a> @@ -248,7 +248,7 @@ <a href="{{ lang_prefix }}/about#tdm" class="item">{{ _("Text and Data Mining") }}</a> <a href="{{ lang_prefix }}/help" class="item">{{ _("Help") }}</a> </div> - </div> + </nav> </div> </div> </footer> 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 %} -<div class="tablet-only" style="margin-top: 1.0em;"> - <!-- these hidden query fields should be *before* any form/button that could override them --> - {{ 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 %} - <input form="search_form" type="hidden" name="debug" value="1"> - {% endif %} +<!-- these hidden query fields should be *before* any form/button that could override them --> +{{ 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 %} + <input form="search_form" type="hidden" name="debug" value="1"> +{% endif %} + +<div class="tablet-only" style="margin-top: 1.0em;"> <details class="search_filters"> <summary style="float: right;"><i class="filter icon"></i>{{ _("Filters") }}</summary> @@ -42,7 +43,7 @@ <div class="ui equal height stackable divided grid" style="margin-top: 1em;"> - <div class="ui tablet-hide two wide column"> + <nav class="ui tablet-hide two wide column"> {% if hits %} <div style="width: 100%; text-align: right;"> <h3 style="font-size: {% if hits.count_found >= 10000000 %}1.0em{% elif hits.count_found >= 1000 %}1.5em{% else %}2.0em{% endif %};">{{ "{:,}".format(hits.count_found) }}</h3> @@ -61,7 +62,7 @@ {{ search_macros.query_option(query.sort_options, query.sort_order) }} </div> - </div> + </nav> <div class="ui fourteen wide column"> {% 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) -%} -<span style="color: rgba(0,0,0,0.4);">{{ _(options.label) }}</span> +<label for="{{ options.slug }}" style="color: rgba(0,0,0,0.4);">{{ _(options.label) }}</label> <div class="ui link list" style="margin-top: 0.3em;"> {% for opt in options.list %} <button class="text-button" form="search_form" type="submit" name="{{ options.slug }}" value="{{ opt.slug }}"> |