Merge branch 'martin-search-results-pagination' into 'master'

Add basic pagination to search results

See merge request webgroup/fatcat!4

3 files changed, 54 insertions, 7 deletions

diff --git a/python/fatcat_web/templates/container_search.html b/python/fatcat_web/templates/container_search.html
index 7f6799dd..48c613f8 100644
--- a/python/fatcat_web/templates/container_search.html
+++ b/python/fatcat_web/templates/container_search.html
@@ -1,3 +1,4 @@
+{% import "entity_macros.html" as entity_macros %}
 {% extends "base.html" %}
 
 {% block title %}
@@ -30,7 +31,8 @@
 
 {% if found %}
 {% if found.results %}
-  <i>Showing top {{ found.count_returned }} out of {{ found.count_found }} results for: <code>{{ found.query.q }}</code></i>
+  {{ entity_macros.top_results(found) }}
+
 {% for entity in found.results %}
 <div>
   <h4 style="margin-top: 1em; margin-bottom: 4px; font-size: 1.1em;">
@@ -49,8 +51,10 @@
 </div>
 {% endfor %}
 {% if found.results|length > 8 %}
-  <br>
-  <i>Showing top {{ found.count_returned }} out of {{ found.count_found }} results for: <code>{{ found.query.q }}</code></i>
+  <div class="ui divider"></div>
+  <div style="text-align: center">
+  {{ entity_macros.bottom_results(found)}}
+  </div>
 {% endif %}
 {% else %}
 
diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index fc199c21..390327bc 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -234,3 +234,43 @@ yellow
 {% endif %}
 {%- endmacro %}
 
+{% macro top_results(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(found) -%}
+
+{% if found.offset > 0 %}
+  {% if found.offset - found.limit < 0 %}
+    <a href="{{ url_for('release_search', q=found.query.q, offset=0) }}">&#xab; Previous</a>
+  {% else %}
+    <a href="{{ url_for('release_search', q=found.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('release_search', q=found.query.q, offset=found.offset + found.limit) }}">Next &#xbb;</a>
+  {% else %}
+  <span style="color:gray">Next &#xbb;</span>
+{% endif %}
+
+</div>
+
+{%- endmacro %}
\ No newline at end of file
diff --git a/python/fatcat_web/templates/release_search.html b/python/fatcat_web/templates/release_search.html
index 7d6b0443..47f4330a 100644
--- a/python/fatcat_web/templates/release_search.html
+++ b/python/fatcat_web/templates/release_search.html
@@ -36,13 +36,16 @@
 
 {% if found %}
 {% if found.results %}
-  <i>Showing top {{ found.count_returned }} out of {{ found.count_found }} results for: <code>{{ found.query.q }}</code></i>
-{% for paper in found.results %}
+    {{ entity_macros.top_results(found) }}
+
+  {% for paper in found.results %}
   {{ entity_macros.release_search_result_row(paper) }}
 {% endfor %}
 {% if found.results|length > 8 %}
-  <br>
-  <i>Showing top {{ found.count_returned }} out of {{ found.count_found }} results for: <code>{{ found.query.q }}</code></i>
+  <div class="ui divider"></div>
+  <div style="text-align: center">
+  {{ entity_macros.bottom_results(found)}}
+  </div>
 {% endif %}
 {% else %}