diff --git a/bans.php b/bans.php index 6ad159f..fc7e63a 100644 --- a/bans.php +++ b/bans.php @@ -16,12 +16,12 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "table.player" => $page->get_avatar($player_name, $row['uuid']), - "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "table.reason" => $page->clean($row['reason']), - "table.date" => $page->millis_to_date($row['time']), - "table.expires" => $page->expiry($row), - "table.server.name" => $page->server($row), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "expires" => $page->expiry($row), + "server.name" => $page->server($row), )); } $page->table_end(); diff --git a/history.php b/history.php index 7c4710b..acc3242 100644 --- a/history.php +++ b/history.php @@ -163,13 +163,13 @@ try { $label = "$label_name"; $page->print_table_rows($row, array( - "generic.type" => $label, - "table.player" => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), - "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "table.reason" => $page->clean($row['reason']), - "table.date" => $page->millis_to_date($row['time']), - "table.expires" => $page->expiry($row), - "table.server.name" => $page->server($row), + "type" => $label, + "player" => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "expires" => $page->expiry($row), + "server.name" => $page->server($row), //'i' => $i . "/" . $limit . "/" . $total, )); } diff --git a/inc/css/custom.css b/inc/css/custom.css index 00dc330..93453ec 100644 --- a/inc/css/custom.css +++ b/inc/css/custom.css @@ -15,7 +15,6 @@ } /* tables */ - th { text-align: center; } @@ -52,7 +51,6 @@ tr.hover { } /* pager */ - .litebans-pager { font-size: 30px; } diff --git a/inc/page.php b/inc/page.php index 07bef9a..2a0227e 100644 --- a/inc/page.php +++ b/inc/page.php @@ -401,16 +401,16 @@ class Page { function print_table_rows($row, $array, $print_headers = true) { $type = $this->type; if (!$this->settings->show_server_scope) { - unset($array["table.server.name"]); + unset($array["server.name"]); } if ($print_headers && !$this->table_headers_printed) { $headers = array_keys($array); $headers_translated = array(); foreach ($headers as $header) { - if ($header === "table.executor" && $this->name !== "history") { + if ($header === "executor" && $this->name !== "history") { $header = $this->punished_by[$type]; } else { - $header = $this->t($header); + $header = $this->t("table." . $header); } array_push($headers_translated, $header); } @@ -421,7 +421,7 @@ class Page { echo ""; foreach ($array as $header => $text) { $a = "a"; - if ($header === "warnings.received") { + if ($header === "received-warning") { $icon = ($text !== "0") ? "glyphicon-ok" : "glyphicon-remove"; $a .= " class=\"glyphicon $icon\" aria-hidden=true"; $text = ""; diff --git a/kicks.php b/kicks.php index 68bc3da..e06ee00 100644 --- a/kicks.php +++ b/kicks.php @@ -16,11 +16,11 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "table.player" => $page->get_avatar($player_name, $row['uuid']), - "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "table.reason" => $page->clean($row['reason']), - "table.date" => $page->millis_to_date($row['time']), - "table.server.name" => $page->server($row, "server_origin"), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "server.name" => $page->server($row, "server_origin"), )); } $page->table_end(); diff --git a/lang/cs_CZ.utf8.php b/lang/cs_CZ.utf8.php index 7f9601b..302a6a3 100644 --- a/lang/cs_CZ.utf8.php +++ b/lang/cs_CZ.utf8.php @@ -40,6 +40,6 @@ class Lang { $array["info.error.id.invalid"] = "Neplatné ID"; $array["info.error.id.no-result"] = "Chyba: "; - $array["warnings.received"] = "Varování doručeno"; + $array["table.received-warning"] = "Varování doručeno"; } } diff --git a/lang/da_DK.utf8.php b/lang/da_DK.utf8.php index a4c8029..22f604c 100644 --- a/lang/da_DK.utf8.php +++ b/lang/da_DK.utf8.php @@ -35,7 +35,7 @@ class Lang { $array["history.error.uuid.no-result"] = "Ingen straf fundet."; $array["action.return"] = "Retuner til"; - $array["warnings.received"] = "Modtog Advarelse"; + $array["table.received-warning"] = "Modtog Advarelse"; // Errors which are only accessible from invalid user input or removed pages. $array["error.name.invalid"] = "Ugyldigt Navn."; diff --git a/lang/en_US.utf8.php b/lang/en_US.utf8.php index 3ea119f..e3048d6 100644 --- a/lang/en_US.utf8.php +++ b/lang/en_US.utf8.php @@ -45,10 +45,12 @@ class DefaultLang { $array["generic.player-name"] = "Player"; $array["table.player"] = $array["generic.player-name"]; + $array["table.type"] = $array["generic.type"]; $array["table.executor"] = "Moderator"; $array["table.reason"] = "Reason"; $array["table.date"] = "Date"; $array["table.expires"] = "Expires"; + $array["table.received-warning"] = "Received Warning"; $array["table.server.name"] = "Server"; $array["table.server.scope"] = "Server Scope"; @@ -59,8 +61,6 @@ class DefaultLang { $array["action.check"] = "Check"; $array["action.return"] = "Return to {origin}"; - $array["warnings.received"] = "Received Warning"; - $array["error.missing-args"] = "Missing arguments."; $array["error.name.unseen"] = "{name} has not joined before."; $array["error.name.invalid"] = "Invalid name."; diff --git a/lang/es_ES.utf8.php b/lang/es_ES.utf8.php index 632a638..a4023a8 100644 --- a/lang/es_ES.utf8.php +++ b/lang/es_ES.utf8.php @@ -34,7 +34,7 @@ class Lang { $array["history.error.uuid.no-result"] = "Castigos No Encontrados."; $array["action.return"] = "Volver a"; - $array["warnings.received"] = "¿Advertencia Recibida?"; + $array["table.received-warning"] = "¿Advertencia Recibida?"; // Errors which are only accessible from invalid user input or removed pages. $array["error.name.invalid"] = "Nombre Inválido."; diff --git a/lang/es_MX.utf8.php b/lang/es_MX.utf8.php index 6a0e0db..d904757 100644 --- a/lang/es_MX.utf8.php +++ b/lang/es_MX.utf8.php @@ -34,7 +34,7 @@ class Lang { $array["history.error.uuid.no-result"] = "Sanciones no Encontradas."; $array["action.return"] = "Volver a"; - $array["warnings.received"] = "¿Advertencia Recibida?"; + $array["table.received-warning"] = "¿Advertencia Recibida?"; // Errors which are only accessible from invalid user input or removed pages. $array["error.name.invalid"] = "Nombre Inválido."; diff --git a/lang/it_IT.utf8.php b/lang/it_IT.utf8.php index 1ad1655..81defb3 100644 --- a/lang/it_IT.utf8.php +++ b/lang/it_IT.utf8.php @@ -34,7 +34,7 @@ class Lang { $array["history.error.uuid.no-result"] = "Nessuna punizione trovata."; $array["action.return"] = "Torna a"; - $array["warnings.received"] = "Avvertimento ricevuto"; + $array["table.received-warning"] = "Avvertimento ricevuto"; // Errors which are only accessible from invalid user input or removed pages. $array["error.name.invalid"] = "Nome invalido."; diff --git a/lang/ja_JP.utf8.php b/lang/ja_JP.utf8.php index 4c68f95..d248623 100644 --- a/lang/ja_JP.utf8.php +++ b/lang/ja_JP.utf8.php @@ -35,7 +35,7 @@ class Lang { $array["history.error.uuid.no-result"] = "処罰データはありません"; $array["action.return"] = "戻る"; - $array["warnings.received"] = "受け取った警告"; + $array["table.received-warning"] = "受け取った警告"; // Errors which are only accessible from invalid user input or removed pages. $array["error.name.invalid"] = "プレイヤー名が無効です"; diff --git a/lang/nl_NL.utf8.php b/lang/nl_NL.utf8.php index f409597..cc3b8bc 100644 --- a/lang/nl_NL.utf8.php +++ b/lang/nl_NL.utf8.php @@ -35,7 +35,7 @@ class Lang { $array["history.error.uuid.no-result"] = "Geen straffen gevonden."; $array["action.return"] = "Terug naar"; - $array["warnings.received"] = "Waarschuwing ontvangen"; + $array["table.received-warning"] = "Waarschuwing ontvangen"; // Errors which are only accessible from invalid user input or removed pages. $array["error.name.invalid"] = "Ongeldige naam."; diff --git a/mutes.php b/mutes.php index 8fa2b7b..7e2bd60 100644 --- a/mutes.php +++ b/mutes.php @@ -16,12 +16,12 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "table.player" => $page->get_avatar($player_name, $row['uuid']), - "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "table.reason" => $page->clean($row['reason']), - "table.date" => $page->millis_to_date($row['time']), - "table.expires" => $page->expiry($row), - "table.server.name" => $page->server($row), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "date" => $page->millis_to_date($row['time']), + "expires" => $page->expiry($row), + "server.name" => $page->server($row), )); } $page->table_end(); diff --git a/warnings.php b/warnings.php index ad409df..a1e7ca7 100644 --- a/warnings.php +++ b/warnings.php @@ -16,12 +16,12 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - "table.player" => $page->get_avatar($player_name, $row['uuid']), - "table.executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - "table.reason" => $page->clean($row['reason']), - "table.expires" => $page->expiry($row), - "warnings.received" => (($page->active($row, 'warned') === true) ? "1" : "0"), - "table.server.name" => $page->server($row), + "player" => $page->get_avatar($player_name, $row['uuid']), + "executor" => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + "reason" => $page->clean($row['reason']), + "expires" => $page->expiry($row), + "received-warning" => (($page->active($row, 'warned') === true) ? "1" : "0"), + "server.name" => $page->server($row), )); } $page->table_end();