From 77c4bf71a08ea878d3cc18491d02b9ff543ed460 Mon Sep 17 00:00:00 2001
From: ruan <ruany@users.noreply.github.com>
Date: Sat, 5 May 2018 09:38:51 +0200
Subject: [PATCH] Add "Expired" tag, make labels more customizable

---
 inc/css/custom.css  | 27 ++++++++++++++++++++++++++-
 info.php            | 14 +++++++++-----
 lang/en_US.utf8.php | 12 +++++++-----
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/inc/css/custom.css b/inc/css/custom.css
index 93453ec..407d2ba 100644
--- a/inc/css/custom.css
+++ b/inc/css/custom.css
@@ -89,7 +89,7 @@ tr.hover {
 }
 
 /* info.php */
-.litebans-info-badges {
+.litebans-label-container {
     width: 0;
     display: inline-flex;
 }
@@ -99,6 +99,31 @@ tr.hover {
     font-size: 17px;
 }
 
+.litebans-label-inactive {
+    color: #fff;
+    background-color: #f79720
+}
+
+.litebans-label-expired {
+    color: #fff;
+    background-color: #777
+}
+
+.litebans-label-active {
+    color: #fff;
+    background-color: #ee5555
+}
+
+.litebans-label-permanent {
+    color: #fff;
+    background-color: #ee5555
+}
+
+.litebans-label-ipban {
+    color: #fff;
+    background-color: #ee5555
+}
+
 /* history.php */
 .litebans-label-history {
     font-size: 16px;
diff --git a/info.php b/info.php
index 58e8621..586eafd 100644
--- a/info.php
+++ b/info.php
@@ -163,19 +163,23 @@ if ($st->execute(array($id))) {
                 $idx = "generic.ipmute";
             }
             if ($idx !== null) {
-                $badges .= "<span class='badge badge-danger litebans-label-info'>" . $page->t($idx) . "</span>";
+                $badges .= "<span class='badge litebans-label-info litebans-label-ipban'>" . $page->t($idx) . "</span>";
             }
         }
         if ($active === true) {
-            $badges .= "<span class='badge badge-danger litebans-label-info'>" . $page->t("generic.active") . "</span>";
+            $badges .= "<span class='badge litebans-label-info litebans-label-active'>" . $page->t("generic.active") . "</span>";
             if ($permanent) {
-                $badges .= "<span class='badge badge-danger litebans-label-info'>" . $page->t("generic.permanent") . "</span>";
+                $badges .= "<span class='badge litebans-label-info litebans-label-permanent'>" . $page->t("generic.permanent") . "</span>";
             }
         } else {
-            $badges .= "<span class='badge badge-warning litebans-label-info'>" . $page->t("generic.inactive") . "</span>";
+            if ($page->is_expired($row)) {
+                $badges .= "<span class='badge litebans-label-info litebans-label-expired'>" . $page->t("generic.expired") . "</span>";
+            } else {
+                $badges .= "<span class='badge litebans-label-info litebans-label-inactive'>" . $page->t("generic.inactive") . "</span>";
+            }
         }
     }
-    $page->print_header(true, $header . "<div class=\"litebans-info-badges\">$badges</div>");
+    $page->print_header(true, $header . "<div class=\"litebans-label-container\">$badges</div>");
 
     $map = $info->basic_info($row, $player_name);
 
diff --git a/lang/en_US.utf8.php b/lang/en_US.utf8.php
index e3048d6..059226b 100644
--- a/lang/en_US.utf8.php
+++ b/lang/en_US.utf8.php
@@ -15,11 +15,6 @@ class DefaultLang {
         $array["title.player-history"] = "Recent Punishments for {name}";
         $array["title.staff-history"] = "Recent Punishments by {name}";
 
-        $array["page.expired.ban"] = '(Unbanned)';
-        $array["page.expired.ban-by"] = '(Unbanned by {name})';
-        $array["page.expired.mute"] = '(Unmuted)';
-        $array["page.expired.mute-by"] = '(Unmuted by {name})';
-        $array["page.expired.warning"] = '(Expired)';
 
         $array["generic.ban"] = "Ban";
         $array["generic.mute"] = "Mute";
@@ -41,9 +36,16 @@ class DefaultLang {
         $array["generic.type"] = "Type";
         $array["generic.active"] = "Active";
         $array["generic.inactive"] = "Inactive";
+        $array["generic.expired"] = "Expired";
         $array["generic.permanent"] = "Permanent";
         $array["generic.player-name"] = "Player";
 
+        $array["page.expired.ban"] = '(Unbanned)';
+        $array["page.expired.ban-by"] = '(Unbanned by {name})';
+        $array["page.expired.mute"] = '(Unmuted)';
+        $array["page.expired.mute-by"] = '(Unmuted by {name})';
+        $array["page.expired.warning"] = '(' . $array["generic.expired"] . ')';
+
         $array["table.player"] = $array["generic.player-name"];
         $array["table.type"] = $array["generic.type"];
         $array["table.executor"] = "Moderator";