From 3caa8905ef2f413ec8fa107dd54f03356f4052d8 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Sat, 6 Apr 2019 19:21:52 -0700
Subject: remove title from metadata macro

---
 python/fatcat_web/templates/container_view.html  | 1 +
 python/fatcat_web/templates/creator_view.html    | 1 +
 python/fatcat_web/templates/entity_macros.html   | 1 -
 python/fatcat_web/templates/file_view.html       | 1 +
 python/fatcat_web/templates/fileset_view.html    | 1 +
 python/fatcat_web/templates/release_view.html    | 1 +
 python/fatcat_web/templates/webcapture_view.html | 1 +
 python/fatcat_web/templates/work_view.html       | 1 +
 8 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'python/fatcat_web')

diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html
index 3d0627ca..619bd647 100644
--- a/python/fatcat_web/templates/container_view.html
+++ b/python/fatcat_web/templates/container_view.html
@@ -41,6 +41,7 @@
 
 
 {% if entity.extra %}
+  <h3>Extra Metadata (raw JSON)</h3>
   {{ entity_macros.extra_metadata(entity.extra) }}
 {% endif %}
 
diff --git a/python/fatcat_web/templates/creator_view.html b/python/fatcat_web/templates/creator_view.html
index 8f61d74b..63308a51 100644
--- a/python/fatcat_web/templates/creator_view.html
+++ b/python/fatcat_web/templates/creator_view.html
@@ -32,6 +32,7 @@
 {% endif %}
 
 {% if entity.extra != None %}
+  <h3>Extra Metadata (raw JSON)</h3>
   {{ entity_macros.extra_metadata(entity.extra) }}
 {% endif %}
 
diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index 6d9ceed0..90c8e952 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -26,7 +26,6 @@
 
 
 {% macro extra_metadata(extra) -%}
-<h3>Extra Metadata (raw JSON)</h3>
 <table class="ui definition single line fixed compact small unstackable table">
 <tbody>
 {% for (key, value) in extra.items() %}
diff --git a/python/fatcat_web/templates/file_view.html b/python/fatcat_web/templates/file_view.html
index 7a428b55..097ee5f6 100644
--- a/python/fatcat_web/templates/file_view.html
+++ b/python/fatcat_web/templates/file_view.html
@@ -17,6 +17,7 @@
 <div class="ten wide column" style="font-size: 16px;">
 
 {% if entity.extra %}
+  <h3>Extra Metadata (raw JSON)</h3>
   {{ entity_macros.extra_metadata(entity.extra) }}
 {% endif %}
 
diff --git a/python/fatcat_web/templates/fileset_view.html b/python/fatcat_web/templates/fileset_view.html
index ada2ae51..7f41e617 100644
--- a/python/fatcat_web/templates/fileset_view.html
+++ b/python/fatcat_web/templates/fileset_view.html
@@ -17,6 +17,7 @@
 <div class="ten wide column" style="font-size: 16px;">
 
 {% if entity.extra %}
+  <h3>Extra Metadata (raw JSON)</h3>
   {{ entity_macros.extra_metadata(entity.extra) }}
 {% endif %}
 
diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html
index ff044c49..4849842c 100644
--- a/python/fatcat_web/templates/release_view.html
+++ b/python/fatcat_web/templates/release_view.html
@@ -191,6 +191,7 @@
 
 
 {% if entity.extra %}
+  <h3>Extra Metadata (raw JSON)</h3>
   {{ entity_macros.extra_metadata(entity.extra) }}
 {% endif %}
 
diff --git a/python/fatcat_web/templates/webcapture_view.html b/python/fatcat_web/templates/webcapture_view.html
index 921d5d48..1dd179f6 100644
--- a/python/fatcat_web/templates/webcapture_view.html
+++ b/python/fatcat_web/templates/webcapture_view.html
@@ -21,6 +21,7 @@
 
 
 {% if entity.extra %}
+  <h3>Extra Metadata (raw JSON)</h3>
   {{ entity_macros.extra_metadata(entity.extra) }}
 {% endif %}
 
diff --git a/python/fatcat_web/templates/work_view.html b/python/fatcat_web/templates/work_view.html
index 7842ec50..507498c8 100644
--- a/python/fatcat_web/templates/work_view.html
+++ b/python/fatcat_web/templates/work_view.html
@@ -17,6 +17,7 @@
 <div class="ten wide column" style="font-size: 16px;">
 
 {% if entity.extra != None %}
+  <h3>Extra Metadata (raw JSON)</h3>
   {{ entity_macros.extra_metadata(entity.extra) }}
 {% endif %}
 
-- 
cgit v1.2.3


From d89787882aaf4b7342768ac56d2252f3fcb7a7ad Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Sat, 6 Apr 2019 19:22:58 -0700
Subject: diplay extra metadata, disposition in annotations

---
 python/fatcat_web/templates/editgroup_view.html | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'python/fatcat_web')

diff --git a/python/fatcat_web/templates/editgroup_view.html b/python/fatcat_web/templates/editgroup_view.html
index f7f3ad45..9d152579 100644
--- a/python/fatcat_web/templates/editgroup_view.html
+++ b/python/fatcat_web/templates/editgroup_view.html
@@ -27,6 +27,8 @@
           Revision: <small><code>{{ edit.revision }}</code></small>
         {% endif %}
         {% if edit.extra %}
+          <b>Extra Metadata (raw JSON)</b>
+          {{ entity_macros.extra_metadata(edit.extra) }}
         {% endif %}
       </div>
     </div>
@@ -90,6 +92,10 @@ reviewable bundle.
 {% else %}
   <i>none</i>
 {% endif %}
+{% if editgroup.extra %}
+  <h4>Extra Metadata (raw JSON)</h4>
+  {{ entity_macros.extra_metadata(editgroup.extra) }}
+{% endif %}
 <br><br clear="all">
 
 <div class="ui styled fluid accordion">
@@ -117,11 +123,23 @@ reviewable bundle.
         <span class="ui tiny olive label">Admin</span>
       {% endif %}
       at {{ annotation.created.strftime("%Y-%m-%d %H:%M:%S") }}
+      {# TODO: get individual editgroup annotation not supported yet
+      (<a href="{% if config.FATCAT_DOMAIN == 'dev.fatcat.wiki' %}http://localhost:9411{% else %}https://api.{{ config.FATCAT_DOMAIN }}{% endif %}/v0/editgroup/{{ annotation.editgroup_id }}/annotation/{{ annotation.annotation_id }}">as JSON</a>)
+      #}
+      {% if annotation.extra and annotation.extra.disposition %}
+        {% set disp = annotation.extra.disposition %}
+        <span class="ui small {% if disp == "accept" %}green{% elif disp == "reject" %}red{% else %}orange{%endif %} label" style="float: right;">{{ annotation.extra.disposition|capitalize }}</span>
+      {% endif %}
     </div>
     {% if annotation.extra %}
-    <div class="ui attached segment">
-      {{ entity_macros.extra_metadata(annotation.extra) }}
-    </div>
+      <div class="ui attached tertiary segment accordion" style="padding-top: 0.2em; padding-bottom: 0.2em;">
+        <div class="title">
+          <i class="dropdown icon"></i>Review Metadata (raw JSON)
+        </div>
+        <div class="content" style="padding-bottom: 0.5em;">
+          {{ entity_macros.extra_metadata(annotation.extra) }}
+        </div>
+      </div>
     {% endif %}
     <div class="ui bottom attached segment">
       {{ annotation.comment_markdown|markdown(escape=True) }}
-- 
cgit v1.2.3