summaryrefslogtreecommitdiffstats
path: root/python/fatcat_web/templates
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2019-06-13 14:24:16 -0700
committerBryan Newbold <bnewbold@robocracy.org>2019-06-13 14:24:16 -0700
commit404f6ff6d542dc6dc61395cdb25646e3a69eb061 (patch)
treec70a5421be53f935674f64f0d519a31e32fba4d4 /python/fatcat_web/templates
parent95286700bbe06c8c0676e08acc0b6dc4a8f8504d (diff)
downloadfatcat-404f6ff6d542dc6dc61395cdb25646e3a69eb061.tar.gz
fatcat-404f6ff6d542dc6dc61395cdb25646e3a69eb061.zip
implement major refactor for other entity types
Diffstat (limited to 'python/fatcat_web/templates')
-rw-r--r--python/fatcat_web/templates/changelog_view.html1
-rw-r--r--python/fatcat_web/templates/container_edit.html3
-rw-r--r--python/fatcat_web/templates/container_view.html34
-rw-r--r--python/fatcat_web/templates/creator_view.html8
-rw-r--r--python/fatcat_web/templates/editgroup_view.html2
-rw-r--r--python/fatcat_web/templates/file_edit.html8
-rw-r--r--python/fatcat_web/templates/file_view.html4
-rw-r--r--python/fatcat_web/templates/fileset_view.html8
-rw-r--r--python/fatcat_web/templates/release_edit.html8
-rw-r--r--python/fatcat_web/templates/release_view.html80
-rw-r--r--python/fatcat_web/templates/webcapture_view.html6
-rw-r--r--python/fatcat_web/templates/work_view.html8
12 files changed, 87 insertions, 83 deletions
diff --git a/python/fatcat_web/templates/changelog_view.html b/python/fatcat_web/templates/changelog_view.html
index 8c4684d5..5b403b09 100644
--- a/python/fatcat_web/templates/changelog_view.html
+++ b/python/fatcat_web/templates/changelog_view.html
@@ -1,3 +1,4 @@
+{% set auth_to = {} %}
{% extends "editgroup_view.html" %}
{% block editgroupheader %}
diff --git a/python/fatcat_web/templates/container_edit.html b/python/fatcat_web/templates/container_edit.html
index 91432d5e..238335b4 100644
--- a/python/fatcat_web/templates/container_edit.html
+++ b/python/fatcat_web/templates/container_edit.html
@@ -10,7 +10,7 @@
{% endblock %}
{{ form.hidden_tag() }}
- <h3 class="ui dividing header">Editgroup</h3>
+ <h3 class="ui dividing header">Editgroup Metadata</h3>
{{ edit_macros.editgroup_dropdown(form, editgroup, potential_editgroups) }}
<h3 class="ui dividing header">The Basics</h3>
@@ -70,7 +70,6 @@
<!-- Form code -->
$(document).ready(function() {
- $('.ui.accordion').accordion();
$('.ui.dropdown') .dropdown();
var fixup_url_numbering = function(group_item) {
diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html
index ef4335fb..b86b1aa7 100644
--- a/python/fatcat_web/templates/container_view.html
+++ b/python/fatcat_web/templates/container_view.html
@@ -1,4 +1,4 @@
-{% set entity = container %}
+{% set container = entity %}
{% import "entity_macros.html" as entity_macros %}
{% extends "base.html" %}
@@ -50,9 +50,9 @@
<div class="five wide column">
<div class="ui segment top attached">
-{% if container.es and container.es.is_oa == True %}
+{% if container._es and container._es.is_oa == True %}
<i class="icon unlock huge orange"></i><b>Open Access Publisher</b>
-{% elif container.es and container.es.is_oa == False %}
+{% elif container._es and container._es.is_oa == False %}
<i class="icon lock huge black"></i><b>Not Open Access</b>
{% else %}
<i class="icon question huge grey"></i><b>Unknown OA Status</b>
@@ -77,37 +77,37 @@
</div><div class="ui segment attached">
{% endif %}
-{% if container_stats %}
+{% if container._stats %}
<b>Release Counts</b><br>
- {{ "{:,}".format(container_stats.total) }} total
- {% if container_stats.total >= 1 %}
- <br>{{ "{:,}".format(container_stats.is_preserved) }}
- (<b>{{ "{:.1f}".format(container_stats.is_preserved/container_stats.total*100) }}%</b>)
+ {{ "{:,}".format(container._stats.total) }} total
+ {% if container._stats.total >= 1 %}
+ <br>{{ "{:,}".format(container._stats.is_preserved) }}
+ (<b>{{ "{:.1f}".format(container._stats.is_preserved/container._stats.total*100) }}%</b>)
preserved or archived
- <br>{{ "{:,}".format(container_stats.in_web) }}
- (<b>{{ "{:.1f}".format(container_stats.in_web/container_stats.total*100) }}%</b>)
+ <br>{{ "{:,}".format(container._stats.in_web) }}
+ (<b>{{ "{:.1f}".format(container._stats.in_web/container._stats.total*100) }}%</b>)
fulltext available to read
{% endif %}
</div><div class="ui segment attached">
{% endif %}
-{% if (container.es and container.es != None) %}
+{% if (container._es and container._es != None) %}
<b>Directory Listings</b><br>
- {% if container.es.in_doaj == True %}
+ {% if container._es.in_doaj == True %}
<i class="icon check green"></i> In <a href="https://doaj.org/toc/{{ container.issnl }}">DOAJ</a><br>
- {% elif container.es.in_doaj == False %}
+ {% elif container._es.in_doaj == False %}
<i class="icon times grey"></i> Not in <a href="https://doaj.org">DOAJ</a><br>
{% endif %}
- {% if container.es.in_road == True %}
+ {% if container._es.in_road == True %}
<i class="icon check green"></i> In <a href="http://road.issn.org/issn/{{ container.issnl }}">ISSN ROAD</a><br>
- {% elif container.es.in_road == False %}
+ {% elif container._es.in_road == False %}
<i class="icon times grey"></i> Not in <a href="https://road.issn.org">ISSN ROAD</a><br>
{% endif %}
- {% if container.es.in_kbart == True %}
+ {% if container._es.in_kbart == True %}
<i class="icon check green"></i> In <a href="https://thekeepers.org/purl/issn/{{ container.issnl }}">Keepers Registery</a><br>
- {% elif container.es.in_kbart == False %}
+ {% elif container._es.in_kbart == False %}
<i class="icon times grey"></i> Not in <a href="https://thekeepers.org/journals?query={{ container.issnl }}">Keepers Registry</a><br>
{% endif %}
diff --git a/python/fatcat_web/templates/creator_view.html b/python/fatcat_web/templates/creator_view.html
index 63308a51..63f83917 100644
--- a/python/fatcat_web/templates/creator_view.html
+++ b/python/fatcat_web/templates/creator_view.html
@@ -1,4 +1,4 @@
-{% set entity = creator %}
+{% set creator = entity %}
{% import "entity_macros.html" as entity_macros %}
{% extends "base.html" %}
@@ -38,9 +38,9 @@
<br>
<h3>Releases</h3>
-{% if releases != [] %}
+{% if creator._releases != [] %}
<p>This creator has contributed to:
- {{ entity_macros.release_list(releases) }}
+ {{ entity_macros.release_list(creator._releases) }}
{% else %}
This creator has not contributed to any releases.
{% endif %}
@@ -68,7 +68,7 @@ This creator has not contributed to any releases.
<br><a href="https://scholar.google.com/scholar?q={{ creator.display_name|urlencode }}">Google Scholar</a>
</div>
-{{ entity_macros.fatcat_bits(entity, "creator", "") }}
+{{ entity_macros.fatcat_bits(entity, "creator", "", editgroup) }}
</div>
</div>
diff --git a/python/fatcat_web/templates/editgroup_view.html b/python/fatcat_web/templates/editgroup_view.html
index 41434a42..2b56d838 100644
--- a/python/fatcat_web/templates/editgroup_view.html
+++ b/python/fatcat_web/templates/editgroup_view.html
@@ -23,7 +23,7 @@
updated
{% endif %}
<a href="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/{{ edit.ident }}">[view edit]</a>
- {% if auth_to.edit and not editgroup.changelog_index and not editgroup.submitted %}
+ {% if auth_to.edit and not editgroup.changelog_index and not editgroup.submitted and entity_type in ('release', 'file', 'container') %}
<a href="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/{{ edit.ident }}/edit" style="color: green;">[re-edit]</a>
<form id="submit_edit_delete" method="POST" action="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/edit/{{ edit.edit_id }}/delete" style="display:inline;">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
diff --git a/python/fatcat_web/templates/file_edit.html b/python/fatcat_web/templates/file_edit.html
index bef80ee3..74a5682a 100644
--- a/python/fatcat_web/templates/file_edit.html
+++ b/python/fatcat_web/templates/file_edit.html
@@ -6,12 +6,12 @@
<div class="ui segment">
<h1 class="ui header">Edit File Entity</h1>
-<form class="ui form" id="edit_file_form" method="POST" action="/file/{{ entity.ident }}/edit">
+<form class="ui form" id="edit_file_form" method="POST" action="{% if editgroup %}/editgroup/{{ editgroup.editgroup_id }}{% endif %}/file/{{ existing_ident }}/edit">
{% endblock %}
{{ form.hidden_tag() }}
- <br>
- {{ edit_macros.editgroup_dropdown(form) }}
+ <h3 class="ui dividing header">Editgroup Metadata</h3>
+ {{ edit_macros.editgroup_dropdown(form, editgroup, potential_editgroups) }}
<br>
<h3 class="ui dividing header">File Metadata</h3>
@@ -103,7 +103,7 @@
<!-- Form code -->
$(document).ready(function() {
- $('.ui.accordion').accordion();
+ $('.ui.dropdown') .dropdown();
var fixup_url_numbering = function(group_item) {
items = Array.from(group_item.querySelectorAll(".list-group-item"))
diff --git a/python/fatcat_web/templates/file_view.html b/python/fatcat_web/templates/file_view.html
index 097ee5f6..39ffaaa0 100644
--- a/python/fatcat_web/templates/file_view.html
+++ b/python/fatcat_web/templates/file_view.html
@@ -1,4 +1,4 @@
-{% set entity = file %}
+{% set file = entity %}
{% import "entity_macros.html" as entity_macros %}
{% extends "base.html" %}
@@ -75,7 +75,7 @@ No known public URL, mirror, or archive for this file.
</div>
{% endif %}
-{{ entity_macros.fatcat_bits(entity, "file", "") }}
+{{ entity_macros.fatcat_bits(entity, "file", "", editgroup) }}
</div>
</div>
diff --git a/python/fatcat_web/templates/fileset_view.html b/python/fatcat_web/templates/fileset_view.html
index 7f41e617..7bc46d45 100644
--- a/python/fatcat_web/templates/fileset_view.html
+++ b/python/fatcat_web/templates/fileset_view.html
@@ -1,4 +1,4 @@
-{% set entity = fileset %}
+{% set fileset = entity %}
{% import "entity_macros.html" as entity_macros %}
{% extends "base.html" %}
@@ -64,13 +64,13 @@ No known public URL, mirror, or archive for this File Set.
</div>
<div class="five wide column">
-{% if fileset.total_size != None %}
+{% if fileset._total_size != None %}
<div class="ui segment attached">
- <p><b>Total Size</b> &nbsp;{{ fileset.total_size|filesizeformat }}
+ <p><b>Total Size</b> &nbsp;{{ fileset._total_size|filesizeformat }}
</div>
{% endif %}
-{{ entity_macros.fatcat_bits(entity, "fileset", "") }}
+{{ entity_macros.fatcat_bits(entity, "fileset", "", editgroup) }}
</div>
</div>
diff --git a/python/fatcat_web/templates/release_edit.html b/python/fatcat_web/templates/release_edit.html
index b3beec2b..9a4cf80d 100644
--- a/python/fatcat_web/templates/release_edit.html
+++ b/python/fatcat_web/templates/release_edit.html
@@ -6,12 +6,12 @@
<div class="ui segment">
<h1 class="ui header">Edit Release Entity</h1>
-<form class="ui form" id="edit_release_form" method="POST" action="/release/{{ entity.ident }}/edit">
+<form class="ui form" id="edit_release_form" method="POST" action="{% if editgroup %}/editgroup/{{ editgroup.editgroup_id }}{% endif %}/release/{{ existing_ident }}/edit">
{% endblock %}
{{ form.hidden_tag() }}
- <br>
- {{ edit_macros.editgroup_dropdown(form) }}
+ <h3 class="ui dividing header">Editgroup Metadata</h3>
+ {{ edit_macros.editgroup_dropdown(form, editgroup, potential_editgroups) }}
<br>
<h3 class="ui dividing header">The Basics</h3>
@@ -134,7 +134,7 @@ $(document).ready(function() {
// form focusing (eg, for required fields) :(
//$('#release_type').dropdown();
//$('#release_stage').dropdown();
- $('.ui.accordion').accordion();
+ $('.ui.dropdown') .dropdown();
var fixup_contrib_numbering = function(group_item) {
items = Array.from(group_item.querySelectorAll(".list-group-item"))
diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html
index a5977166..5fdc2244 100644
--- a/python/fatcat_web/templates/release_view.html
+++ b/python/fatcat_web/templates/release_view.html
@@ -1,4 +1,4 @@
-{% set entity = release %}
+{% set release = entity %}
{% import "entity_macros.html" as entity_macros %}
{% extends "base.html" %}
@@ -19,7 +19,7 @@
<meta name="DC.description" content="{{ release.abstracts[0].content }}">
<meta name="twitter:description" content="{{ release.abstracts[0].content }}">
{% endif %}
- {% for author in authors %}
+ {% for author in release._authors %}
<meta name="DC.creator" content="{{ author.raw_name }}">
<meta name="citation_author" content="{{ author.raw_name }}">
{% endfor %}
@@ -89,15 +89,16 @@
</span>
</h1>
<p style="font-size: larger;">
- {% if authors != [] %} by {% endif %}
- {% for contrib in authors[:12] %}
+ {% if release._authors != [] %} by {% endif %}
+ {% for contrib in release._authors[:12] %}
{% if contrib.creator_id %}
<b><a href="/creator/{{contrib.creator_id}}">{{ contrib.raw_name }}</a></b>{% if not loop.last %}, {% endif %}
{% else %}
{% if contrib.raw_name != None %}{{ contrib.raw_name }}{% else %}<i>Unknown</i>{% endif %}{% if not loop.last %}, {% endif %}
{% endif %}
{% endfor %}
- {% if authors|count > 12 %} <b>(+{{ authors|length - 12 }} others)</b>
+ {% if release._authors|count > 12 %} <b>
+ (+{{ release._authors|length - 12 }} others)</b>
{% endif %}
</div>
</div>
@@ -109,10 +110,10 @@
<div class="ui accordion">
<div class="title" itemprop="isPartOf" itemscope itemtype="http://schema.org/Periodical" itemid="#container">
{% if release.release_stage == 'published' %}
- <i class="dropdown icon"></i>Published in <a href="/container/{{ container.ident }}"><span itemprop="name">{{ container.name }}</span></a>
+ <i class="dropdown icon"></i>Published in <a href="/container/{{ release.container.ident }}"><span itemprop="name">{{ release.container.name }}</span></a>
{% else %}
<i class="dropdown icon"></i>Released as a <i>{{ release.release_type }}</i>
- {% if container %} in <a href="/container/{{ container.ident }}"><span itemprop="name">{{ container.name }}</span></a> {% endif %}
+ {% if release.container %} in <a href="/container/{{ release.container.ident }}"><span itemprop="name">{{ release.container.name }}</span></a> {% endif %}
{% endif %}
{% if release.publisher %}
by <span itemprop="publisher">{{ release.publisher }}</span>
@@ -128,9 +129,9 @@
<tr><td class="right aligned">Version</td>
<td class="">{{ release.version }}
{% endif %}
- {% if container != None and container.issnl != None %}
+ {% if release.container != None and release.container.issnl != None %}
<tr><td class="right aligned">ISSN-L</td>
- <td class="" itemprop="issn">{{ container.issnl }}
+ <td class="" itemprop="issn">{{ release.container.issnl }}
{% endif %}
{% if release.volume != None %}
<tr itemprop="isPartOf" itemscope itemtype="http://schema.org/PublicationVolume">
@@ -154,9 +155,9 @@
<tr><td class="right aligned">Release Year</td>
<td class="">{{ release.release_year }}
{% endif %}
- {% if container != None and container.container_type != None %}
+ {% if release.container != None and release.container.container_type != None %}
<tr><td class="right aligned">Container Type</td>
- <td class="">{{ container.container_type }}
+ <td class="">{{ release.container.container_type }}
{% endif %}
{% if release.publisher != None %}
<tr><td class="right aligned">Publisher</td>
@@ -215,7 +216,7 @@
{{ entity_macros.extra_metadata(entity.extra) }}
{% endif %}
-
+{% if entity.status == 'active' %}
<h3>Known Files and URLs</h3>
{% if entity.files != [] %}
<table class="ui compact fixed table">
@@ -251,14 +252,15 @@
<p>There are no known files associated with this release (you could try
<a href="/work/{{ release.work_id }}">other releases for this work?</a>).
{% endif %}
+{% endif %}
-
+{% if entity.status == 'active' %}
{% if entity.filesets != [] %}
<h3>File Sets</h3>
<table class="ui compact fixed table">
<tbody>
{% for fileset in entity.filesets %}
- <tr><td>{{ fileset.manifest|count }} files &nbsp;{{ fileset.total_size|filesizeformat }}
+ <tr><td>{{ fileset.manifest|count }} files &nbsp;{{ fileset._total_size|filesizeformat }}
<br><small><code><a href="/fileset/{{ fileset.ident }}">fileset:{{ fileset.ident }}</a></code></small>
<td class="single line">
{% for url in fileset.urls[:5] %}
@@ -275,8 +277,9 @@
</tbody>
</table>
{% endif %}
+{% endif %}
-
+{% if entity.status == 'active' %}
{% if entity.webcaptures != [] %}
<h3>Web Captures</h3>
<table class="ui single line compact fixed table">
@@ -287,7 +290,7 @@
<br><small><code><a href="/webcapture/{{ webcapture.ident }}">webcapture:{{ webcapture.ident }}</a></code></small>
<td class="single line">
{% for url in webcapture.archive_urls[:5] %}
- <a href="{{ url.url }}{% if url.rel == "wayback" %}{{ webcapture.wayback_suffix }}{% endif %}">{{ url.url.split('/')[2] }}</a> ({{ url.rel }})<br>
+ <a href="{{ url.url }}{% if url.rel == "wayback" %}{{ webcapture._wayback_suffix }}{% endif %}">{{ url.url.split('/')[2] }}</a> ({{ url.rel }})<br>
{% endfor %}
{% if webcapture.urls|length > 5 %}
+ {{ file.urls|length - 5 }} more URLs
@@ -296,6 +299,7 @@
</tbody>
</table>
{% endif %}
+{% endif %}
{% if release.refs != None and release.refs.size != 0 %}
@@ -335,10 +339,10 @@
</div>
<div class="five wide column">
-{% if entity.files != [] and entity.files[0].urls != [] %}
+{% if entity.status == 'active' and entity.files != [] and entity.files[0].urls != [] %}
<a href="{{ entity.files[0].urls[0].url }}" class="ui top attached fluid huge green button"><i class="file pdf outline icon"></i>Download Full Text</a>
-{% elif entity.webcaptures != [] and entity.webcaptures[0].archive_urls != [] and entity.webcaptures[0].archive_urls[0].rel == "wayback" %}
-<a href="{{ entity.webcaptures[0].archive_urls[0].url }}{{ entity.webcaptures[0].wayback_suffix }}" class="ui top attached fluid huge green button"><i class="file archive outline icon"></i>View Web Archive</a>
+{% elif entity.status == 'active' and entity.webcaptures != [] and entity.webcaptures[0].archive_urls != [] and entity.webcaptures[0].archive_urls[0].rel == "wayback" %}
+<a href="{{ entity.webcaptures[0].archive_urls[0].url }}{{ entity.webcaptures[0]._wayback_suffix }}" class="ui top attached fluid huge green button"><i class="file archive outline icon"></i>View Web Archive</a>
{% else %}
<span class="ui top attached fluid huge grey button"><i class="file cross icon"></i>No Full Text Available</span>
{% endif %}
@@ -401,36 +405,36 @@
</div>
{% endif %}
-{% if container != None and container.es %}
+{% if release.container != None and release.container._es %}
<div class="ui segment attached">
<b>Container Metadata</b><br>
-{% if container.es.is_oa == True %}
+{% if release.container._es.is_oa == True %}
<i class="icon unlock orange"></i>Open Access Publication<br>
-{% elif container.es.is_oa == False %}
+{% elif release.container._es.is_oa == False %}
<i class="icon lock black"></i>Not Open Access<br>
{% else %}
<i class="icon question grey"></i>Unknown OA Status<br>
{% endif %}
-{% if (container.es != None) %}
- {% if container.es.in_doaj == True %}
- <i class="icon check green"></i> In <a href="https://doaj.org/toc/{{ container.issnl }}">DOAJ</a><br>
- {% elif container.es.in_doaj == False %}
+{% if (release.container._es != None) %}
+ {% if release.container._es.in_doaj == True %}
+ <i class="icon check green"></i> In <a href="https://doaj.org/toc/{{ release.container.issnl }}">DOAJ</a><br>
+ {% elif release.container._es.in_doaj == False %}
<i class="icon times grey"></i> Not in <a href="https://doaj.org">DOAJ</a><br>
{% endif %}
- {% if container.es.in_road == True %}
- <i class="icon check green"></i> In <a href="http://road.issn.org/issn/{{ container.issnl }}">ISSN ROAD</a><br>
- {% elif container.es.in_road == False %}
+ {% if release.container._es.in_road == True %}
+ <i class="icon check green"></i> In <a href="http://road.issn.org/issn/{{ release.container.issnl }}">ISSN ROAD</a><br>
+ {% elif release.container._es.in_road == False %}
<i class="icon times grey"></i> Not in <a href="https://road.issn.org">ISSN ROAD</a><br>
{% endif %}
- {% if container.es.in_kbart == True %}
- <i class="icon check green"></i> In <a href="https://thekeepers.org/purl/issn/{{ container.issnl }}">Keepers Registery</a><br>
- {% elif container.es.in_kbart == False %} <i class="icon times grey"></i> Not in <a href="https://thekeepers.org/journals?query={{ container.issnl }}">Keepers Registry</a><br>
+ {% if release.container._es.in_kbart == True %}
+ <i class="icon check green"></i> In <a href="https://thekeepers.org/purl/issn/{{ release.container.issnl }}">Keepers Registery</a><br>
+ {% elif release.container._es.in_kbart == False %} <i class="icon times grey"></i> Not in <a href="https://thekeepers.org/journals?query={{ release.container.issnl }}">Keepers Registry</a><br>
{% endif %}
{% endif %}
-{% if container.issnl != None %}
- <i class="icon linkify"></i>ISSN-L: &nbsp;<code>{{ container.issnl }}</code><br>
+{% if release.container.issnl != None %}
+ <i class="icon linkify"></i>ISSN-L: &nbsp;<code>{{ release.container.issnl }}</code><br>
{% endif %}
- <a href="/container/{{ container.ident }}" title="container {{ container.ident }}"><i class="icon share"></i>Fatcat Entry</a>
+ <a href="/container/{{ release.container.ident }}" title="container {{ release.container.ident }}"><i class="icon share"></i>Fatcat Entry</a>
</div>
{% endif %}
@@ -457,8 +461,8 @@
<div class="ui segment attached accordion">
<div class="title" style="padding: 0px;"><i class="dropdown icon"></i><b>Lookup Links</b></div>
<div class="content">
- {% if container != None and container.issnl != None %}
- <a href="http://www.sherpa.ac.uk/romeo/issn/{{ container.issnl }}/">SHERPA/RoMEO</a> (journal policies)<br/>
+ {% if release.container != None and release.container.issnl != None %}
+ <a href="http://www.sherpa.ac.uk/romeo/issn/{{ release.container.issnl }}/">SHERPA/RoMEO</a> (journal policies)<br/>
{% endif %}
{% if release != None and release.ext_ids.doi != None %}
<a href="https://oadoi.org/{{ release.ext_ids.doi }}">oaDOI/unpaywall</a><br/>
@@ -479,7 +483,7 @@
</div>
</div>
-{{ entity_macros.fatcat_bits(entity, "release", "container,files,filesets,webcaptures") }}
+{{ entity_macros.fatcat_bits(entity, "release", "container,files,filesets,webcaptures", editgroup) }}
</div>
</div>
diff --git a/python/fatcat_web/templates/webcapture_view.html b/python/fatcat_web/templates/webcapture_view.html
index 9020bf63..b5495cee 100644
--- a/python/fatcat_web/templates/webcapture_view.html
+++ b/python/fatcat_web/templates/webcapture_view.html
@@ -1,4 +1,4 @@
-{% set entity = webcapture %}
+{% set webcapture = entity %}
{% import "entity_macros.html" as entity_macros %}
{% extends "base.html" %}
@@ -36,7 +36,7 @@
<br>
<h3>Archive URLs</h3>
{% if webcapture.archive_urls != None %}
- {{ entity_macros.url_list(webcapture.archive_urls, webcapture.wayback_suffix) }}
+ {{ entity_macros.url_list(webcapture.archive_urls, webcapture._wayback_suffix) }}
{% else %}
No known public archive for this webcapture.
{% endif %}
@@ -78,7 +78,7 @@ This web capture is empty (contains no resources).
</div>
{% endif %}
-{{ entity_macros.fatcat_bits(entity, "webcapture", "") }}
+{{ entity_macros.fatcat_bits(entity, "webcapture", "", editgroup) }}
</div>
</div>
diff --git a/python/fatcat_web/templates/work_view.html b/python/fatcat_web/templates/work_view.html
index 507498c8..aa32ba39 100644
--- a/python/fatcat_web/templates/work_view.html
+++ b/python/fatcat_web/templates/work_view.html
@@ -1,4 +1,4 @@
-{% set entity = work %}
+{% set work = entity %}
{% import "entity_macros.html" as entity_macros %}
{% extends "base.html" %}
@@ -22,8 +22,8 @@
{% endif %}
<h3>Releases</h3>
-{% if releases != [] %}
- {{ entity_macros.release_list(releases) }}
+{% if work._releases != [] and work._releases != None %}
+ {{ entity_macros.release_list(work._releases) }}
{% else %}
<p>There are no known releases associated with this work.
{% endif %}
@@ -42,7 +42,7 @@ reference the same underlying "work".
<div class="five wide column">
-{{ entity_macros.fatcat_bits(entity, "work", "") }}
+{{ entity_macros.fatcat_bits(entity, "work", "", editgroup) }}
</div>
</div>