Don't show the navigation links if we're on the first and only page!

diff --git a/xonstat/templates/navlinks.mako b/xonstat/templates/navlinks.mako
index c19c5277c3838ca4a51c386e4664bcc092ddc382..acfb1669e83fa6f4f6d1322756954cc16d03176c 100755 (executable)
--- a/xonstat/templates/navlinks.mako
+++ b/xonstat/templates/navlinks.mako
@@ -1,41 +1,43 @@
 <%def name="navlinks(view, curr, last, **kwargs)">
-% if curr != 1:
-        <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, **kwargs)}
-    % endfor
-% else:
-    % if curr < 5:
-        % for i in range(1,7):
-        ${link_page(view, i, curr, **kwargs)}
-        % endfor
-        <span class="pagination">...</span>
-        <a class="pagination" href="${request.route_url(view, page=last, **kwargs)}" name="Last Page">${last}</a>
+% if not (curr == last and curr == 1):
+    % if curr != 1:
+            <a class="pagination" href="${request.route_url(view, page=curr-1, **kwargs)}" name="Previous Page">previous</a>
+    % endif
 
-    % elif last-curr < 6:
-        <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):
+    % if last < 8:
+        % for i in range(1, last+1):
         ${link_page(view, i, curr, **kwargs)}
         % endfor
     % else:
-        <a class="pagination" href="${request.route_url(view, page=1, **kwargs)}" name="First Page">1</a>
+        % if curr < 5:
+            % for i in range(1,7):
+            ${link_page(view, i, curr, **kwargs)}
+            % endfor
+            <span class="pagination">...</span>
+            <a class="pagination" href="${request.route_url(view, page=last, **kwargs)}" name="Last Page">${last}</a>
 
-        <span class="pagination">...</span>
-        % for i in range(curr-2, curr+3):
-        ${link_page(view, i, curr, **kwargs)}
-        % endfor
-        <span class="pagination">...</span>
-        <a class="pagination" href="${request.route_url(view, page=last, **kwargs)}" name="Last Page">${last}</a>
+        % elif last-curr < 6:
+            <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, **kwargs)}
+            % endfor
+        % else:
+            <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, **kwargs)}
+            % endfor
+            <span class="pagination">...</span>
+            <a class="pagination" href="${request.route_url(view, page=last, **kwargs)}" name="Last Page">${last}</a>
 
+        % endif
     % endif
-% endif
 
-% if curr != last:
-    <a class="pagination" href="${request.route_url(view, page=curr+1, **kwargs)}" name="Next Page">next</a>
+    % if curr != last:
+        <a class="pagination" href="${request.route_url(view, page=curr+1, **kwargs)}" name="Next Page">next</a>
+    % endif
 % endif
 </%def>