From cbfa0d9e1ed1dca6fa34f134cf81d4dd8a0a99f8 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Thu, 2 Apr 2020 16:14:22 -0700 Subject: webface: refactoring of style --- fatcat_covid19/templates/base.html | 27 ++++++-- fatcat_covid19/templates/entity_macros.html | 92 +++++++++++++++++++-------- fatcat_covid19/templates/fulltext_search.html | 78 ++++++++++++++--------- fatcat_covid19/templates/home.html | 18 +----- fatcat_covid19/webface.py | 2 + 5 files changed, 140 insertions(+), 77 deletions(-) diff --git a/fatcat_covid19/templates/base.html b/fatcat_covid19/templates/base.html index 0ca8471..07632dc 100644 --- a/fatcat_covid19/templates/base.html +++ b/fatcat_covid19/templates/base.html @@ -22,14 +22,13 @@ -
+
{# style="background-color: #590013;" #}
- + - COVID-19 + fatcat  [COVID-19] - Fatcat - About + About
@@ -54,6 +53,23 @@
+
+
+
+
+
+
+ + {{ _("Prototype") }}: + {{ _("These resources do not constitute medical advice or research consensus!") }} + +
+
+
+
+
+
+ {% block fullmain %}
@@ -87,6 +103,7 @@ Sources Code {{ config.GIT_REVISION }} + [COVID-19] diff --git a/fatcat_covid19/templates/entity_macros.html b/fatcat_covid19/templates/entity_macros.html index 9cded8a..66f0eb2 100644 --- a/fatcat_covid19/templates/entity_macros.html +++ b/fatcat_covid19/templates/entity_macros.html @@ -1,8 +1,28 @@ {% macro fulltext_search_result_row(paper) -%} -
-

- +
+
+ {% if paper.fulltext.t_thumbnail_url %} + + + + {% else %} + No Fulltext + {% endif %} +
+
+ {# ### TITLE ROW #} +

+ + {# "best URL" calculation #} + {% if paper.pmcid %} + {% if paper.title %} {{ paper.title[:512] }} {% if paper.title|length > 512 %}...{% endif %} @@ -10,53 +30,74 @@ [blank] {% endif %} + + {% if paper.release_type in ("article-journal", "paper-conference") %} + {# pass #} + {% elif paper.release_type in ("book", "chapter", "dataset") %} + [{{ paper.release_type }}] + {% elif not paper.release_type %} + [media?] + {% else %} + [{{ paper.release_type }}] + {% endif %}

+
+   json +
{% if paper.best_pdf_url %}
  fulltext
{% endif %} - {# -
{{ ", ".join(paper.contrib_names[:12]) }} - {% if paper.contrib_names|length > 12 %}(+{{ paper.contrib_names|length - 12 }} others){% endif %} -
- #} + + + {# ### AUTHOR ROW #} {% if paper.contrib_names %} -
+
{{ ", ".join(paper.contrib_names[:12]) }} {% if paper.contrib_names|length > 12 %}(+{{ paper.contrib_names|length - 12 }} others){% endif %}
{% endif %} + + + {# ### JOURNAL ROW #} {% if paper.release_year %} {{ paper.release_year }} {% endif %} - {% if paper.release_type %} - {% if paper.release_type in ("article-journal", "paper-conference") %} - {{ paper.release_type }} - {% elif paper.release_type in ("book") %} - {{ paper.release_type }} + {% if paper.release_year and paper.container_name %} + | + {% endif %} + {% if paper.container_name %} + {% if paper.container_id %} + {{ paper.container_name }} {% else %} - {{ paper.release_type }} + {{ paper.container_name }} {% endif %} + {% if paper.container_is_oa %}{% endif %} {% endif %} {% if paper.withdrawn_status %} - {{ paper.withdrawn_status }} + [{{ paper.withdrawn_status }}] {% endif %} {% if paper.release_stage and paper.release_stage != "published" %} - {{ paper.release_stage }} + [{{ paper.release_stage }}] {% elif not paper.release_stage %} - unknown + [unpublished?] {% endif %} - {% if paper.container_name %} - {% if paper.container_id %} - {{ paper.container_name }} - {% else %} - {{ paper.container_name }} - {% endif %} - {% if paper.container_is_oa %}{% endif %} + + {# ### ABSTRACT / QUERY HIGHLIGHT #} + {% if paper.abstract %} +
+ {% if paper.abstract[0]|length > 500 %} + {{ paper.abstract[0][:500] }}... + {% else %} + {{ paper.abstract[0][:500] }}... + {% endif %} +
{% endif %} + + {# ### IDENTIFIERS #} {% if paper.doi or paper.pmid or paper.arxiv_id or paper.jstor_id %}
{% endif %} @@ -74,6 +115,7 @@ and 5 other versions of the same work! {% endif %}
+
{% endmacro %} diff --git a/fatcat_covid19/templates/fulltext_search.html b/fatcat_covid19/templates/fulltext_search.html index dd42f9b..f1f2c6b 100644 --- a/fatcat_covid19/templates/fulltext_search.html +++ b/fatcat_covid19/templates/fulltext_search.html @@ -12,7 +12,7 @@ {% block fullmain %} -
+

Search all COVID-19 Resources

@@ -31,42 +31,58 @@
-
-
{% if found %} -{% if found.results %} - {{ entity_macros.top_results(found) }} + {% if found.results %} - {% for paper in found.results %} - {{ entity_macros.fulltext_search_result_row(paper) }} -{% endfor %} -{% if found.results|length > 8 %} -
-
- {{ entity_macros.bottom_results(found)}} -
-{% endif %} -{% else %} +
+ {{ entity_macros.top_results(found) }} +
+
+
+ {% for paper in found.results %} + {{ entity_macros.fulltext_search_result_row(paper) }} + {% endfor %} +
+
+ {% if found.results|length > 8 %} +
+
+
+ {{ entity_macros.bottom_results(found)}} +
+
+ {% endif %} -Raw query was: {{ found.query.q }} + {% else %} + {# "did a query, but no results" #} +
+
+ Raw query was: {{ found.query.q }} -
-
-
- confused paper man +
+
+ {# +
+ confused paper man +
+ #} +
+

No results found!

+

You could try elsewhere:

+ +
+
+
-
-

No results found!

-

You could try elsewhere:

- -
-{% endif %} + + {% endif %} +{% else %} + {# "no query submitted" #} {% endif %} -
{% endblock %} diff --git a/fatcat_covid19/templates/home.html b/fatcat_covid19/templates/home.html index dbfb833..b78cb1c 100644 --- a/fatcat_covid19/templates/home.html +++ b/fatcat_covid19/templates/home.html @@ -9,10 +9,10 @@ {% block fullmain %} -
+

- {{ _("Search tens of thousands of COVID-19 research papers and documents") }} + {{ _("Search Tens of Thousands of COVID-19 Research Papers and Reports") }}


@@ -27,20 +27,6 @@
-
-
-
-
-
- {{ _("Project Status") }}: {{ _("Prototype") }} -   - {{ _("These resources are not qualified medical advice!") }} -
-
-
-
-
- {#
diff --git a/fatcat_covid19/webface.py b/fatcat_covid19/webface.py index 5476884..12ccac5 100644 --- a/fatcat_covid19/webface.py +++ b/fatcat_covid19/webface.py @@ -23,7 +23,9 @@ class BaseConfig(object): ELASTICSEARCH_BACKEND = os.environ.get("ELASTICSEARCH_BACKEND", default="https://search.fatcat.wiki") ELASTICSEARCH_FULLTEXT_INDEX = os.environ.get("ELASTICSEARCH_FULLTEXT_INDEX", default="covid19_fatcat_fulltext") + COVID19_FULLTEXT_HOST = os.environ.get("COVID19_FULLTEXT_HOST", default="https://covid19.fatcat.wiki") + # this variable is vestigal, used in some jinja2 templates FATCAT_DOMAIN = "covid19.fatcat.wiki" SENTRY_CONFIG = { -- cgit v1.2.3