From bfc496de58cf0317574252c621d6b8e680df2ffc Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Sat, 2 Mar 2019 18:11:09 -0800 Subject: revert collapsing extra key; do use template in release view --- python/fatcat_web/templates/container_view.html | 14 ++++---------- python/fatcat_web/templates/entity_macros.html | 4 ++-- python/fatcat_web/templates/release_view.html | 13 +++---------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html index c8f51f5f..677a295e 100644 --- a/python/fatcat_web/templates/container_view.html +++ b/python/fatcat_web/templates/container_view.html @@ -37,18 +37,12 @@ {% endif %} -{% if container.extra %} -

Extra Metadata (raw JSON)

- - -{% for (key, value) in container.extra.items() %} - - -
{{ key }}{{ value }} -{% endfor %} -
+ +{% if entity.extra %} + {{ 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 e13898a2..054b2559 100644 --- a/python/fatcat_web/templates/entity_macros.html +++ b/python/fatcat_web/templates/entity_macros.html @@ -22,8 +22,8 @@ {% for (key, value) in extra.items() %} - - +
{{ key }}{{ value }} +
{{ key }}{{ value }} {% endfor %}
diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html index ad2daeb2..d2eb79cc 100644 --- a/python/fatcat_web/templates/release_view.html +++ b/python/fatcat_web/templates/release_view.html @@ -113,16 +113,9 @@
In {{ release.abstracts[0].mimetype }} format {% endif %} -{% if release.extra %} -

Extra Metadata (raw JSON)

- - -{% for (key, value) in release.extra.items() %} - - -
{{ key }}{{ value }} -{% endfor %} -
+ +{% if entity.extra %} + {{ entity_macros.extra_metadata(entity.extra) }} {% endif %} -- cgit v1.2.3