From 39a288eb0f225a4d97e672f32a3c2c5e9c62a26b Mon Sep 17 00:00:00 2001 From: Minteck Date: Sun, 18 Dec 2022 15:35:37 +0100 Subject: Update --- includes/banner.inc | 4 +- includes/bitset.inc | 3 + includes/functions.inc | 2 +- includes/header.inc | 675 +------------------------------------------- includes/sysbanner.inc | 2 +- includes/system/species.inc | 15 +- 6 files changed, 18 insertions(+), 683 deletions(-) (limited to 'includes') diff --git a/includes/banner.inc b/includes/banner.inc index d62ba97..4678a5a 100644 --- a/includes/banner.inc +++ b/includes/banner.inc @@ -151,6 +151,7 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { "pegasus" => $metadata["robot"] ? "Robot pégase" : (!$metadata["plush"] ? "Pégase" : "Pégase en peluche"), "batpony" => $metadata["robot"] ? "Robot Poney chauve souris" : (!$metadata["plush"] ? "Poney chauve souris" : "Poney chauve souris en peluche"), "unicorn" => $metadata["robot"] ? "Robot licorne" : (!$metadata["plush"] ? "Licorne" : "Licorne en peluche"), + "changeling" => "Changelin", default => $species . "_" . $metadata["robot"] }; } else { @@ -161,6 +162,7 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { "pegasus" => $metadata["robot"] ? "Robot pegasus" : (!$metadata["plush"] ? "Pegasus" : "Pegasus plush"), "batpony" => $metadata["robot"] ? "Robot bat pony" : (!$metadata["plush"] ? "Bat pony" : "Bat pony plush"), "unicorn" => $metadata["robot"] ? "Robot unicorn" : (!$metadata["plush"] ? "Unicorn" : "Unicorn plush"), + "changeling" => "Changeling", default => $species . "_" . $metadata["robot"] }; } @@ -483,7 +485,7 @@ function getMemberBannerData(string $id, string $system, bool $french = false) { 'name' => $member["display_name"] ?? $member["name"], 'badges' => $badges, 'prefixes' => $prefixes, - 'pronouns' => getTooltipsFromMark($member["pronouns"], $french) ?? "she/her", + 'pronouns' => getTooltipsFromMark($member["pronouns"], $french) ?? "they/them", 'pronouns_usage' => getMemberPronouns($member['pronouns']), 'last_fronted' => $lastFronted, 'species' => $speciesList, diff --git a/includes/bitset.inc b/includes/bitset.inc index 0bd5c4d..7d5a963 100644 --- a/includes/bitset.inc +++ b/includes/bitset.inc @@ -33,6 +33,7 @@ function parseBitset ($bitset) { "0100" => "alicorn", "0101" => "batpony", "0110" => "crystal", + "0111" => "changeling", default => null, }; @@ -43,6 +44,7 @@ function parseBitset ($bitset) { "0100" => "alicorn", "0101" => "batpony", "0110" => "crystal", + "0111" => "changeling", default => null, }; @@ -53,6 +55,7 @@ function parseBitset ($bitset) { "0100" => "alicorn", "0101" => "batpony", "0110" => "crystal", + "0111" => "changeling", default => null, }; diff --git a/includes/functions.inc b/includes/functions.inc index cc94f11..915d41b 100644 --- a/includes/functions.inc +++ b/includes/functions.inc @@ -254,7 +254,7 @@ if (!function_exists("showMembersFromList")) { function showMembersFromList(array $list) { foreach ($list as $member) { if ($member['name'] !== "unknown" && $member['name'] !== "fusion") { echo(' -
+
' . ($member['display_name'] ?? $member['name']) . '
' . (isset($member['travelling']) && $member['travelling'] ? "+" . ($member['proxy_tags'][0]['prefix'] ?? " ") : ($member['proxy_tags'][0]['prefix'] ?? " ")) . '
diff --git a/includes/header.inc b/includes/header.inc index d338f78..ede6a29 100644 --- a/includes/header.inc +++ b/includes/header.inc @@ -62,6 +62,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/ical/main.php"; + <?= $title ? $title . " · " : "" ?>Cold Haze @@ -86,680 +87,6 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/ical/main.php"; - id="admin-page"> diff --git a/includes/sysbanner.inc b/includes/sysbanner.inc index 5c85a20..bafb10d 100644 --- a/includes/sysbanner.inc +++ b/includes/sysbanner.inc @@ -115,7 +115,7 @@ $pages = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/pa
- " data-bs-toggle="tooltip" style="display:inline-block;padding:5px 10px;text-align: center" class="system-action tooltip-nohelp" href="//-/species"> + " data-bs-toggle="tooltip" style="display:inline-block;padding:5px 10px;text-align: center" class="system-action tooltip-nohelp" href="//-/species"> diff --git a/includes/system/species.inc b/includes/system/species.inc index 45a0178..41b06fe 100644 --- a/includes/system/species.inc +++ b/includes/system/species.inc @@ -45,15 +45,17 @@ function species(array $members, string $id, string $name) { global $systemID; g $alicorn = []; $batpony = []; $crystal = []; + $changeling = []; foreach ($members as $member) { foreach ($member["_metadata"]["species"] as $species) { - if ($species === "earth") $earth[] = $member; - if ($species === "pegasus") $pegasus[] = $member; - if ($species === "unicorn") $unicorn[] = $member; - if ($species === "alicorn") $alicorn[] = $member; - if ($species === "batpony") $batpony[] = $member; - if ($species === "crystal") $crystal[] = $member; + if ($species === "earth") $earth[] = $member; + if ($species === "pegasus") $pegasus[] = $member; + if ($species === "unicorn") $unicorn[] = $member; + if ($species === "alicorn") $alicorn[] = $member; + if ($species === "batpony") $batpony[] = $member; + if ($species === "crystal") $crystal[] = $member; + if ($species === "changeling") $changeling[] = $member; } } @@ -65,6 +67,7 @@ function species(array $members, string $id, string $name) { global $systemID; g +
\ No newline at end of file -- cgit