Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

1 files changed, 4 insertions, 4 deletions

diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html
index 362b7cb3..3c368b82 100644
--- a/templates/packages/search_paginator.html
+++ b/templates/packages/search_paginator.html
@@ -1,12 +1,12 @@
 <div class="pkglist-stats">
     {% if is_paginated %}
-    <p>{{paginator.count}} packages found.
-    Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+    <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}}"
+        <a href="?page={{ page_obj.previous_page_number }}&amp;{{ current_query }}"
             title="Go to previous page">&lt; Prev</a>
         {% else %}
         &lt; Prev
@@ -14,7 +14,7 @@
     </span>
     <span class="next">
         {% if page_obj.has_next %}
-        <a href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
+        <a href="?page={{ page_obj.next_page_number }}&amp;{{ current_query }}"
             title="Go to next page">Next &gt;</a>
         {% else %}
         Next &gt;