From ae3eb5ff7ab20b4c7033c616fb33d790da83c022 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Fri, 10 Jun 2016 20:40:04 +0200
Subject: paginate filtered results properly

---
 app.py               | 1 +
 templates/index.html | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app.py b/app.py
index 9de83ec..88288da 100644
--- a/app.py
+++ b/app.py
@@ -452,6 +452,7 @@ def page(num):
         render_template(
             'index.html',
             currentpage=num,
+            query=str(request.query_string, 'utf-8'),
             tag=search,
             perpage=PERPAGE,
             jokes=jokes,
diff --git a/templates/index.html b/templates/index.html
index dc75288..c83d78c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -35,7 +35,7 @@
                 </form>
                 {% endif %}
                 <div class="col s2 m12 l2 right">
-                    <a class="btn-floating btn-large right" href="/export"><i class="material-icons">file_download</i></a>
+                    <a class="btn-floating btn-large right" href="/export{% if query %}?{{ query }}{% endif %}"><i class="material-icons">file_download</i></a>
                 </div>
             </div>
         </header>
@@ -111,11 +111,11 @@
             </ul>
             <div class="section center">
                 <ul class="pagination">
-                    <li{% if currentpage==0 %} class="disabled"{% endif %}><a href="/page/{{ currentpage-1 }}"><i class="material-icons">chevron_left</i></a></li>
+                    <li{% if currentpage==0 %} class="disabled"{% endif %}><a href="/page/{{ currentpage-1 }}{% if query %}?{{ query }}{% endif %}"><i class="material-icons">chevron_left</i></a></li>
                     {% for page in range((jokes|length/perpage)|round(0, 'ceil')|int) %}
-                    <li{% if currentpage==loop.index0 %} class="active"{% endif %}><a href="/page/{{ loop.index0 }}">{{ loop.index }}</a></li>
+                    <li{% if currentpage==loop.index0 %} class="active"{% endif %}><a href="/page/{{ loop.index0 }}{% if query %}?{{ query }}{% endif %}">{{ loop.index }}</a></li>
                     {% endfor %}
-                    <li{% if currentpage==loop.length-1 %} class="disabled"{% endif %}><a href="/page/{{ currentpage+1 }}"><i class="material-icons">chevron_right</i></a></li>
+                    <li{% if currentpage==loop.length-1 %} class="disabled"{% endif %}><a href="/page/{{ currentpage+1 }}{% if query %}?{{ query }}{% endif %}"><i class="material-icons">chevron_right</i></a></li>
                 </ul>
             </div>
             <div class="divider"></div>
-- 
cgit v1.3.1