refactor search macros into new file

4 files changed, 72 insertions, 45 deletions

diff --git a/python/fatcat_web/templates/container_search.html b/python/fatcat_web/templates/container_search.html
index 2566f542..ce868991 100644
--- a/python/fatcat_web/templates/container_search.html
+++ b/python/fatcat_web/templates/container_search.html
@@ -1,4 +1,4 @@
-{% import "entity_macros.html" as entity_macros %}
+{% import "search_macros.html" as search_macros %}
 {% extends "base.html" %}
 
 {% block title %}
@@ -32,7 +32,7 @@
 {% if found %}
   {% if found.results %}
 
-    {{ entity_macros.top_results(query, found) }}
+    {{ search_macros.top_results(query, found) }}
 
     {% for entity in found.results %}
       <div>
@@ -55,7 +55,7 @@
     {% if found.results|length > 8 %}
       <div class="ui divider"></div>
       <div style="text-align: center">
-      {{ entity_macros.bottom_results(query, found, endpoint='container_search') }}
+      {{ search_macros.bottom_results(query, found, endpoint='container_search') }}
       </div>
     {% endif %}
 
diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index 0e7f135a..ab0e817a 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -262,43 +262,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 %}
diff --git a/python/fatcat_web/templates/release_search.html b/python/fatcat_web/templates/release_search.html
index 58aa35d6..e004efc1 100644
--- a/python/fatcat_web/templates/release_search.html
+++ b/python/fatcat_web/templates/release_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 %}
@@ -37,7 +38,7 @@
 {% if found %}
   {% if found.results %}
 
-    {{ entity_macros.top_results(query, found) }}
+    {{ search_macros.top_results(query, found) }}
 
     {% for paper in found.results %}
       {{ entity_macros.release_search_result_row(paper) }}
@@ -46,7 +47,7 @@
     {% if found.results|length > 8 %}
       <div class="ui divider"></div>
       <div style="text-align: center">
-      {{ entity_macros.bottom_results(query, found, endpoint='release_search') }}
+      {{ search_macros.bottom_results(query, found, endpoint='release_search') }}
       </div>
     {% endif %}
 
diff --git a/python/fatcat_web/templates/search_macros.html b/python/fatcat_web/templates/search_macros.html
new file mode 100644
index 00000000..383c271c
--- /dev/null
+++ b/python/fatcat_web/templates/search_macros.html
@@ -0,0 +1,66 @@
+
+{% 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 %}
+
+
+{% macro es_error_msg(es_error) %}
+  <div class="ui icon error message">
+    <i class="ban icon"></i>
+    {% if es_error.status_code == 400 %}
+      <div class="content">
+        <div class="header">
+          Query Error
+        </div>
+        <p>Computer said: <code>{{ es_error.description }}</code>
+        <p>Query parsing is currently very naive. Sometimes you can fix this
+        problem by adding quotes around terms or entire phrases.
+      </div>
+    {% else %}
+      <div class="content">
+        <div class="header">
+          Search Index Error ({{ es_error.status_code }})
+        </div>
+        <p>Computer said: <code>{{ es_error.description }}</code>
+      </div>
+    {% endif %}
+  </div>
+{% endmacro %}
+