Merge branch 'bnewbold-web-tweaks-20201013' into 'master'

web coverage tweaks 20201013

See merge request webgroup/fatcat!86

4 files changed, 19 insertions, 12 deletions

diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html
index 32c06a53..bdde6715 100644
--- a/python/fatcat_web/templates/container_view.html
+++ b/python/fatcat_web/templates/container_view.html
@@ -46,11 +46,11 @@
 </div>
 <div class="column" style="flex: 0 0 24em;">
 
+{% if container._es and container._es.is_oa == True %}
 <div class="ui segment top attached">
-  {% if container._es and container._es.is_oa == True %}
-    <i class="icon unlock huge orange"></i><b>Open Access Publication</b>
-  {% endif %}
+  <i class="icon unlock huge orange"></i><b>Open Access Publication</b>
 </div>
+{% endif %}
 
 {% if container._stats %}
 <div class="ui segment attached">
diff --git a/python/fatcat_web/templates/container_view_coverage.html b/python/fatcat_web/templates/container_view_coverage.html
index 5ec31e73..2da1ab07 100644
--- a/python/fatcat_web/templates/container_view_coverage.html
+++ b/python/fatcat_web/templates/container_view_coverage.html
@@ -17,6 +17,17 @@
         {{ entity_macros.preservation_bar(container._stats.preservation, extra_class="large") }}
         {{ entity_macros.preservation_table(container._stats.preservation) }}
       {% endif %}
+      <p>
+      {% if container.extra and container.extra.kbart %}
+        There seem to be at least some "dark" preservation holdings in:
+        {% for k, v in container.extra.kbart.items() %}
+          <code>{{ k }}</code>{{ ", " if not loop.last }}
+        {% endfor %}
+        .
+      {% endif %}
+      {% if container.issnl %}
+        Our metadata may not be up to date, but you can verify preservation holdings in <a href="https://keepers.issn.org/?q=api/search&search[]=MUST=allissn={{ container.issnl }}&search[]=MUST_EXIST=keepers">Keepers Registery</a> (click "Archival Status").
+      {% endif %}
     </div>
   </div>
 </div>
diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index d5ecd9b6..e8a763d2 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -270,19 +270,19 @@ yellow
   {% set frac_none = stats.none/stats.total %}
 
   <div class="ui {{ extra_class }} multiple progress" data-percent="0,0,0,0" style="margin-bottom: 0.1em;">
-    <div class="green bar" style="border-radius: 0; min-width: 0; width: {{ (frac_bright*100)|round(method='ceil') }}%;" title="bright">
+    <div class="green bar" style="border-radius: 0; min-width: 0; width: {{ (frac_bright*100)|round(method='ceil') }}%;" title="bright: {{ "{:,}".format(stats.bright) }} ({{ (frac_bright*100)|round(2,method='ceil') }}%)">
       <div class="progress">{# {{ (frac_bright*100)|int }}% #}</div>
     </div>
-    <div class="green bar" style="border-radius: 0; min-width: 0; width: {{ (frac_dark*100)|round(method='ceil') }}%; background-color: darkgreen;" title="dark">
+    <div class="green bar" style="border-radius: 0; min-width: 0; width: {{ (frac_dark*100)|round(method='ceil') }}%; background-color: darkgreen;" title="dark: {{ "{:,}".format(stats.dark) }} ({{ (frac_dark*100)|round(2,method='ceil') }}%">
       <div class="progress">{# {{ (frac_dark*100)|int }}% #}</div>
     </div>
     {% if stats.shadows_only %}
-  {% set frac_shadows_only = stats.shadows_only/stats.total %}
-    <div class="red bar" style="border-radius: 0; min-width: 0; width: {{ (frac_shadows_only*100)|round(method='ceil') }}%; background-color: darkred;" title="shadows only">
+    {% set frac_shadows_only = stats.shadows_only/stats.total %}
+    <div class="red bar" style="border-radius: 0; min-width: 0; width: {{ (frac_shadows_only*100)|round(method='ceil') }}%; background-color: darkred;" title="shadows only: {{ "{:,}".format(stats.shadows_only) }} ({{ (frac_shadows_only*100)|round(2,method='ceil') }}%)">
       <div class="progress">{# {{ (frac_shadows_only*100)|int }}% #}</div>
     </div>
     {% endif %}
-    <div class="red bar" style="border-radius: 0; min-width: 0; width: {{ (frac_none*100)|round(method='ceil') }}%;" title="no preservation">
+    <div class="red bar" style="border-radius: 0; min-width: 0; width: {{ (frac_none*100)|round(method='ceil') }}%;" title="no preservation: {{ "{:,}".format(stats.none) }} ({{ (frac_none*100)|round(2,method='ceil') }}%)">
       <div class="progress">{# {{ (frac_none*100)|int }}% #}</div>
     </div>
   </div>
diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html
index 54ead411..7836ef77 100644
--- a/python/fatcat_web/templates/release_view.html
+++ b/python/fatcat_web/templates/release_view.html
@@ -354,10 +354,6 @@ accessible version.
 <b>Container Metadata</b><br>
 {% if release.container._es.is_oa == True %}
 <i class="icon unlock orange"></i>Open Access Publication<br>
-{% 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 (release.container._es != None) %}
   {% if release.container._es.in_doaj == True %}