From d0c6b6745f2206c3b4107fbe3d1905b4910c3ba8 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 15 Jan 2021 03:15:56 -0800 Subject: progress on modals; restyle buttons --- fatcat_scholar/templates/base.html | 18 ++- fatcat_scholar/templates/search_macros.html | 211 ++++++++++------------------ 2 files changed, 90 insertions(+), 139 deletions(-) diff --git a/fatcat_scholar/templates/base.html b/fatcat_scholar/templates/base.html index 1cc9e86..6af387d 100644 --- a/fatcat_scholar/templates/base.html +++ b/fatcat_scholar/templates/base.html @@ -37,17 +37,26 @@ .ui.button.serp-button { border-radius: 0; - margin-bottom: 0.3em; + margin-bottom: 0.4em; text-align: left; } .ui.blue.button.serp-button { - background-color: #2224c7ad; + background-color: #6b6ebb; } .ui.labeled.icon.button.serp-button { - padding-left: 3.5em!important; + padding-left: 3.0em!important; padding-right: 1em!important; + min-width: 12em; + max-width: 15em; + box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.3); + } + + .action-bar { + display: flex; + justify-content: center; + column-gap: 0.3em; } @media only screen and (max-width: 767px) { @@ -56,9 +65,6 @@ @media only screen and (min-width: 768px) { .mobile-only { display: none !important; } } - @media only screen and (max-width: 991px) and (min-width: 768px) { - .ui.container { width: 820px; } - } @media only screen and (max-width: 991px) { .tablet-hide { display: none !important; } .ui.grid>[class*="fourteen wide"].column.serp-column { diff --git a/fatcat_scholar/templates/search_macros.html b/fatcat_scholar/templates/search_macros.html index 5f19506..c26ce7b 100644 --- a/fatcat_scholar/templates/search_macros.html +++ b/fatcat_scholar/templates/search_macros.html @@ -45,8 +45,8 @@ {% if biblio.doaj_id %} doaj:{{ biblio.doaj_id }}   {% endif %} - {% if biblio.release_ident %} - fatcat:{{ biblio.release_ident}}   + {% if biblio.release_ident or biblio.ident %} + fatcat:{{ biblio.release_ident or biblio.ident }}   {% endif %} {% endmacro %} @@ -82,7 +82,7 @@ {% endmacro %} {% macro fulltext_search_result_row(paper, locale=None, debug_mode=False) -%} -
+
{# ### TITLE ROW #}

@@ -196,35 +196,6 @@
{# ### ACCESS LINKS #} - {# trusted platform fulltext links #} - {# TODO: DOAJ, dblp #} - {% if paper.biblio.arxiv_id %} - - - - {% elif paper.biblio.pmid %} - - - - {% endif %} - - {# publisher (DOI) link #} - {# TODO: detect prefix? JSTOR, biorxiv, medrxiv, zenodo, figshare, dryad, etc #} - {% if paper.biblio.doi %} - - - - {% endif %} - {# archive links (if available) #} {% if paper.fulltext and paper.fulltext.access_url %} {% if paper.fulltext.file_mimetype == "application/pdf" %} @@ -236,18 +207,27 @@ {% endif %} {% endif %} {# ### OTHER ACTIONS #} - - - - - - +
+ + + + + + +
{# ### CITATION MODAL #} + {% if paper.doc_type == "work" %} -

Cite Paper

- Something something bibtex will go here. +

{% trans %}Cite Work{% endtrans %}

+ + + + + + + + + + + +
Generic{{ paper._obj.biblio.citation_str("default") }}
BibTeX
{{ paper._obj.biblio.citation_str("bibtex") }}
 + {% endif %} {# ### VERSIONS MODAL #} -

Paper Versions

+

{% trans %}Access Options{% endtrans %}

{% if paper.fulltext.thumbnail_url %} - fulltext thumbnail -
+ + fulltext thumbnail + {% endif %} - There are several versions of this paper! - - - - - - - - - - + {% for access in paper.access %} + {% if access.access_type == "ia_sim" %} +

There is a digitized microfilm copy at archive.org. + {% elif access.access_type == "ia_file" %} +

There is a {{ access.mimetype }} file at archive.org. + {% elif access.access_type == "wayback" %} +

There is a {{ access.mimetype }} file in The Wayback Machine. + {% else %} +

Some other access here. + {% endif %} + {% endfor %} + + {% if paper.releases|length > 1 %} +

All Versions

{% for release in paper.releases %} - - - - - - - {% endfor %} - {% for access in paper.access %} - {% if not access.release_ident and access.access_type == "ia_sim" %} - - - - - - - {% endif %} +
+ {{ journal_row(release, paper) }} +
+ {{ external_identifiers(release) }} +
+
{% endfor %} - -
{{ _("Publication Stage") }}{{ _("Date") }}{{ _("Fulltext") }}{{ _("Metadata") }}
- - {{ release.release_stage or _("unknown") }} - - - {% if release.release_date %} - {{ release.release_date }} - {% elif release.release_year %} - {{ release.release_year }} - {% endif %} - - {% for access in paper.access %} - {% if access.release_ident == release.ident %} - - - {% if access.mimetype == "application/pdf" %} - - {% endif %} - {{ access.access_type }} - - - {% endif %} - {% endfor %} - - - - - fatcat - - -
- - {{ _("published") }} - - - - - - {{ _("microfilm") }} - - -
- + {% endif %}
-- cgit v1.2.3