Merge branch 'bnewbold-202009-polish' into 'master'

fatcat.wiki 2020-09 polish

See merge request webgroup/fatcat!84

5 files changed, 30 insertions, 14 deletions

diff --git a/python/fatcat_web/templates/400.html b/python/fatcat_web/templates/400.html
index 21f98aad..c0a00652 100644
--- a/python/fatcat_web/templates/400.html
+++ b/python/fatcat_web/templates/400.html
@@ -12,6 +12,8 @@
     <div class="header"></div>
     {% if err and err.description %}
       <p>{{ err.description }}
+    {% elif err %}
+      <p>{{ err }}
     {% else %}
       <p>Wasn't able to handle the request, either due to incorrect or unexpected
       input. Usually more context should be available; if you hit this page it means
diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html
index 2c18ec44..b858728d 100644
--- a/python/fatcat_web/templates/base.html
+++ b/python/fatcat_web/templates/base.html
@@ -17,7 +17,18 @@
   <link rel="stylesheet"
     type="text/css"
     href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.6/dist/semantic.min.css"
+    type="text/css"
+    crossorigin="anonymous">
+  <link rel="preload"
+    href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic&subset=latin&display=swap"
+    as="style">
+  <link rel="preload"
+    href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.6/dist/themes/default/assets/fonts/icons.woff2"
+    as="font"
+    type="font/woff2"
     crossorigin="anonymous">
+  <link rel="icon" href="data:,">
+
   <style>
     {# bnewbold: fix light grey bars in header #}
     .ui.inverted.menu .item:before { background: none; }
@@ -131,10 +142,12 @@
 
 <script
   src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"
+  integrity="sha256=FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
   crossorigin="anonymous">
 </script>
 <script
   src="https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.6/dist/semantic.min.js"
+  integrity="sha256=9H3HWYnPJ2bEHgkOrw+48KheOqYzTvJd1hbeU9sEDFk="
   crossorigin="anonymous">
 </script>
 {% block postscript %}{% endblock %}
diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html
index 2d3ef036..32c06a53 100644
--- a/python/fatcat_web/templates/container_view.html
+++ b/python/fatcat_web/templates/container_view.html
@@ -48,11 +48,7 @@
 
 <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 Publisher</b>
-  {% elif container._es and container._es.is_oa == False  %}
-  <i class="icon lock huge black"></i><b>Not Open Access</b>
-  {% else %}
-  <i class="icon question huge grey"></i><b>Unknown OA Status</b>
+    <i class="icon unlock huge orange"></i><b>Open Access Publication</b>
   {% endif %}
 </div>
 
@@ -65,15 +61,12 @@
     </div>
   </div>
 </div>
-<div class="ui segment attached">
-  <b>Preservation Status</b><br>
-  {% if container._stats.total >= 1 %}
-    {{ entity_macros.preservation_bar(container._stats.preservation) }}
-    {{ entity_macros.preservation_small_table(container._stats.preservation) }}
-  {% endif %}
-</div>
 {% if container._stats.total >= 1 %}
-{% endif %}
+  <div class="ui segment attached">
+    <b>Preservation Status</b><br>
+      {{ entity_macros.preservation_bar(container._stats.preservation) }}
+      {{ entity_macros.preservation_small_table(container._stats.preservation) }}
+  </div>
   <div class="ui segment attached">
     <b>Work Types</b><br>
     <table class="ui very basic very compact collapsing table">
@@ -92,6 +85,7 @@
     </table>
   </div>
 {% endif %}
+{% endif %}
 
 {% if container.issnl != None or container.wikidata_qid != None %}
 <div class="ui segment attached">
diff --git a/python/fatcat_web/templates/coverage_search.html b/python/fatcat_web/templates/coverage_search.html
index 1e0f8327..b1db6a9a 100644
--- a/python/fatcat_web/templates/coverage_search.html
+++ b/python/fatcat_web/templates/coverage_search.html
@@ -1,4 +1,5 @@
 {% import "entity_macros.html" as entity_macros %}
+{% import "search_macros.html" as search_macros %}
 {% extends "base.html" %}
 
 {% block title %}
@@ -32,6 +33,12 @@
 
 <div class="ui container" style="margin-top: 2em;">
 
+{% if es_error %}
+  <div class="ui container text">
+    {{ search_macros.es_error_msg(es_error) }}
+  </div>
+{% endif %}
+
 {% if coverage_stats != None %}
 <div class="ui centered grid">
   <div class="row">
diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index 0ce646bf..d5ecd9b6 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -302,7 +302,7 @@ yellow
         <td style="background-color: #21ba45;">
         <td class="right aligned" >{{ "{:,}".format(stats.bright) }}
         <td class="right aligned" >{{ (frac_bright*100)|round(2,method='ceil') }}%
-        <td>preserved and publicly available (bright)
+        <td>preserved and publicly accessible (bright)
       <tr>
         <td style="background-color: darkgreen;">
         <td class="right aligned" >{{ "{:,}".format(stats.dark) }}