Better navigation links.

diff --git a/xonstat/templates/navlinks.mako b/xonstat/templates/navlinks.mako
old mode 100644 (file)
new mode 100755 (executable)
index 9fb0db8..a907e71
--- a/xonstat/templates/navlinks.mako
+++ b/xonstat/templates/navlinks.mako
@@ -1,29 +1,47 @@
 <%def name="navlinks(view, curr, last)">
 
-<%
-if (curr+4) > last:
-    last_linked_page = last
-else:
-    last_linked_page = curr+4
-
-pages_to_link = range(curr+1, last_linked_page+1)
-%>
-
-<a class="pagination" href="${request.route_url(view, page=1)}" name="First Page"><<</a>
-
 % if curr != 1:
-<a class="pagination" href="${request.route_url(view, page=curr-1)}" name="Previous Page"><</a>
+<a class="pagination" href="${request.route_url(view, page=curr-1)}" name="Previous Page">previous</a>
 % endif
 
-% for page_num in pages_to_link:
-<a class="pagination" href="${request.route_url(view, page=page_num)}" name="Go to page ${page_num}">${page_num}</a>
-% endfor
+% if last < 8:
+    % for i in range(1, last+1):
+    ${link_page(view, i, curr)}
+    % endfor
+% else:
+    % if curr < 5:
+        % for i in range(1,7):
+        ${link_page(view, i, curr)}
+        % endfor
+        <span class="pagination">...</span>
+        <a class="pagination" href="${request.route_url(view, page=last)}" name="Last Page">${last}</a>
+    % elif last-curr < 6:
+        <a class="pagination" href="${request.route_url(view, page=1)}" name="First Page">1</a>
+        <span class="pagination">...</span>
+        % for i in range(last-5, last+1):
+        ${link_page(view, i, curr)}
+        % endfor
+    % else:
+        <a class="pagination" href="${request.route_url(view, page=1)}" name="First Page">1</a>
+        <span class="pagination">...</span>
+        % for i in range(curr-2, curr+3):
+        ${link_page(view, i, curr)}
+        % endfor
+        <span class="pagination">...</span>
+        <a class="pagination" href="${request.route_url(view, page=last)}" name="Last Page">${last}</a>
+    % endif
+% endif
 
 % if curr != last:
-<a class="pagination" href="${request.route_url(view, page=curr+1)}" name="Next Page">></a>
+<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=last)}" name="Last Page">>></a>
+</%def>
 
-(Page <a href="${request.route_url(view, page=curr)}" name="Go to page ${curr}">${curr}</a> of <a href="${request.route_url(view, page=last)}" name="Last Page">${last}</a>)
+<%def name="link_page(view, page_num, curr_page)">
+% if page_num == curr_page:
+<span class="pagination" style="color:#d95b00;">${page_num}</span>
+% else:
+<a class="pagination" href="${request.route_url(view, page=page_num)}" name="Go to page ${page_num}">${page_num}</a>
+% endif
 </%def>