Simplify navlinks. Woohoo!

diff --git a/xonstat/templates/navlinks.mako b/xonstat/templates/navlinks.mako
index 1a524b4fdba3b02f298c70fe2bcc290789203f47..95fa688cdd37b6d52fa0537c32d863a0c2b09ef5 100755 (executable)
--- a/xonstat/templates/navlinks.mako
+++ b/xonstat/templates/navlinks.mako
@@ -1,78 +1,50 @@
-<%def name="navlinks(view, curr, last, query=None)">
+<%def name="navlinks(view, curr, last, **kwargs)">
 % if curr != last:
     % if curr != 1:
-        % if query is not None:
-            <a class="pagination" href="${request.route_url(view, page=curr-1, _query=query)}" name="Previous Page">previous</a>
-        % else:
-            <a class="pagination" href="${request.route_url(view, page=curr-1)}" name="Previous Page">previous</a>
-        % endif
+            <a class="pagination" href="${request.route_url(view, page=curr-1, **kwargs)}" name="Previous Page">previous</a>
     % endif
 
     % if last < 8:
         % for i in range(1, last+1):
-        ${link_page(view, i, curr, query)}
+        ${link_page(view, i, curr, **kwargs)}
         % endfor
     % else:
         % if curr < 5:
             % for i in range(1,7):
-            ${link_page(view, i, curr, query)}
+            ${link_page(view, i, curr, **kwargs)}
             % endfor
             <span class="pagination">...</span>
-            % if query is not None:
-                <a class="pagination" href="${request.route_url(view, page=last, _query=query)}" name="Last Page">${last}</a>
-            % else:
-                <a class="pagination" href="${request.route_url(view, page=last)}" name="Last Page">${last}</a>
-            % endif
+            <a class="pagination" href="${request.route_url(view, page=last, **kwargs)}" name="Last Page">${last}</a>
 
         % elif last-curr < 6:
-            % if query is not None:
-                <a class="pagination" href="${request.route_url(view, page=1, _query=query)}" name="First Page">1</a>
-            % else:
-                <a class="pagination" href="${request.route_url(view, page=1)}" name="First Page">1</a>
-            % endif
+            <a class="pagination" href="${request.route_url(view, page=1, **kwargs)}" name="First Page">1</a>
             <span class="pagination">...</span>
             % for i in range(last-5, last+1):
-            ${link_page(view, i, curr, query)}
+            ${link_page(view, i, curr, **kwargs)}
             % endfor
         % else:
-            % if query is not None:
-                <a class="pagination" href="${request.route_url(view, page=1, _query=query)}" name="First Page">1</a>
-            % else:
-                <a class="pagination" href="${request.route_url(view, page=1)}" name="First Page">1</a>
-            % endif
+            <a class="pagination" href="${request.route_url(view, page=1, **kwargs)}" name="First Page">1</a>
 
             <span class="pagination">...</span>
             % for i in range(curr-2, curr+3):
-            ${link_page(view, i, curr, query)}
+            ${link_page(view, i, curr, **kwargs)}
             % endfor
             <span class="pagination">...</span>
-            % if query is not None:
-                <a class="pagination" href="${request.route_url(view, page=last, _query=query)}" name="Last Page">${last}</a>
-            % else:
-                <a class="pagination" href="${request.route_url(view, page=last)}" name="Last Page">${last}</a>
-            % endif
+            <a class="pagination" href="${request.route_url(view, page=last, **kwargs)}" name="Last Page">${last}</a>
 
         % endif
     % endif
 
     % if curr != last:
-        % if query is not None:
-            <a class="pagination" href="${request.route_url(view, page=curr+1, _query=query)}" name="Next Page">next</a>
-        % else:
-            <a class="pagination" href="${request.route_url(view, page=curr+1)}" name="Next Page">next</a>
-        % endif
+        <a class="pagination" href="${request.route_url(view, page=curr+1, **kwargs)}" name="Next Page">next</a>
     % endif
 % endif
 </%def>
 
-<%def name="link_page(view, page_num, curr_page, query)">
+<%def name="link_page(view, page_num, curr_page, **kwargs)">
 % if page_num == curr_page:
 <span class="pagination" style="color:#d95b00;">${page_num}</span>
 % else:
-    % if query is not None:
-        <a class="pagination" href="${request.route_url(view, page=page_num, _query=query)}" name="Go to page ${page_num}">${page_num}</a>
-    % else:
-        <a class="pagination" href="${request.route_url(view, page=page_num)}" name="Go to page ${page_num}">${page_num}</a>
-    % endif
+    <a class="pagination" href="${request.route_url(view, page=page_num, **kwargs)}" name="Go to page ${page_num}">${page_num}</a>
 % endif
 </%def>

diff --git a/xonstat/templates/search.mako b/xonstat/templates/search.mako
index d919d8168bbca1704b848544067afd09a67c1313..f80050fc135f932ec0548f0f72f4c89d95a792ec 100755 (executable)
--- a/xonstat/templates/search.mako
+++ b/xonstat/templates/search.mako
@@ -105,7 +105,7 @@
 % endif
 
 <!-- navigation links -->
-${navlinks("search_paged", results.page, results.last_page, query)}
+${navlinks("search_paged", results.page, results.last_page, _query=query)}
 % endif
 
 <%block name="js">