summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
Diffstat (limited to 'pages')
-rw-r--r--pages/alerts.inc23
-rw-r--r--pages/byspecies.inc5
-rw-r--r--pages/home.inc19
-rw-r--r--pages/lists.inc16
4 files changed, 60 insertions, 3 deletions
diff --git a/pages/alerts.inc b/pages/alerts.inc
index b58a9ce..a0b47ff 100644
--- a/pages/alerts.inc
+++ b/pages/alerts.inc
@@ -9,6 +9,29 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; ?>
<div class="container">
<div id="page-content">
<h2>Alerts</h2>
+ <br>
+
+ <div class="list-group">
+ <a href="/-/emergency" class="list-group-item list-group-item-action" style="display: grid; grid-template-columns: max-content 1fr;">
+ <img src="<?= icon('emergency', null, true) ?>" style="margin-right: 5px; height: 24px; width: 24px;"><div style="display: flex; align-items: center; color: var(--bs-body-color);">Emergency alert<?php if (isset($_GET["noCountdown"])): ?></div><?php else: ?> (<span id="emergency-countdown">10</span>)</div>
+ <script>
+ let eCountdownInterval = setInterval(() => {
+ document.getElementById("emergency-countdown").innerText = (parseInt(document.getElementById("emergency-countdown").innerText) - 1).toString();
+
+ if (parseInt(document.getElementById("emergency-countdown").innerText) <= 0) {
+ clearInterval(eCountdownInterval);
+ location.href = "/-/emergency";
+ }
+ }, 1000);
+ </script><?php endif; ?>
+ </a>
+ <a href="/-/wakeup" class="list-group-item list-group-item-action" style="display: grid; grid-template-columns: max-content 1fr;">
+ <img src="<?= icon('wakeup', null, true) ?>" style="margin-right: 5px; height: 24px; width: 24px;"><div style="display: flex; align-items: center; color: var(--bs-body-color);">Wake-up alert</div>
+ </a>
+ <a href="/-/pleasure" class="list-group-item list-group-item-action" style="display: grid; grid-template-columns: max-content 1fr;">
+ <img src="<?= icon('pleasure', null, true) ?>" style="margin-right: 5px; height: 24px; width: 24px;"><div style="display: flex; align-items: center; color: var(--bs-body-color);">Pleasure alert</div>
+ </a>
+ </div>
</div>
</div>
diff --git a/pages/byspecies.inc b/pages/byspecies.inc
index 294dee7..4a9ce66 100644
--- a/pages/byspecies.inc
+++ b/pages/byspecies.inc
@@ -31,6 +31,7 @@ function page() { global $lang;
$merpony = [];
$human = [];
$kirin = [];
+ $deer = [];
foreach ($members as $member) {
foreach ($member["_metadata"]["species"] as $species) {
@@ -44,6 +45,7 @@ function page() { global $lang;
if ($species === "human") $human[] = $member;
if ($species === "merpony") $merpony[] = $member;
if ($species === "kirin") $kirin[] = $member;
+ if ($species === "deer") $deer[] = $member;
}
}
@@ -53,7 +55,8 @@ function page() { global $lang;
if (count($alicorn) > 0) species($alicorn, "alicorn", $lang["species"]["alicorn"][3]);
if (count($batpony) > 0) species($batpony, "batpony", $lang["species"]["batpony"][3]);
if (count($crystal) > 0) species($crystal, "crystal", $lang["species"]["crystal"][3]);
- if (count($kirin) > 0) species($kirin, "kirin", "Kirin");
+ if (count($deer) > 0 ) species($deer, "deer", "Deers");
+ if (count($kirin) > 0) species($kirin, "kirin", "Kirins");
if (count($changeling) > 0) species($changeling, "changeling", "Changelings");
if (count($merpony) > 0) species($merpony, "merpony", "Merponies");
if (count($human) > 0) species($human, "human", "Humans");
diff --git a/pages/home.inc b/pages/home.inc
index 18acaea..7485cfd 100644
--- a/pages/home.inc
+++ b/pages/home.inc
@@ -6,9 +6,12 @@ if (isset($_GET["ec"])) {
require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; global $readOnly; global $isNormallyLoggedIn; global $_PROFILE; global $lang; global $pages; global $isLowerLoggedIn; global $app; global $isLoggedIn;
-function banner() { global $isLoggedIn; global $isLowerLoggedIn; $byColor = getMembersByColor(false, true); global $lang; ?>
+global $use2023UI;
+
+function banner() { global $isLoggedIn; global $isLowerLoggedIn; $byColor = getMembersByColor(false, true); global $lang; global $use2023UI; ?>
<div style="text-align: center;">
- <img alt="" src="/assets/logo/newlogo<?= $isLoggedIn || $isLowerLoggedIn ? "3" : "" ?>.png" style="width:128px;">
+ <img alt="" src="/assets/logo/newlogo<?= $isLoggedIn || $isLowerLoggedIn ? "3" : "" ?>.png" style="width:128px;" class="old-ui">
+ <img alt="" src="/assets/logo/newlogo-ng.png" style="width:128px;" class="new-ui">
<p style="z-index:999;position:relative;background:transparent;margin: 20px -10px 0 -20px;padding-right:30px;height:32px;text-align: center;display:grid;grid-template-columns: repeat(<?= count($byColor) ?>, 1fr);">
<?php foreach ($byColor as $member): ?><a class="rainbow-item" style="overflow: hidden;"><img src="<?= getAsset($member["_system"], $member["id"], "heads") ?>" style="height:32px;position:absolute;z-index:99;"></a><?php endforeach; ?>
</p>
@@ -200,4 +203,16 @@ function members() { global $isLoggedIn; global $isLowerLoggedIn; global $app; ?
?>
</div>
+<style>
+<?php if ($use2023UI): ?>
+.old-ui {
+ display: none;
+}
+<?php else: ?>
+.new-ui {
+ display: none;
+}
+<?php endif; ?>
+</style>
+
<?php file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/cache/home.json", json_encode($cache)); require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/footer.inc'; ?> \ No newline at end of file
diff --git a/pages/lists.inc b/pages/lists.inc
index 2b507f4..c9baf06 100644
--- a/pages/lists.inc
+++ b/pages/lists.inc
@@ -9,6 +9,22 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; ?>
<div class="container">
<div id="page-content">
<h2>Member lists</h2>
+ <br>
+
+ <div class="list-group">
+ <a href="/-/splitting" class="list-group-item list-group-item-action" style="display: grid; grid-template-columns: max-content 1fr;">
+ <img src="<?= icon('splitting', null, true) ?>" style="margin-right: 5px; height: 24px; width: 24px;"><div style="display: flex; align-items: center; color: var(--bs-body-color);">Members by splitting date</div>
+ </a>
+ <a href="/-/byfront" class="list-group-item list-group-item-action" style="display: grid; grid-template-columns: max-content 1fr;">
+ <img src="<?= icon('front', null, true) ?>" style="margin-right: 5px; height: 24px; width: 24px;"><div style="display: flex; align-items: center; color: var(--bs-body-color);">Members by last fronted date</div>
+ </a>
+ <a href="/-/alphabet" class="list-group-item list-group-item-action" style="display: grid; grid-template-columns: max-content 1fr;">
+ <img src="<?= icon('letters', null, true) ?>" style="margin-right: 5px; height: 24px; width: 24px;"><div style="display: flex; align-items: center; color: var(--bs-body-color);">Members by prefix letters</div>
+ </a>
+ <a href="/-/byspecies" class="list-group-item list-group-item-action" style="display: grid; grid-template-columns: max-content 1fr;">
+ <img src="<?= icon('species', null, true) ?>" style="margin-right: 5px; height: 24px; width: 24px;"><div style="display: flex; align-items: center; color: var(--bs-body-color);">Members by species</div>
+ </a>
+ </div>
</div>
</div>