From 198db52d3a93a2b7d7cab0a4140c6402a14eca84 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Thu, 4 Jun 2020 13:18:35 -0700 Subject: collapse pages by SIM issue --- fatcat_scholar/templates/search.html | 2 -- fatcat_scholar/templates/search_macros.html | 39 ++++++++++++++++++----------- 2 files changed, 25 insertions(+), 16 deletions(-) (limited to 'fatcat_scholar/templates') diff --git a/fatcat_scholar/templates/search.html b/fatcat_scholar/templates/search.html index 1f7a9b9..13d1aec 100644 --- a/fatcat_scholar/templates/search.html +++ b/fatcat_scholar/templates/search.html @@ -21,7 +21,6 @@ {% if hits %} - {#

{{ "{:,}".format(hits.count_found) }}

#} {{ "{:,}".format(hits.count_found) }} Hits in {{ "{:0.2}".format(hits.query_time_ms/1000.0) }}sec @@ -35,7 +34,6 @@
{% if hits %}
- {#

{{ "{:,}".format(hits.count_found) }}

#}

{{ "{:,}".format(hits.count_found) }}

Hits
diff --git a/fatcat_scholar/templates/search_macros.html b/fatcat_scholar/templates/search_macros.html index 07a4510..abdb6d3 100644 --- a/fatcat_scholar/templates/search_macros.html +++ b/fatcat_scholar/templates/search_macros.html @@ -67,7 +67,7 @@ {{ paper.biblio.release_year }} {% endif %} {% if paper.biblio.release_year and paper.biblio.container_name %} - + {% endif %} {% if paper.biblio.container_name %} @@ -130,22 +130,33 @@ {# ### TAGS #}
- {# colors to use: olive, brown, grey, pink, red, etc #} - {# TODO: remove doc for ES 7.x-style lack of type #} - {# TODO: only show 'json' link if from cluster? #} - - json - - {% if paper.biblio.release_ident %} - - metadata + {# colors to use: olive, brown, grey, pink, red, etc #} + {# TODO: remove doc for ES 7.x-style lack of type #} + {# TODO: only show 'json' link if from cluster? #} + + json - {% endif %} - {% for tag in paper.tags %} - {{ _(tag) }} - {% endfor %} + {% if paper.biblio.release_ident %} + + metadata + + {% endif %} + + {% for tag in paper.tags %} + {{ _(tag) }} + {% endfor %}
+ {# ### COLLAPSED HITS #} + {% if paper._collapsed_count > 0 %} +
+ +
+ {% endif %} +
{% if paper.fulltext.access_url %} -- cgit v1.2.3