diff options
| -rw-r--r-- | sitestatic/archweb.css | 3 | ||||
| -rw-r--r-- | templates/packages/search.html | 50 | ||||
| -rw-r--r-- | templates/packages/search_paginator.html | 27 |
3 files changed, 30 insertions, 50 deletions
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index d653d98..1a9d03b 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -645,8 +645,7 @@ div#pkglist-about { } /* pkglist: results navigation */ -#pkglist-stats-top, -#pkglist-stats-bottom { +.pkglist-stats { font-size: 0.85em; } diff --git a/templates/packages/search.html b/templates/packages/search.html index 0c67b86..ae67b18 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -52,31 +52,7 @@ {% if package_list %} <div id="pkglist-results" class="box"> - - {% if paginator %} - <div id="pkglist-stats-top"> - - <p>{{paginator.count}} packages found. - Page {{page_obj.number}} of {{paginator.num_pages}}.</p> - - <p class="pkglist-nav"> - {% if page_obj.has_previous %} - <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}" - title="Go to previous page">< Prev</a> - {% else %} - <span class="prev">< Prev</span> - {% endif %} - {% if page_obj.has_next %} - <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}" - title="Go to next page">Next ></a> - {% else %} - <span class="next">Next ></span> - {% endif %} - </p> - - </div> - {% endif %} - + {% include "packages/search_paginator.html" %} <form id="pkglist-results-form" method="post" action="/packages/update/">{% csrf_token %} <table class="results"> @@ -120,29 +96,7 @@ {% endfor %} </tbody> </table> - - {% if paginator %} - <div id="pkglist-stats-bottom"> - - <p>{{paginator.count}} packages found. Page {{page_obj.number}} of {{paginator.num_pages}}.</p> - - <p class="pkglist-nav"> - {% if page_obj.has_previous %} - <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}" - title="Go to previous page">< Prev</a> - {% else %} - <span class="prev">< Prev</span> - {% endif %} - {% if page_obj.has_next %} - <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}" - title="Go to next page">Next ></a> - {% else %} - <span class="next">Next ></span> - {% endif %} - </p> - - </div> - {% endif %} + {% include "packages/search_paginator.html" %} {% if perms.main.change_package %} <p><input title="Adopt selected packages" type="submit" id="adopt-btn" diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html new file mode 100644 index 0000000..362b7cb --- /dev/null +++ b/templates/packages/search_paginator.html @@ -0,0 +1,27 @@ +<div class="pkglist-stats"> + {% if is_paginated %} + <p>{{paginator.count}} packages found. + Page {{page_obj.number}} of {{paginator.num_pages}}.</p> + + <div class="pkglist-nav"> + <span class="prev"> + {% if page_obj.has_previous %} + <a href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}" + title="Go to previous page">< Prev</a> + {% else %} + < Prev + {% endif %} + </span> + <span class="next"> + {% if page_obj.has_next %} + <a href="/packages/{{page_obj.next_page_number}}/?{{current_query}}" + title="Go to next page">Next ></a> + {% else %} + Next > + {% endif %} + </span> + </div> + {% else %} + <p>{{ package_list.count }} packages found.</p> + {% endif %} +</div> |