From 2c0b588b482ce316feaebdba13904f4b9f4c63cd Mon Sep 17 00:00:00 2001
From: ruan <2369127-ruany@users.noreply.gitlab.com>
Date: Tue, 18 Aug 2020 16:54:31 +0200
Subject: [PATCH] Simplify pager

---
 inc/css/custom.css        |  4 +++-
 inc/page.php              | 16 ++++++----------
 inc/test/php/PageTest.php | 24 ++++++++----------------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/inc/css/custom.css b/inc/css/custom.css
index 909c3dd..e88df82 100644
--- a/inc/css/custom.css
+++ b/inc/css/custom.css
@@ -103,7 +103,9 @@ tr.hover {
 }
 
 .litebans-pager-inactive {
-    color: transparent;
+    visibility: hidden;
+    pointer-events: none;
+    cursor: default;
 }
 
 /* index.php */
diff --git a/inc/page.php b/inc/page.php
index ba8c3a9..f0d92f1 100644
--- a/inc/page.php
+++ b/inc/page.php
@@ -589,9 +589,6 @@ class Page {
         $prev_class = "litebans-" . ($prev_active ? "pager-active" : "pager-inactive");
         $next_class = "litebans-" . ($next_active ? "pager-active" : "pager-inactive");
 
-        $pager_prev = "<div class=\"litebans-pager litebans-pager-left $prev_class\">«</div>";
-        $pager_next = "<div class=\"litebans-pager litebans-pager-right $next_class\">»</div>";
-
         if ($simple) {
             $pager_prev_href = $this->append_param($this->link("$page{$prevargs}"), "page={$prev}");
             $pager_next_href = $this->append_param($this->link("$page{$args}"), "page={$next}");
@@ -600,13 +597,10 @@ class Page {
             $pager_next_href = $this->append_param(($this->link("$page") . "{$args}"), "page={$next}");
         }
 
-        if ($prev_active) {
-            $pager_prev = "<a href=\"$pager_prev_href\">$pager_prev</a>";
-        }
-        if ($next_active) {
-            $pager_next = "<a href=\"$pager_next_href\">$pager_next</a>";
-        }
-        $pager_count = '<div><div class="litebans-pager-number">' . $this->t("table.pager.number") . ' ' . $cur . '/' . $pages . '</div></div>';
+        $pager_prev = "<a class=\"litebans-pager litebans-pager-left $prev_class\" href=\"$pager_prev_href\">«</a>";
+        $pager_next = "<a class=\"litebans-pager litebans-pager-right $next_class\" href=\"$pager_next_href\">»</a>";
+
+        $pager_count = '<div class="litebans-pager-number">' . $this->t("table.pager.number") . ' ' . $cur . '/' . $pages . '</div>';
         return array(
             "prev"  => $pager_prev,
             "next"  => $pager_next,
@@ -673,4 +667,6 @@ class Page {
             return "WHERE ";
         }
     }
+
+
 }
diff --git a/inc/test/php/PageTest.php b/inc/test/php/PageTest.php
index 2d84165..99caa8d 100644
--- a/inc/test/php/PageTest.php
+++ b/inc/test/php/PageTest.php
@@ -8,21 +8,13 @@ final class PageTest extends TestCase {
     public function testBansPagerHTML(): void {
         $page = new Page("bans", false, false);
 
-        $currentPage = 1;
-        $page->page = $currentPage;
-        $pager = $page->generate_pager(10);
-        $this->assertIsArray($pager);
-        $this->assertCount(3, $pager);
-        $this->assertEquals('<div class="litebans-pager litebans-pager-left litebans-pager-inactive">«</div>', $pager["prev"]);
-        $this->assertEquals('<a href="bans.php?page=2"><div class="litebans-pager litebans-pager-right litebans-pager-active">»</div></a>', $pager["next"]);
-        $this->assertEquals("<div><div class=\"litebans-pager-number\">Page $currentPage/2</div></div>", $pager["count"]);
-
-        $currentPage++;
-        $page->page = $currentPage;
-        $pager = $page->generate_pager(10);
-        $this->assertIsArray($pager);
-        $this->assertCount(3, $pager);
-        $this->assertEquals("<div><div class=\"litebans-pager-number\">Page $currentPage/2</div></div>", $pager["count"]);
+        foreach (range(1, 2) as $currentPage) {
+            $page->page = $currentPage;
+            $pager = $page->generate_pager(10);
+            $this->assertIsArray($pager);
+            $this->assertCount(3, $pager);
+            $this->assertEquals("Page $currentPage/2", $pager["count"]);
+        }
     }
 
     public function testHistoryPagerHTML(): void {
@@ -36,7 +28,7 @@ final class PageTest extends TestCase {
         ob_start();
         require_once './history.php';
         $output = ob_get_clean();
-        $historyPager = '<div class="litebans-pager litebans-pager-left litebans-pager-inactive">«</div><div class="litebans-pager litebans-pager-right litebans-pager-inactive">»</div><div><div class="litebans-pager-number">Page 1/1</div></div>';
+        $historyPager = 'Page 1/1';
         $this->assertStringContainsString($historyPager, $output);
     }
 }