diff options
| author | Bryan Newbold <bnewbold@robocracy.org> | 2020-04-23 17:22:22 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@robocracy.org> | 2020-04-23 17:31:18 -0700 |
| commit | 149140e2b9f66f389299914c058c648d8bba8120 (patch) | |
| tree | 4ffb2ac7677ac349f54dd9816bddac5b15ff3901 /python/fatcat_web | |
| parent | e749b576bdb9bbec3bcef7e4e389e7fbbf916c84 (diff) | |
| download | fatcat-149140e2b9f66f389299914c058c648d8bba8120.tar.gz fatcat-149140e2b9f66f389299914c058c648d8bba8120.zip | |
web: fix ident=None broken links
On web interface views for revisions, we had a bunch of broken links
because the ident is "None". This commit fixes these by removing the
links.
Diffstat (limited to 'python/fatcat_web')
| -rw-r--r-- | python/fatcat_web/templates/container_view.html | 2 | ||||
| -rw-r--r-- | python/fatcat_web/templates/entity_macros.html | 2 | ||||
| -rw-r--r-- | python/fatcat_web/templates/release_view.html | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html index 8d7c4cae..cf444956 100644 --- a/python/fatcat_web/templates/container_view.html +++ b/python/fatcat_web/templates/container_view.html @@ -23,6 +23,7 @@ Published by {{ container.publisher }} {% endif %} +{% if container.state == "active" %} <h3>Search Releases from this Container</h3> <form class="" role="search" action="/release/search" method="get"> <div class="ui form"> @@ -33,6 +34,7 @@ </div> </div> </form> +{% endif %} {% if container._random_releases %} <h3>Example Publications</h3> diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html index 7c5436c6..3308a3d5 100644 --- a/python/fatcat_web/templates/entity_macros.html +++ b/python/fatcat_web/templates/entity_macros.html @@ -54,10 +54,12 @@ </a> </div> +{% if entity.ident %} <div class="two ui buttons bottom attached"> <a href="{% if editgroup %}/editgroup/{{ editgroup.editgroup_id }}{% endif %}/{{ entity_type }}/{{ entity.ident }}/edit" class="ui blue button">Edit Metadata</a> <a href="/{{ entity_type }}/{{ entity.ident }}/history" class="ui button">View History</a> </div> +{% endif %} {%- endmacro %} diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html index d7c4e76e..60e4624e 100644 --- a/python/fatcat_web/templates/release_view.html +++ b/python/fatcat_web/templates/release_view.html @@ -3,9 +3,9 @@ {% import "entity_macros.html" as entity_macros %} {% extends "entity_base.html" %} -{# HTML metadata embeddings #} -{% if release and release.status == "active" %} - {% block extra_head %} +{% block extra_head %} + {% if release and release.state == "active" %} + {# HTML metadata embeddings #} <link rel="canonical" href="https://{{ config.FATCAT_DOMAIN }}/release/{{ entity.ident }}"> <meta name="twitter:card" content="summary"> @@ -70,8 +70,8 @@ <meta name="citation_pdf_url" content="{{ url.url }}"> {% endif %} {% endfor %}{% endfor %} - {% endblock %} -{% endif %} + {% endif %} +{% endblock %} {% block main_extra_attr %}itemscope itemtype="http://schema.org/ScholarlyArticle" itemid="#release"{% endblock %} @@ -388,7 +388,7 @@ accessible version. <br>grouping other versions (eg, pre-print) and variants of this release </div> -{% if release._can_citeproc %} +{% if release.state == "active" and release._can_citeproc %} <div class="ui segment attached accordion"> <div class="title" style="padding: 0px;"> <i class="dropdown icon"></i><b>Cite This Release</b> |