From ef4f189a1a3a5fdb0b9a4d372b591f6930bd8cb0 Mon Sep 17 00:00:00 2001
From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Thu, 22 Dec 2011 20:37:57 +0100
Subject: [PATCH 1/2] Redesigned the next/previous page switcher to allow
 direct access to any page.

---
 wp-fdroid/wp-fdroid.php | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 7d1b1dfc..2f1c253a 100644
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -240,21 +240,31 @@ class FDroid
 			$out.=$matches;
 			
 			$out.='<hr><p>';
-			if($query_vars['fdpage']==1) {
-				$out.="&lt;&lt;first ";
-				$out.="&lt;prev ";
-			} else {
-				$out.='<a href="'.makelink($query_vars, array('fdpage'=>1)).'">&lt;&lt;first</a> ';
-				$out.='<a href="'.makelink($query_vars, array('fdpage'=>($query_vars['fdpage']-1))).'">&lt;&lt;prev</a> ';
-			}
+
+			$out.='<div style="float:left;">';
 			$out.=' Page '.$query_vars['fdpage'].' of '.$numpages.' ';
-			if($query_vars['fdpage']==$numpages) {
-				$out.="next&gt; ";
-				$out.="last&gt;&gt; ";
-			} else {
+			$out.='</div>';
+
+			$out.='<div style="float:right;">';
+			if($query_vars['fdpage']!=$numpages) {
 				$out.='<a href="'.makelink($query_vars, array('fdpage'=>($query_vars['fdpage']+1))).'">next&gt;</a> ';
-				$out.='<a href="'.makelink($query_vars, array('fdpage'=>$numpages)).'">last&gt;&gt;</a> ';
 			}
+			$out.='</div>';
+
+			$out.='<div style="text-align:center;">';
+			for($i=1;$i<=$numpages;$i++) {
+				if($i == $query_vars['fdpage']) {
+					$out.='<b>'.$i.'</b>';
+				} else {
+					$out.='<a href="'.makelink($query_vars, array('fdpage'=>$i)).'">';
+					$out.=$i;
+					$out.='</a>';
+				}
+				$out.=' ';
+			}
+			$out.=' ';
+			$out.='</div>';
+
 			$out.='</p>';
 		} else if($query_vars['fdfilter']!='') {
 			$out.='<p>No matches</p>';

From cdcc6160bad2c5cbad0f3d4f0e2e90b0932ca4bc Mon Sep 17 00:00:00 2001
From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Tue, 3 Jan 2012 21:35:37 +0100
Subject: [PATCH 2/2] Better CSS for the page selector.

---
 wp-fdroid/wp-fdroid.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 2f1c253a..ac960785 100644
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -241,30 +241,32 @@ class FDroid
 			
 			$out.='<hr><p>';
 
-			$out.='<div style="float:left;">';
+			$out.='<div style="width:20%; float:left; text-align:left;">';
 			$out.=' Page '.$query_vars['fdpage'].' of '.$numpages.' ';
 			$out.='</div>';
 
-			$out.='<div style="float:right;">';
-			if($query_vars['fdpage']!=$numpages) {
-				$out.='<a href="'.makelink($query_vars, array('fdpage'=>($query_vars['fdpage']+1))).'">next&gt;</a> ';
-			}
-			$out.='</div>';
-
-			$out.='<div style="text-align:center;">';
-			for($i=1;$i<=$numpages;$i++) {
-				if($i == $query_vars['fdpage']) {
-					$out.='<b>'.$i.'</b>';
-				} else {
-					$out.='<a href="'.makelink($query_vars, array('fdpage'=>$i)).'">';
-					$out.=$i;
-					$out.='</a>';
+			$out.='<div style="width:60%; float:left; text-align:center;">';
+			if($numpages>1) {
+				for($i=1;$i<=$numpages;$i++) {
+					if($i == $query_vars['fdpage']) {
+						$out.='<b>'.$i.'</b>';
+					} else {
+						$out.='<a href="'.makelink($query_vars, array('fdpage'=>$i)).'">';
+						$out.=$i;
+						$out.='</a>';
+					}
+					$out.=' ';
 				}
 				$out.=' ';
-			}
-			$out.=' ';
+			}
 			$out.='</div>';
-
+
+			$out.='<div style="width:20%; float:left; text-align:right;">';
+			if($query_vars['fdpage']!=$numpages) {
+				$out.='<a href="'.makelink($query_vars, array('fdpage'=>($query_vars['fdpage']+1))).'">next&gt;</a> ';
+			}
+			$out.='</div>';
+			
 			$out.='</p>';
 		} else if($query_vars['fdfilter']!='') {
 			$out.='<p>No matches</p>';