aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorMartin Czygan <martin.czygan@gmail.com>2019-11-13 16:58:09 +0100
committerMartin Czygan <martin.czygan@gmail.com>2019-11-14 14:50:16 +0100
commit116a47f6057245159851ff204f9e4c1e643c3d8d (patch)
tree97d9800331a229674cb591dda13c2cbbc985fc0b /python
parented72027bbf36e933c8db069bd02b0163a84aef83 (diff)
downloadfatcat-116a47f6057245159851ff204f9e4c1e643c3d8d.tar.gz
fatcat-116a47f6057245159851ff204f9e4c1e643c3d8d.zip
move pagination into macros
Two new macros: * top_results(found) * bottom_results(found) wip: move pagination into macro
Diffstat (limited to 'python')
-rw-r--r--python/fatcat_web/templates/container_search.html27
-rw-r--r--python/fatcat_web/templates/entity_macros.html40
-rw-r--r--python/fatcat_web/templates/release_search.html27
3 files changed, 51 insertions, 43 deletions
diff --git a/python/fatcat_web/templates/container_search.html b/python/fatcat_web/templates/container_search.html
index 9e2aa10a..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,25 +31,7 @@
{% if found %}
{% if found.results %}
- <i>Showing
- {% if found.offset == 0 %}
- first
- {% else %}
- results {{ found.offset }} &mdash;
- {% endif %}
- {{ found.offset + found.count_returned }} out of {{ found.count_found }} results for: <code>{{ found.query.q }}</code></i>
- <br>
- {% if found.offset > 0 %}
- {% if found.offset - found.limit < 0 %}
- <a href="{{ url_for('release_search', q=query, offset=0) }}">Prev</a>
- {% else %}
- <a href="{{ url_for('release_search', q=query, offset=found.offset - found.limit) }}">Prev</a>
- {% endif %}
- {% endif %}
-
- {% if found.offset + found.limit < found.count_found and found.offset + found.limit < found.deep_page_limit %}
- <a href="{{ url_for('release_search', q=query, offset=found.offset + found.limit) }}">Next</a>
- {% endif %}
+ {{ entity_macros.top_results(found) }}
{% for entity in found.results %}
<div>
@@ -68,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..5e980fec 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 %}
+ &#xab; Previous
+{% 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 %}
+ Next &#xbb;
+{% 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 359038dc..47f4330a 100644
--- a/python/fatcat_web/templates/release_search.html
+++ b/python/fatcat_web/templates/release_search.html
@@ -36,33 +36,16 @@
{% if found %}
{% if found.results %}
- <i>Showing
- {% if found.offset == 0 %}
- first
- {% else %}
- results {{ found.offset }} &mdash;
- {% endif %}
- {{ found.offset + found.count_returned }} out of {{ found.count_found }} results for: <code>{{ found.query.q }}</code></i>
-
- <br>
- {% if found.offset > 0 %}
- {% if found.offset - found.limit < 0 %}
- <a href="{{ url_for('release_search', q=query, offset=0) }}">Prev</a>
- {% else %}
- <a href="{{ url_for('release_search', q=query, offset=found.offset - found.limit) }}">Prev</a>
- {% endif %}
- {% endif %}
-
- {% if found.offset + found.limit < found.count_found and found.offset + found.limit < found.deep_page_limit %}
- <a href="{{ url_for('release_search', q=query, offset=found.offset + found.limit) }}">Next</a>
- {% endif %}
+ {{ 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 %}