Sync search result statistics with archweb

* Use archweb classes for search result statistics.
* Add some space between page numbers.
* Display current page number instead of current item range.
* Hide page numbers if the result fits into a single page.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>

4 files changed, 14 insertions, 13 deletions

diff --git a/web/html/css/aur.css b/web/html/css/aur.css
index de661fc..dada258 100644
--- a/web/html/css/aur.css
+++ b/web/html/css/aur.css
@@ -3,6 +3,10 @@
   float: right;
 }
 
+.pkglist-nav .page {
+    margin: 0 .25em;
+}
+
 #pkg-updates td.pkg-new {
   padding: 0 .5em;
 }
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index b42df4c..0c96a0b 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -639,12 +639,6 @@ function pkg_search_page($SID="", $dbh=NULL) {
 	// figure out the results to use
 	$first = $_GET['O'] + 1;
 
-	if (($_GET['PP'] + $_GET['O']) > $total) {
-		$last = $total;
-	} else {
-		$last = $_GET['PP'] + $_GET['O'];
-	}
-
 	# calculation of pagination links
 	$per_page = ($_GET['PP'] > 0) ? $_GET['PP'] : 50;
 	$current = ceil($first / $per_page);
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index 3f90088..49ca876 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -30,7 +30,7 @@ $orderby = array(
 	'd' => __('Descending')
 );
 
-$pages = array(50, 100, 250);
+$per_page = array(50, 100, 250);
 ?>
 
 <div id="pkglist-search" class="box filter-criteria">
@@ -109,7 +109,7 @@ $pages = array(50, 100, 250);
 		<div>
 			<label for="id_per_page"><?php print __("Per page"); ?></label>
 			<select name='PP'>
-				<?php foreach ($pages as $i): ?>
+				<?php foreach ($per_page as $i): ?>
 				<?php if (isset($_REQUEST['PP']) && $_REQUEST['PP'] == $i): ?>
 				<option value="<?php print $i; ?>" selected="selected"><?php print $i; ?></option>
 				<?php else: ?>
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 11db7a1..13e0b44 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -11,8 +11,9 @@ if (!$result): ?>
 	<div class="box"><p><?php echo __("No packages matched your search criteria.") ?></p></div>
 <?php else: ?>
 	<div id="pkglist-results" class="box">
-		<div id="pkglist-stats-top">
-			<p><?php echo __('%s Packages found. Showing %s - %s', $total, $first, $last) ?></p>
+		<div class="pkglist-stats">
+			<p><?php echo __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
+			<?php if (count($templ_pages) > 1): ?>
 			<p class="pkglist-nav">
 				<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
 					<?php if ($pagestart === false): ?>
@@ -24,6 +25,7 @@ if (!$result): ?>
 					<?php endif; ?>
 				<?php endforeach; ?>
 			</p>
+			<?php endif; ?>
 		</div>
 
 		<form id="pkglist-results-form" method="post" action="<?php echo get_uri('/packages/'); ?>?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>">
@@ -80,9 +82,9 @@ if (!$result): ?>
 			</tbody>
 			</table>
 
-			<div id="pkglist-stats-bottom">
-				<p><?php echo __('%s Packages found. Showing %s - %s', $total, $first, $last) ?></p>
-
+			<div class="pkglist-stats">
+				<p><?php echo __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
+				<?php if (count($templ_pages) > 1): ?>
 				<p class="pkglist-nav">
 					<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
 						<?php if ($pagestart === false): ?>
@@ -94,6 +96,7 @@ if (!$result): ?>
 						<?php endif; ?>
 					<?php endforeach; ?>
 				</p>
+				<?php endif; ?>
 			</div>
 
 			<?php if ($SID): ?>