diff options
author | RaindropsSys <contact@minteck.org> | 2023-07-21 23:00:41 +0200 |
---|---|---|
committer | RaindropsSys <contact@minteck.org> | 2023-07-21 23:00:41 +0200 |
commit | 05a4fcc9848ea1fb9feb5b5bfb7a2733dec3ce40 (patch) | |
tree | fb5dfa96e9f04c840e93ede2ee2042cad470378c | |
parent | 46251292b5c8b431de66aeff473594ccec60e04c (diff) | |
download | pluralconnect-05a4fcc9848ea1fb9feb5b5bfb7a2733dec3ce40.tar.gz pluralconnect-05a4fcc9848ea1fb9feb5b5bfb7a2733dec3ce40.tar.bz2 pluralconnect-05a4fcc9848ea1fb9feb5b5bfb7a2733dec3ce40.zip |
Updated 10 files and added 11 files (automated)
-rw-r--r-- | assets/icons/new/emergency.svg | 1 | ||||
-rw-r--r-- | assets/icons/new/front.svg | 1 | ||||
-rw-r--r-- | assets/icons/new/letters.svg | 1 | ||||
-rw-r--r-- | assets/icons/new/pleasure.svg | 1 | ||||
-rw-r--r-- | assets/icons/new/species.svg | 1 | ||||
-rw-r--r-- | assets/icons/new/splitting.svg | 1 | ||||
-rw-r--r-- | assets/icons/new/wakeup.svg | 1 | ||||
-rw-r--r-- | assets/logo/newlogo-ng.png | bin | 0 -> 101963 bytes | |||
-rw-r--r-- | assets/species/deer-plush.png | bin | 0 -> 6143 bytes | |||
-rw-r--r-- | assets/species/deer-robot.png | bin | 0 -> 6143 bytes | |||
-rw-r--r-- | assets/species/deer.png | bin | 0 -> 6143 bytes | |||
-rw-r--r-- | includes/components/2023ui.inc | 2 | ||||
-rw-r--r-- | includes/components/header.inc | 2 | ||||
-rw-r--r-- | includes/components/pleasure.inc | 40 | ||||
-rw-r--r-- | includes/fragments/metadata.inc | 2 | ||||
-rw-r--r-- | includes/pages.json | 2 | ||||
-rw-r--r-- | includes/util/banner.inc | 2 | ||||
-rw-r--r-- | pages/alerts.inc | 23 | ||||
-rw-r--r-- | pages/byspecies.inc | 5 | ||||
-rw-r--r-- | pages/home.inc | 19 | ||||
-rw-r--r-- | pages/lists.inc | 16 |
21 files changed, 77 insertions, 43 deletions
diff --git a/assets/icons/new/emergency.svg b/assets/icons/new/emergency.svg new file mode 100644 index 0000000..84b3b5a --- /dev/null +++ b/assets/icons/new/emergency.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M426-136v-250L210-261l-55-93 217-126-216-125 54-93 216 125v-251h108v251l216-125 54 93-216 125 217 126-55 93-216-125v250H426Z"/></svg>
\ No newline at end of file diff --git a/assets/icons/new/front.svg b/assets/icons/new/front.svg new file mode 100644 index 0000000..f72d52d --- /dev/null +++ b/assets/icons/new/front.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M280-80 120-240l160-160 42 44-86 86h464v-160h60v220H236l86 86-42 44Zm-80-450v-220h524l-86-86 42-44 160 160-160 160-42-44 86-86H260v160h-60Z"/></svg>
\ No newline at end of file diff --git a/assets/icons/new/letters.svg b/assets/icons/new/letters.svg new file mode 100644 index 0000000..91d00ed --- /dev/null +++ b/assets/icons/new/letters.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M667-360q-15 0-24.5-9.5T633-394v-172q0-15 9.5-24.5T667-600h139q15 0 24.5 9.5T840-566v46h-48v-32H681v144h111v-32h48v46q0 15-9.5 24.5T806-360H667Zm-287 0v-240h173q15 0 24.5 9.5T587-566v52q0 15-9.5 24.5T553-480q15 0 24.5 9.5T587-446v52q0 15-9.5 24.5T553-360H380Zm48-144h111v-48H428v48Zm0 96h111v-48H428v48Zm-308 48v-206q0-15 9.5-24.5T154-600h139q15 0 24.5 9.5T327-566v206h-48v-77H168v77h-48Zm48-125h111v-67H168v67Z"/></svg>
\ No newline at end of file diff --git a/assets/icons/new/pleasure.svg b/assets/icons/new/pleasure.svg new file mode 100644 index 0000000..64bfbaa --- /dev/null +++ b/assets/icons/new/pleasure.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M480-80q-72-8-143.5-41.5t-128.5-93q-57-59.5-92.5-147T80-564.975V-603h38q53 0 113 20.5T337-530q8-90 48-185.5T480-879q55 68 95 163.5T623-530q46-30 106-51.5T842-603h38v38.025Q880-449 844.5-361.5t-92.5 147q-57 59.5-128.5 93T480-80Zm8-61q-11-186-107.393-282.184Q284.213-519.368 141-542q13 193 112.5 288T488-141Zm-9-245q14-26 38.5-56t47.5-50q5-68-20-138t-65-145q-40 75-65 145t-20 138q23 20 46.5 50t37.5 56Zm69 228q47-17 93.5-45t84-73q37.5-45 63-110.5T819-542q-106 17-187 75.5T513-322q12 38 21 76.5t14 87.5Zm-69-228Zm69 228Zm-60 17Zm25-181ZM480-80Z"/></svg>
\ No newline at end of file diff --git a/assets/icons/new/species.svg b/assets/icons/new/species.svg new file mode 100644 index 0000000..4e575c9 --- /dev/null +++ b/assets/icons/new/species.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M380-80q-75 0-127.5-52.5T200-260q0-32 14.5-60.5T263-383q15-15 24-25t19-22q-51-78-78.5-163.5T200-760q0-58 21-89t59-31q42 0 87 41t79 109q10 20 18.5 41.5T480-641q7-26 15.5-47.5T514-730q34-68 79-109t87-41q38 0 59 31t21 89q0 81-27.5 166.5T654-430q10 12 19 22t24 25q34 34 48.5 62.5T760-260q0 75-52.5 127.5T580-80q-45 0-72.5-10L480-100l-27.5 10Q425-80 380-80Zm0-60q17 0 40-5.5t49-16.5q-11-5-20-17t-9-21q0-8 11.5-14t28.5-6q17 0 28.5 6t11.5 14q0 9-9 21t-20 17q26 11 49 16.5t40 5.5q50 0 85-35t35-85q0-22-12-43t-35-41q-11-10-24.5-24T604-396q-32-42-55-53t-69-11q-46 0-69 11t-55 53q-11 14-24.5 28T307-344q-23 20-35 41t-12 43q0 50 35 85t85 35Zm40-150q-8 0-14-9t-6-21q0-12 6-21t14-9q8 0 14 9t6 21q0 12-6 21t-14 9Zm120 0q-8 0-14-9t-6-21q0-12 6-21t14-9q8 0 14 9t6 21q0 12-6 21t-14 9ZM347-477q21-20 41.5-29.5T439-519q-5-51-17-99.5T391-705q-23-47-53-78.5T275-826q-8 15-11.5 32t-3.5 34q0 72 22.5 144.5T347-477Zm266 0q42-66 64.5-138.5T700-760q0-17-3.5-34T685-826q-33 11-63 42.5T569-705q-19 38-31 86.5T521-519q30 3 50.5 12.5T613-477Z"/></svg>
\ No newline at end of file diff --git a/assets/icons/new/splitting.svg b/assets/icons/new/splitting.svg new file mode 100644 index 0000000..74cda1d --- /dev/null +++ b/assets/icons/new/splitting.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M596.817-220Q556-220 528-248.183q-28-28.183-28-69T528.183-386q28.183-28 69-28T666-385.817q28 28.183 28 69T665.817-248q-28.183 28-69 28ZM180-80q-24 0-42-18t-18-42v-620q0-24 18-42t42-18h65v-60h65v60h340v-60h65v60h65q24 0 42 18t18 42v620q0 24-18 42t-42 18H180Zm0-60h600v-430H180v430Zm0-490h600v-130H180v130Zm0 0v-130 130Z"/></svg>
\ No newline at end of file diff --git a/assets/icons/new/wakeup.svg b/assets/icons/new/wakeup.svg new file mode 100644 index 0000000..08cf946 --- /dev/null +++ b/assets/icons/new/wakeup.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M80-200v-255q0-25 10-47t30-36v-116q0-45 30.5-75.5T226-760h180q22 0 41 10t33 27q14-17 32.5-27t40.5-10h180q45 0 76 30.5t31 75.5v116q20 14 30 36t10 47v255h-60v-80H140v80H80Zm430-355h270v-99q0-20-13.5-33T733-700H550q-17 0-28.5 14T510-654v99Zm-330 0h270v-99q0-18-11.5-32T410-700H226q-19 0-32.5 13.5T180-654v99Zm-40 215h680v-115q0-17-11.5-28.5T780-495H180q-17 0-28.5 11.5T140-455v115Zm680 0H140h680Z"/></svg>
\ No newline at end of file diff --git a/assets/logo/newlogo-ng.png b/assets/logo/newlogo-ng.png Binary files differnew file mode 100644 index 0000000..78f7bc8 --- /dev/null +++ b/assets/logo/newlogo-ng.png diff --git a/assets/species/deer-plush.png b/assets/species/deer-plush.png Binary files differnew file mode 100644 index 0000000..d43fa35 --- /dev/null +++ b/assets/species/deer-plush.png diff --git a/assets/species/deer-robot.png b/assets/species/deer-robot.png Binary files differnew file mode 100644 index 0000000..d43fa35 --- /dev/null +++ b/assets/species/deer-robot.png diff --git a/assets/species/deer.png b/assets/species/deer.png Binary files differnew file mode 100644 index 0000000..d43fa35 --- /dev/null +++ b/assets/species/deer.png diff --git a/includes/components/2023ui.inc b/includes/components/2023ui.inc index 556a8b5..81022d5 100644 --- a/includes/components/2023ui.inc +++ b/includes/components/2023ui.inc @@ -2,7 +2,7 @@ <div style="display: grid; grid-template-columns: max-content 1fr;"> <div style="height: 52px; display: flex; align-items: center;"> <a href="/" style="color: inherit; text-decoration: inherit;"> - <img src="/assets/logo/newlogo.png" style="width: 32px;"> + <img src="/assets/logo/newlogo-ng.png" style="width: 32px;"> <span style="margin-left: 5px; vertical-align: middle; position: relative; top: -1px; font-weight: bold;">Cold Haze</span> <span data-bs-toggle="tooltip" data-bs-placement="bottom" title="This is the new Cold Haze experience and it is currently experimental" class="badge bg-warning" style="margin-left: 5px; vertical-align: middle; position: relative; top: -1px; font-weight: bold;">Beta</span> </a> diff --git a/includes/components/header.inc b/includes/components/header.inc index 0fa60ae..fdae55a 100644 --- a/includes/components/header.inc +++ b/includes/components/header.inc @@ -70,7 +70,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/functions.inc"; <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet"> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script> <title><?= $title && $title !== "-" ? $title . " · " : "" ?>Cold Haze</title> - <link rel="shortcut icon" href="/assets/logo/newlogo<?= $isLoggedIn || $isLowerLoggedIn ? "3" : "" ?>.png" type="image/png"> + <link rel="shortcut icon" href="/assets/logo/<?php if ($use2023UI): ?>newlogo-ng<?php else: ?>newlogo<?= $isLoggedIn || $isLowerLoggedIn ? "3" : "" ?><?php endif; ?>.png" type="image/png"> <link href="/assets/logo/light<?= $use2023UI ? "-2023" : "" ?>.css" rel="stylesheet"> </head> <body<?php if (!$use2023UI): ?> style="background-color: #000;"<?php else: ?> style="background-color: var(--palette-1);"<?php endif; ?>> diff --git a/includes/components/pleasure.inc b/includes/components/pleasure.inc index 0939228..b9f9cd0 100644 --- a/includes/components/pleasure.inc +++ b/includes/components/pleasure.inc @@ -1,6 +1,6 @@ <?php global $app; global $_PROFILE; $front = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/gdapd/fronters.json"), true)["members"]; ?> -<h2>Sex alert +<h2>Pleasure alert <details style="display: inline-block;font-size:12px;"> <summary class="text-muted" style="opacity:.5;"></summary> <label><input id="test-mode" type="checkbox"> Test Mode</label> · <label><input id="fake-requests" type="checkbox"> Fake Requests</label> @@ -9,7 +9,7 @@ <?php if ($_PROFILE["login"] === "cloudburst"): ?> <div class="alert alert-danger"> - <b>Notice:</b> Only <?= $app["other"]["name"] ?> can use the sex alert. If you wish to wake somepony up, use the <a href="/-/wakeup" style="filter: invert(1) hue-rotate(180deg);">wake-up alert</a> instead. + <b>Notice:</b> Only <?= $app["other"]["name"] ?> can use the pleasure alert. If you wish to wake somepony up, use the <a href="/-/wakeup" style="filter: invert(1) hue-rotate(180deg);">wake-up alert</a> instead. </div> <?php endif; ?> @@ -45,43 +45,9 @@ <?php endif; ?> <?php endif; ?> -<?php - -$school = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/school.json"), true); - -if ((int)date('G') > 19) { - $day = date('Y-m-d', time() + 86400); -} else { - $day = date('Y-m-d'); -} - -if (isset($school[$day]) && $school[$day]["firstClass"]["timestamp"] < time() * 1000) { - $day = date('Y-m-d', time() + 86400); -} - -if (!isset($school[$day])) { - echo('<div class="alert alert-secondary">No information about Raindrops\'s school schedule for ' . date('F jS', strtotime($day)) . ' currently, try again later.</div>'); -} elseif (isset($school[$day]["firstClass"]["timestamp"])) { - $tod = round($school[$day]["firstClass"]["timestamp"] / 1000) - strtotime($day); - $hours = $tod / 3600; - $time = date('g:i a', $tod); - - if ($hours < 8.5) { - echo('<div class="alert alert-danger">Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), it is recommended that you don\'t wake them up to have sex.</div>'); - } else if ($hours < 9.5) { - echo('<div class="alert alert-warning">Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for at most an hour.</div>'); - } else { - echo('<div class="alert alert-success">Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for over an hour.</div>'); - } -} else { - echo('<div class="alert alert-success">Raindrops does not have school tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for as long as you wish.</div>'); -} - -?> - <span data-bs-toggle="modal" <?php if ($_PROFILE["login"] === "cloudburst"): ?>class="disabled"<?php endif; ?> data-bs-target="#turn-on" id="btn-on" style="background: #7f0000;font-size: 48px;padding: 10px 50px;border-radius: 10px;width: max-content;display: block;margin-left: auto;margin-right: auto;cursor: pointer;">Turn <b>ON</b></span> <span onclick="disableAlert()" id="btn-off" style="display:none;background: #007f0b;font-size: 48px;padding: 10px 50px;border-radius: 10px;width: max-content;margin-left: auto;margin-right: auto;cursor: pointer;">Turn <b>OFF</b></span> -<p style="text-align:center;margin-top:10px;">Sending next notification <b><span id="next-notification">never</span></b> · Local time for Raindrops: <span id="raindrops-time">--:--</span><br>Make sure you run the <code>/sex</code> command on the server before turning the alert on.</p> +<p style="text-align:center;margin-top:10px;">Sending next notification <b><span id="next-notification">never</span></b> · Local time for Raindrops: <span id="raindrops-time">--:--</span></p> <script> function updateTime() { diff --git a/includes/fragments/metadata.inc b/includes/fragments/metadata.inc index 69ea5a3..430f117 100644 --- a/includes/fragments/metadata.inc +++ b/includes/fragments/metadata.inc @@ -92,6 +92,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $member <option <?= $metadata["species"][0] === "crystal" ? "selected" : "" ?> value="crystal">Crystal pony</option> <option <?= $metadata["species"][0] === "changeling" ? "selected" : "" ?> value="changeling">Changeling</option> <option <?= $metadata["species"][0] === "merpony" ? "selected" : "" ?> value="merpony">Merpony</option> + <option <?= $metadata["species"][0] === "deer" ? "selected" : "" ?> value="deer">Deer</option> <option <?= $metadata["species"][0] === "kirin" ? "selected" : "" ?> value="kirin">Kirin</option> <option <?= $metadata["species"][0] === "human" ? "selected" : "" ?> value="human">Human</option> </select> @@ -105,6 +106,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/includes/data/metadata/" . $member <option <?= ($metadata["species"][1] ?? "") === "crystal" ? "selected" : "" ?> value="crystal">Crystal pony</option> <option <?= ($metadata["species"][1] ?? "") === "changeling" ? "selected" : "" ?> value="changeling">Changeling</option> <option <?= ($metadata["species"][1] ?? "") === "merpony" ? "selected" : "" ?> value="merpony">Merpony</option> + <option <?= ($metadata["species"][1] ?? "") === "deer" ? "selected" : "" ?> value="deer">Deer</option> <option <?= ($metadata["species"][1] ?? "") === "kirin" ? "selected" : "" ?> value="kirin">Kirin</option> <option <?= ($metadata["species"][1] ?? "") === "human" ? "selected" : "" ?> value="human">Human</option> </select> diff --git a/includes/pages.json b/includes/pages.json index fd4aae1..72a04e8 100644 --- a/includes/pages.json +++ b/includes/pages.json @@ -141,7 +141,7 @@ }, "pleasure": { "name": { - "en": "Sex alert" + "en": "Pleasure alert" }, "admin": true, "limited": true diff --git a/includes/util/banner.inc b/includes/util/banner.inc index 63e30c6..aca1edb 100644 --- a/includes/util/banner.inc +++ b/includes/util/banner.inc @@ -135,6 +135,7 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { "changeling" => "Changelin", "merpony" => "Poney sirène", "kirin" => "Kirin", + "deer" => "Deer", default => $species . "_" . $metadata["robot"] }; } else { @@ -149,6 +150,7 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { "human" => "Human", "merpony" => "Merpony", "kirin" => "Kirin", + "deer" => "Deer", default => $species . "_" . $metadata["robot"] }; } 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> |