improve/fix deleted entity view

2 files changed, 8 insertions, 14 deletions

diff --git a/python/fatcat_web/templates/deleted_entity.html b/python/fatcat_web/templates/deleted_entity.html
index af25da54..a19910e7 100644
--- a/python/fatcat_web/templates/deleted_entity.html
+++ b/python/fatcat_web/templates/deleted_entity.html
@@ -23,20 +23,11 @@
 <div class="five wide column">
 <div class="ui segment top attached">
 
-<b>Entity Type:</b> {{ entity_type }}
-</div><div class="ui segment attached">
-
-<b>Fatcat Bits</b>
-<p>State is "{{ entity.state }}". Revision:
-<br><small><code>{{ entity.revision }}</code></small>
-<br><a href="https://api.{{ config.FATCAT_DOMAIN }}/v0/{{ entity_type }}/{{ entity.ident }}">As JSON object via API</a>
-
-</div>
-<div class="two ui buttons bottom attached">
-  <a href="/entity/{{ entity.ident }}/edit" class="ui blue button">Edit Metadata</a>
-  <a href="/entity/{{ entity.ident }}/history" class="ui button">View History</a>
+<b>Entity Type:</b> <code>{{ entity_type }}</code>
 </div>
 
+{{ entity_macros.fatcat_bits(entity, entity_type, "") }}
+
 </div>
 </div>
 
diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index 2a4752f2..0fa93679 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -2,8 +2,11 @@
 {% macro fatcat_bits(entity, entity_type, expand="") -%}
 <div class="ui segment attached">
   <b>Fatcat Bits</b>
-  <p>State is "{{ entity.state }}". Revision:
-  <br><small><code>{{ entity.revision }}</code></small>
+  <p>State is "{{ entity.state }}".
+  {% if entity.state != "deleted" %}
+    Revision:
+    <br><small><code>{{ entity.revision }}</code></small>
+  {% endif %}
   <br><a href="https://api.{{ config.FATCAT_DOMAIN }}/v0/release/{{ entity.ident }}{% if expand %}?expand={{ expand}}{% endif %}">As JSON object via API</a>
 </div>