improve wayback view page

2 files changed, 24 insertions, 3 deletions

diff --git a/python/fatcat_web/entity_helpers.py b/python/fatcat_web/entity_helpers.py
index 4ecd089a..b36307a1 100644
--- a/python/fatcat_web/entity_helpers.py
+++ b/python/fatcat_web/entity_helpers.py
@@ -42,7 +42,7 @@ def enrich_fileset_entity(entity):
 def enrich_webcapture_entity(entity):
     if entity.state in ('redirect', 'deleted'):
         return entity
-    entity.wayback_suffix = wayback_suffix(entity)
+    entity._wayback_suffix = wayback_suffix(entity)
     return entity
 
 def enrich_release_entity(entity):
diff --git a/python/fatcat_web/templates/webcapture_view.html b/python/fatcat_web/templates/webcapture_view.html
index 16e5c03e..f2f689f3 100644
--- a/python/fatcat_web/templates/webcapture_view.html
+++ b/python/fatcat_web/templates/webcapture_view.html
@@ -19,7 +19,24 @@
 <br>
 <h3>Archive URLs</h3>
 {% if webcapture.archive_urls != None %}
-  {{ entity_macros.url_list(webcapture.archive_urls, webcapture._wayback_suffix) }}
+  <table class="ui very basic compact single line fixed table">
+  <tbody>
+  {% for url in webcapture.archive_urls %}
+    <tr><td class="two wide right aligned">{{ url.rel }}
+        <td class="eight wide"><small><code>
+        {% if url.rel == "wayback" %}
+          <a href="{{ url.url }}{{ webcapture._wayback_suffix }}">
+            <b>{{ url.url }}</b>{{ webcapture._wayback_suffix }}
+          </a>
+        {% else %}
+          <a href="{{ url.url }}">
+            <b>{{ url.url }}</b>
+          </a>
+        {% endif %}
+        </a></code></small>
+    {% endfor %}
+  </tbody>
+  </table>
 {% else %}
 No known public archive for this webcapture.
 {% endif %}
@@ -32,7 +49,7 @@ No known public archive for this webcapture.
     <div class="item">
       <div class="content">
         <div class="header">
-          <code><a href="{{ row.url }}">{{ row.url}}</a></code>
+          <code><a href="{{ row.url }}" style="color: black;">{{ row.url}}</a></code>
         </div>
         <div style="margin-left: 1em;">
           {{ row.timestamp.strftime("%Y-%m-%d %H:%M:%S") }}
@@ -55,6 +72,10 @@ This web capture is empty (contains no resources).
 </div>
 <div class="column" style="flex: 0 0 24em;">
 
+{% if webcapture.state == 'active' and webcapture.archive_urls != [] and webcapture.archive_urls[0].rel == "wayback" %}
+<a href="{{ webcapture.archive_urls[0].url }}{{ webcapture._wayback_suffix }}" class="ui top attached fluid huge green button"><i class="file archive outline icon"></i>View Web Archive</a>
+{% endif %}
+
 {% if webcapture.timestamp != None %}
 <div class="ui segment attached">
   <p><b>Capture Time</b> &nbsp;{{ webcapture.timestamp.strftime("%Y-%m-%d %H:%M:%S") }}