Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	templates/packages/details.html
	templates/packages/files.html

1 files changed, 41 insertions, 33 deletions

diff --git a/templates/packages/search.html b/templates/packages/search.html
index ead009d0..ae9e55f2 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -14,28 +14,36 @@
 
     <h3>Package Search</h3>
 
-	<form id="pkg-search" method="get" action="/packages/">
-		<p><input type="hidden" name="sort" value='{{sort}}' /></p>
-		<fieldset>
-			<legend>Enter search criteria</legend>
-			<div><label for="id_arch" title="Limit results a specific CPU architecture">
-					Arch</label>{{ search_form.arch }}</div>
-			<div><label for="id_repo" title="Limit results to a specific respository">
-					Repository</label>{{ search_form.repo }}</div>
-			<div><label for="id_q" title="Enter keywords as desired">
-					Keywords</label>{{ search_form.q }}</div>
-			<div><label for="id_maintainer" title="Limit results to a specific maintainer">
-					Maintainer</label>{{ search_form.maintainer}}</div>
-			<div><label for="id_last_update" title="Limit results to a date after the date entered">
-					Last Updated After</label>{{ search_form.last_update }}</div>
-			<div><label for="id_flagged" title="Limit results based on out-of-date status">
-					Flagged</label>{{ search_form.flagged }}</div>
-			<div><label for="id_limit" title="Select the number of results to display per page">
-					Per Page</label>{{ search_form.limit }}</div>
-			<div ><label>&nbsp;</label><input title="Search for packages using this criteria"
-				type="submit" value="Search" /></div>
-		</fieldset>
-	</form>
+    <form id="pkg-search" method="get" action="/packages/">
+        <p><input type="hidden" name="sort" value='{{sort}}' /></p>
+        {{ search_form.non_field_errors }}
+        <fieldset>
+            <legend>Enter search criteria</legend>
+            <div>{{ search_form.arch.errors }}
+                <label for="id_arch" title="Limit results a specific CPU architecture">
+                    Arch</label>{{ search_form.arch }}</div>
+            <div>{{ search_form.repo.errors }}
+                <label for="id_repo" title="Limit results to a specific respository">
+                    Repository</label>{{ search_form.repo }}</div>
+            <div>{{ search_form.q.errors }}
+                <label for="id_q" title="Enter keywords as desired">
+                    Keywords</label>{{ search_form.q }}</div>
+            <div>{{ search_form.maintainer.errors }}
+                <label for="id_maintainer" title="Limit results to a specific maintainer">
+                    Maintainer</label>{{ search_form.maintainer}}</div>
+            <div>{{ search_form.last_update.errors }}
+                <label for="id_last_update" title="Limit results to a date after the date entered">
+                    Last Updated After</label>{{ search_form.last_update }}</div>
+            <div>{{ search_form.flagged.errors }}
+                <label for="id_flagged" title="Limit results based on out-of-date status">
+                    Flagged</label>{{ search_form.flagged }}</div>
+            <div>{{ search_form.limit.errors }}
+                <label for="id_limit" title="Select the number of results to display per page">
+                    Per Page</label>{{ search_form.limit }}</div>
+            <div ><label>&nbsp;</label><input title="Search for packages using this criteria"
+                type="submit" value="Search" /></div>
+        </fieldset>
+    </form>
 
 </div><!-- #pkglist-search -->
 
@@ -50,13 +58,13 @@
 
         <p class="pkglist-nav">
             {% if page_obj.has_previous %}
-            <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+            <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
                 title="Go to previous page">&lt; Prev</a>
             {% else %}
             <span class="prev">&lt; Prev</span>
             {% endif %}
             {% if page_obj.has_next %}
-            <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+            <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
                 title="Go to next page">Next &gt;</a>
             {% else %}
             <span class="next">Next &gt;</span>
@@ -74,17 +82,17 @@
                     {% if perms.main.change_package %}
                     <th>&nbsp;</th>
                     {% endif %}
-                    <th><a href="/packages/{% buildsortqs "arch" %}"
+                    <th><a href="/packages/?{% buildsortqs "arch" %}"
                             title="Sort packages by architecture">Arch</a></th>
-                    <th><a href="/packages/{% buildsortqs "repo" %}"
+                    <th><a href="/packages/?{% buildsortqs "repo" %}"
                             title="Sort packages by repository">Repo</a></th>
-                    <th><a href="/packages/{% buildsortqs "pkgname" %}"
+                    <th><a href="/packages/?{% buildsortqs "pkgname" %}"
                             title="Sort packages by package name">Name</a></th>
                     <th>Version</th>
                     <th>Description</th>
-                    <th><a href="/packages/{% buildsortqs "-last_update" %}"
+                    <th><a href="/packages/?{% buildsortqs "-last_update" %}"
                             title="Sort packages by last update">Last Updated</a></th>
-                    <th><a href="/packages/{% buildsortqs "-flag_date" %}"
+                    <th><a href="/packages/?{% buildsortqs "-flag_date" %}"
                             title="Sort packages by when marked-out of-date">Flag Date</a></th>
                 </tr>
             </thead>
@@ -99,9 +107,9 @@
                     <td><a href="{{ pkg.get_absolute_url }}"
                             title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                     {% if pkg.flag_date %}
-                    <td><span class="flagged">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
+                    <td><span class="flagged">{{ pkg.full_version }}</span></td>
                     {% else %}
-                    <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
+                    <td>{{ pkg.full_version }}</td>
                     {% endif %}
                     <td class="wrap">{{ pkg.pkgdesc }}</td>
                     <td>{{ pkg.last_update|date }}</td>
@@ -118,13 +126,13 @@
 
                 <p class="pkglist-nav">
                     {% if page_obj.has_previous %}
-                    <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+                    <a class="prev" href="/packages/{{page_obj.previous_page_number}}/?{{current_query}}"
                         title="Go to previous page">&lt; Prev</a>
                     {% else %}
                     <span class="prev">&lt; Prev</span>
                     {% endif %}
                     {% if page_obj.has_next %}
-                    <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+                    <a class="next" href="/packages/{{page_obj.next_page_number}}/?{{current_query}}"
                         title="Go to next page">Next &gt;</a>
                     {% else %}
                     <span class="next">Next &gt;</span>