diff options
| -rw-r--r-- | fatcat_covid19/templates/base.html | 2 | ||||
| -rw-r--r-- | fatcat_covid19/templates/entity_macros.html | 20 | ||||
| -rw-r--r-- | fatcat_covid19/templates/fulltext_search.html | 93 |
3 files changed, 65 insertions, 50 deletions
diff --git a/fatcat_covid19/templates/base.html b/fatcat_covid19/templates/base.html index 137b82e..c8c8f5b 100644 --- a/fatcat_covid19/templates/base.html +++ b/fatcat_covid19/templates/base.html @@ -26,7 +26,7 @@ </head> <body style="margin-bottom: 130px;"> -<header class="ui fixed inverted menu"> {# style="background-color: #590013;" #} +<header class="ui fixed inverted menu" style="font-size: 14px;"> {# style="background-color: #590013;" #} <div class="ui container"> <a href="{{ url_for("search.page_home") }}" class="header item"> <!-- <img class="logo" src="assets/images/logo.png"> --> diff --git a/fatcat_covid19/templates/entity_macros.html b/fatcat_covid19/templates/entity_macros.html index 1c4177c..c4cee62 100644 --- a/fatcat_covid19/templates/entity_macros.html +++ b/fatcat_covid19/templates/entity_macros.html @@ -67,7 +67,7 @@ {# ### AUTHOR ROW #} {% if paper.contrib_names %} - <div style="margin-top: 0.1em; margin-bottom: 0.1em; font-size: 1.1em;"> + <div style="margin-top: 0.1em; margin-bottom: 0.2em; font-size: 1.1em;"> <b> {{ ", ".join(paper.contrib_names[:12]) }} {% if paper.contrib_names|length > 12 %}<i>(+{{ paper.contrib_names|length - 12 }} others)</i>{% endif %} @@ -169,13 +169,27 @@ </div> <div class="three wide left aligned column" style="padding: 1em;"> {% if paper.fulltext.thumbnail_url %} - <a href="{{ config.COVID19_FULLTEXT_HOST }}{{ paper.fulltext.pdf_url.replace('//', '/') }}"> - <img src="{{ config.COVID19_FULLTEXT_HOST }}{{ paper.fulltext.thumbnail_url.replace('//', '/') }}" style="border: 1px solid grey; max-height: 12em; max-width: 100%;"> + {% if paper.fulltext.ia_pdf_url %} + <a href="{{ paper.fulltext.ia_pdf_url }}"> + {% else %} + <a href="{{ config.COVID19_FULLTEXT_HOST }}{{ paper.fulltext.pdf_url }}"> + {% endif %} + <img src="{{ config.COVID19_FULLTEXT_HOST }}{{ paper.fulltext.thumbnail_url }}" style="border: 1px solid grey; max-height: 12em; max-width: 100%;"> </a> <br> {% else %} {# No Fulltext #} {% endif %} +{# should we include these little links? + <code style="font-size: 0.9rem; padding-left: 0.5em;"> + {% if paper.fulltext.pdf_url %} + <a href="{{ config.COVID19_FULLTEXT_HOST }}{{ paper.fulltext.pdf_url }}">mirror</a> + {% endif %} + {% if paper.fulltext.grobid_xml_url %} + <a href="{{ config.COVID19_FULLTEXT_HOST }}{{ paper.fulltext.grobid_xml_url }}">xml</a> + {% endif %} + </code> +#} </div> </div> {% endmacro %} diff --git a/fatcat_covid19/templates/fulltext_search.html b/fatcat_covid19/templates/fulltext_search.html index affb7b5..174acd9 100644 --- a/fatcat_covid19/templates/fulltext_search.html +++ b/fatcat_covid19/templates/fulltext_search.html @@ -12,7 +12,7 @@ {% block fullmain %} -<div class="ui vertical stripe segment" style="background-color: #EEE; padding-top: 2.5em;"> +<div class="ui vertical stripe segment" style="background-color: #EEE; padding-top: 2.5em; padding-bottom: 0.5em;"> <div class="ui container text"> <h1>{{ _("Search COVID-19 documents") }}</h1> <form class="" role="search" action="/fulltext/search" method="get"> @@ -22,60 +22,61 @@ <button class="ui primary button">{{ _("Search") }}</button> </div> - <br> - Include: + <div style="padding-top: 0.85em; padding-left: 1em;"> + Include: {# - <div class="ui inline dropdown"> - <input type="hidden" name="filter_time"> - <div class="text">{{ filter_time or 'any' }}</div> - <i class="dropdown icon"></i> - <div class="menu"> - <div class="header"> - <i class="filter icon"></i> - Publication Stage + <div class="ui inline dropdown"> + <input type="hidden" name="filter_time"> + <div class="text">{{ filter_time or 'any' }}</div> + <i class="dropdown icon"></i> + <div class="menu"> + <div class="header"> + <i class="filter icon"></i> + Publication Stage + </div> + <div class="divider"></div> + <div class="{% if filter_type == 'any' %}active{% endif %} item" data-value="any" >{{ _("any stage") }}</div> + <div class="{% if filter_type == 'published' %}active{% endif %} item" data-value="published" >{{ _("only published") }}</div> + <div class="{% if filter_type == 'pre_print' %}active{% endif %} item" data-value="pre_print" >{{ _("only pre-print") }}</div> </div> - <div class="divider"></div> - <div class="{% if filter_type == 'any' %}active{% endif %} item" data-value="any" >{{ _("any stage") }}</div> - <div class="{% if filter_type == 'published' %}active{% endif %} item" data-value="published" >{{ _("only published") }}</div> - <div class="{% if filter_type == 'pre_print' %}active{% endif %} item" data-value="pre_print" >{{ _("only pre-print") }}</div> </div> - </div> #} - <div class="ui inline dropdown"> - <input type="hidden" name="filter_type" value="{{ filter_type }}"> - <div class="text">{{ filter_type or "papers" }}</div> - <i class="dropdown icon"></i> - <div class="menu"> - <div class="header"> - <i class="filter icon"></i> - Resource Type + <div class="ui inline dropdown"> + <input type="hidden" name="filter_type" value="{{ filter_type }}"> + <div class="text">{{ filter_type or "papers" }}</div> + <i class="dropdown icon"></i> + <div class="menu"> + <div class="header"> + <i class="filter icon"></i> + Resource Type + </div> + <div class="divider"></div> + <div class="{% if filter_type == 'papers' %}active{% endif %} item" data-value="papers" >{{ _("papers") }}</div> + <div class="{% if filter_type == 'reports' %}active{% endif %} item" data-value="reports" >{{ _("reports") }}</div> + <div class="{% if filter_type == 'datasets' %}active{% endif %} item" data-value="datasets" >{{ _("datasets") }}</div> + <div class="{% if filter_type == 'everything' %}active{% endif %} item" data-value="everything">{{ _("everything") }}</div> </div> - <div class="divider"></div> - <div class="{% if filter_type == 'papers' %}active{% endif %} item" data-value="papers" >{{ _("papers") }}</div> - <div class="{% if filter_type == 'reports' %}active{% endif %} item" data-value="reports" >{{ _("reports") }}</div> - <div class="{% if filter_type == 'datasets' %}active{% endif %} item" data-value="datasets" >{{ _("datasets") }}</div> - <div class="{% if filter_type == 'everything' %}active{% endif %} item" data-value="everything">{{ _("everything") }}</div> </div> - </div> - from - <div class="ui inline dropdown"> - <input type="hidden" name="filter_time" vale="{{ filter_time }}"> - <div class="text">{{ filter_time or "all time" }}</div> - <i class="dropdown icon"></i> - <div class="menu"> - <div class="header"> - <i class="filter icon"></i> - Time Period + from + <div class="ui inline dropdown"> + <input type="hidden" name="filter_time" vale="{{ filter_time }}"> + <div class="text">{{ filter_time or "all time" }}</div> + <i class="dropdown icon"></i> + <div class="menu"> + <div class="header"> + <i class="filter icon"></i> + Time Period + </div> + <div class="divider"></div> + <div class="{% if filter_type == 'all' %}active{% endif %} item" data-value="all" >{{ _("all time") }}</div> + <div class="{% if filter_type == 'past_week' %}active{% endif %} item" data-value="past_week" >{{ _("past week") }}</div> + <div class="{% if filter_type == 'this_year' %}active{% endif %} item" data-value="this_year" >{{ _("this year") }}</div> + <div class="{% if filter_type == 'since_2000' %}active{% endif %} item" data-value="since_2000" >{{ _("since 2000") }}</div> + <div class="{% if filter_type == 'before_1925' %}active{% endif %} item" data-value="before_1925">{{ _("before 1925") }}</div> </div> - <div class="divider"></div> - <div class="{% if filter_type == 'all' %}active{% endif %} item" data-value="all" >{{ _("all time") }}</div> - <div class="{% if filter_type == 'past_week' %}active{% endif %} item" data-value="past_week" >{{ _("past week") }}</div> - <div class="{% if filter_type == 'this_year' %}active{% endif %} item" data-value="this_year" >{{ _("this year") }}</div> - <div class="{% if filter_type == 'since_2000' %}active{% endif %} item" data-value="since_2000" >{{ _("since 2000") }}</div> - <div class="{% if filter_type == 'before_1925' %}active{% endif %} item" data-value="before_1925">{{ _("before 1925") }}</div> </div> </div> </div> @@ -90,7 +91,7 @@ <div class="ui container text" style="padding: 1em;"> {{ entity_macros.top_results(found) }} </div> - <div class="ui container" style="max-width: 950px !important;"> + <div class="ui container" style="max-width: 1000px !important; font-size: 16px;"> <div class="ui centered stackable grid"> {% for paper in found.results %} {{ entity_macros.fulltext_search_result_row(paper) }} |