From 9cca4e5494235029656757a3dcc066068da190e6 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Thu, 17 Sep 2020 19:25:20 -0700
Subject: coverage: clarify available/accessible terminology

---
 python/fatcat_web/templates/entity_macros.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/fatcat_web/templates')

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) }}
-- 
cgit v1.2.3


From 4365f7d61b8458c06102e4cb58fd373bbada872a Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Thu, 17 Sep 2020 19:31:12 -0700
Subject: coverage search: pretty display for ES query errors

---
 python/fatcat_web/routes.py                      | 13 ++++++++++++-
 python/fatcat_web/templates/coverage_search.html |  7 +++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'python/fatcat_web/templates')

diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py
index 9ae2eaa9..4dfbc29c 100644
--- a/python/fatcat_web/routes.py
+++ b/python/fatcat_web/routes.py
@@ -745,7 +745,18 @@ def coverage_search():
         )
 
     query = ReleaseQuery.from_args(request.args)
-    coverage_stats = get_elastic_search_coverage(query)
+    try:
+        coverage_stats = get_elastic_search_coverage(query)
+    except FatcatSearchError as fse:
+        return render_template(
+            'coverage_search.html',
+            query=query,
+            coverage_stats=None,
+            coverage_type_preservation=None,
+            year_histogram_svg=None,
+            date_histogram_svg=None,
+            es_error=fse,
+        ), fse.status_code
     year_histogram_svg = None
     date_histogram_svg = None
     coverage_type_preservation = None
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">
-- 
cgit v1.2.3


From 078495ade3eb095d2f2ff5fb5dbd049c39ad9bfe Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Thu, 17 Sep 2020 19:40:09 -0700
Subject: web container view: hide preservation when no releases

---
 python/fatcat_web/templates/container_view.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'python/fatcat_web/templates')

diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html
index 8b4ddeb9..9a71fe72 100644
--- a/python/fatcat_web/templates/container_view.html
+++ b/python/fatcat_web/templates/container_view.html
@@ -65,15 +65,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 +89,7 @@
     </table>
   </div>
 {% endif %}
+{% endif %}
 
 {% if container.issnl != None or container.wikidata_qid != None %}
 <div class="ui segment attached">
-- 
cgit v1.2.3


From 257f5b55e6d35893dfdf8c5306842db5bb076f3e Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Thu, 17 Sep 2020 19:41:52 -0700
Subject: container view: only show OA indicator when known

The "is_oa:False" could be that we just don't know; aren't actually
distinguishing between false and blank.
---
 python/fatcat_web/templates/container_view.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'python/fatcat_web/templates')

diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html
index 9a71fe72..91430715 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>
 
-- 
cgit v1.2.3


From 8187720f503967ad68ab07fb25b36f554663e1c3 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Thu, 17 Sep 2020 20:56:23 -0700
Subject: web: update sub-resource integrity and pre-loading

For security/integrity and performance
---
 python/fatcat_web/templates/base.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'python/fatcat_web/templates')

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 %}
-- 
cgit v1.2.3


From 2812b3a363ec41eb11a35affb128f66b39d40e6d Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Thu, 17 Sep 2020 21:11:05 -0700
Subject: web: handle unknown CSL style as a cleaner 400 page

---
 python/fatcat_web/routes.py          | 6 +++++-
 python/fatcat_web/templates/400.html | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'python/fatcat_web/templates')

diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py
index 924a4d4c..02b5258a 100644
--- a/python/fatcat_web/routes.py
+++ b/python/fatcat_web/routes.py
@@ -1,6 +1,7 @@
 
 import os
 import json
+import citeproc_styles
 from flask import render_template, make_response, send_from_directory, \
     request, url_for, abort, redirect, jsonify, session, flash, Response
 from flask_login import login_required
@@ -962,7 +963,10 @@ def release_citeproc(ident):
     except ApiException as ae:
         raise ae
     csl = release_to_csl(entity)
-    cite = citeproc_csl(csl, style, is_html)
+    try:
+        cite = citeproc_csl(csl, style, is_html)
+    except citeproc_styles.StyleNotFoundError as e:
+        abort(400, e)
     if is_html:
         return Response(cite)
     elif style == "csl-json":
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
-- 
cgit v1.2.3