Merge branch 'bnewbold-search-improvements' into 'master'

search and error page improvements

See merge request webgroup/fatcat!72

1 files changed, 11 insertions, 53 deletions

diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index 0e7f135a..8e4c4f6a 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -162,12 +162,10 @@
     {# release type suffix #}
     {% if paper.release_type in ("article-journal", "paper-conference") %}
       {# pass #}
-    {% elif paper.release_type in ("book", "chapter", "dataset") %}
-      <b style="text-transform: uppercase;">[{{ paper.release_type }}]</b>
     {% elif not paper.release_type %}
-      <b style="text-transform: uppercase; color: black;">[unknown-media]</b>
+      <b style="text-transform: uppercase; color: black;">[unknown]</b>
     {% else %}
-      <b style="text-transform: uppercase;">[{{ paper.release_type }}]</b>
+      <b style="text-transform: uppercase; color: black;">[{{ paper.release_type }}]</b>
     {% endif %}
 
     {# show original_title #}
@@ -212,17 +210,17 @@
     {% endif %}
     {% if paper.container_is_oa %}<i class="icon unlock orange small"></i>{% endif %}
   {% endif %}
-  {% if paper.withdrawn_status %}
-    <b style="color: red;"><code>[{{ paper.withdrawn_status }}]</code></b>
-  {% endif %}
-  {% if paper.release_stage == "accepted" %}
-    <b style="color: darkmagenta;"><code>[{{ paper.release_stage }} manuscript]</code></b>
-  {% elif paper.release_stage == "submitted" %}
-    <b style="color: magenta;"><code>[pre-print]</code></b>
+
+  {% if paper.release_stage == "submitted" %}
+    <b style="color: brown; text-transform: uppercase;">pre-print</b>
   {% elif paper.release_stage and paper.release_stage != "published" %}
-    <b style="color: magenta;"><code>[{{ paper.release_stage }}]</code></b>
+    <b style="color: brown; text-transform: uppercase;">{{ paper.release_stage }} version</b>
   {% elif not paper.release_stage %}
-    <b style="color: red;"><code>[unpublished?]</code></b>
+    <b style="color: brown; text-transform: uppercase;">unpublished</b>
+  {% endif %}
+
+  {% if paper.withdrawn_status %}
+    <b style="color: red; text-transform: uppercase;">{{ paper.withdrawn_status }}</b>
   {% endif %}
 
   {# ### IDENTIFIERS #}
@@ -262,43 +260,3 @@ yellow
 {% endif %}
 {%- endmacro %}
 
-{% macro top_results(query, found) -%}
-
-<i>Showing
-  {% if found.offset == 0 %}
-  first
-  {% else %}
-  results {{ found.offset }} &mdash;
-  {% endif %}
-
-  {{ found.offset + found.count_returned }}
-  out of {{ found.count_found }} results
-</i>
-
-{%- endmacro %}
-
-
-{% macro bottom_results(query, found, endpoint='release_search') -%}
-
-{% if found.offset > 0 %}
-  {% if found.offset - found.limit < 0 %}
-    <a href="{{ url_for(endpoint, q=query.q, offset=0) }}">&#xab; Previous</a>
-  {% else %}
-    <a href="{{ url_for(endpoint, q=query.q, offset=found.offset - found.limit) }}">&#xab; Previous</a>
-  {% endif %}
-{% else %}
-  <span style="color:gray">&#xab; Previous</span>
-{% endif %}
-
-&nbsp;&nbsp;<i>Showing results {{ found.offset }} &mdash; {{ found.offset +
-found.count_returned }} out of {{ found.count_found }} results</i>&nbsp;&nbsp;
-
-{% if found.offset + found.limit < found.count_found and found.offset + found.limit < found.deep_page_limit %}
-  <a href="{{ url_for(endpoint, q=query.q, offset=found.offset + found.limit) }}">Next &#xbb;</a>
-  {% else %}
-  <span style="color:gray">Next &#xbb;</span>
-{% endif %}
-
-</div>
-
-{%- endmacro %}