See you later, setup.cfg.

[xonotic/xonstat.git] / xonstat / templates / navlinks.mako

diff --git a/xonstat/templates/navlinks.mako b/xonstat/templates/navlinks.mako
old mode 100755 (executable)
new mode 100644 (file)
index a529eb4..222157c
--- a/xonstat/templates/navlinks.mako
+++ b/xonstat/templates/navlinks.mako
@@ -1,47 +1,74 @@
-<%def name="navlinks(view, curr, last)">
-% if curr != last:
+<%def name="navlinks(view, curr, last, **kwargs)">
+<%
+kwargs['_query'] = {'page': None}
+
+if 'search_query' in kwargs.keys():
+    kwargs['_query'] = dict(kwargs['_query'].items() + kwargs['search_query'].items())
+%>
+
+% if not last:
+    <% last = 1 %>
+% endif
+
+% if not (curr == last and curr == 1):
+<div class="row">
+<div class="small-12 columns text-center">
+<ul class="pagination">
     % if curr != 1:
-    <a class="pagination" href="${request.route_url(view, page=curr-1)}" name="Previous Page">previous</a>
+            <% kwargs['_query']['page'] = curr-1 %>
+            <li><a href="${request.route_url(view, **kwargs)}" name="Previous Page"><i class="fa fa-arrow-left"></i></a></li>
     % endif
 
     % if last < 8:
         % for i in range(1, last+1):
-        ${link_page(view, i, curr)}
+        ${link_page(view, i, curr, **kwargs)}
         % endfor
     % else:
         % if curr < 5:
             % for i in range(1,7):
-            ${link_page(view, i, curr)}
+            ${link_page(view, i, curr, **kwargs)}
             % endfor
-            <span class="pagination">...</span>
-            <a class="pagination" href="${request.route_url(view, page=last)}" name="Last Page">${last}</a>
+            <li><span>...<span></li>
+            <% kwargs['_query']['page'] = last %>
+            <li><a  href="${request.route_url(view, **kwargs)}" name="Last Page">${last}</a></li>
+
         % elif last-curr < 6:
-            <a class="pagination" href="${request.route_url(view, page=1)}" name="First Page">1</a>
-            <span class="pagination">...</span>
+            <% kwargs['_query']['page'] = 1 %>
+            <li><a  href="${request.route_url(view, **kwargs)}" name="First Page">1</a></li>
+            <li><span >...</span></li>
             % for i in range(last-5, last+1):
-            ${link_page(view, i, curr)}
+            ${link_page(view, i, curr, **kwargs)}
             % endfor
         % else:
-            <a class="pagination" href="${request.route_url(view, page=1)}" name="First Page">1</a>
-            <span class="pagination">...</span>
+            <% kwargs['_query']['page'] = 1 %>
+            <li><a  href="${request.route_url(view, **kwargs)}" name="First Page">1</a></li>
+
+            <li><span >...</span></li>
             % for i in range(curr-2, curr+3):
-            ${link_page(view, i, curr)}
+            ${link_page(view, i, curr, **kwargs)}
             % endfor
-            <span class="pagination">...</span>
-            <a class="pagination" href="${request.route_url(view, page=last)}" name="Last Page">${last}</a>
+            <li><span >...</span></li>
+            <% kwargs['_query']['page'] = last %>
+            <li><a  href="${request.route_url(view, **kwargs)}" name="Last Page">${last}</a></li>
+
         % endif
     % endif
 
     % if curr != last:
-    <a class="pagination" href="${request.route_url(view, page=curr+1)}" name="Next Page">next</a>
+            <% kwargs['_query']['page'] = curr+1 %>
+        <li><a  href="${request.route_url(view, **kwargs)}" name="Next Page"><i class="fa fa-arrow-right"></i></a></li>
     % endif
+</ul>
+</div> <!-- end span12 -->
+</div> <!-- end row -->
 % endif
 </%def>
 
-<%def name="link_page(view, page_num, curr_page)">
+<%def name="link_page(view, page_num, curr_page, **kwargs)">
 % if page_num == curr_page:
-<span class="pagination" style="color:#d95b00;">${page_num}</span>
+<li>${page_num}</li>
 % else:
-<a class="pagination" href="${request.route_url(view, page=page_num)}" name="Go to page ${page_num}">${page_num}</a>
+    <% kwargs['_query']['page'] = page_num %>
+    <li><a  href="${request.route_url(view, **kwargs)}" name="Go to page ${page_num}">${page_num}</a></li>
 % endif
 </%def>