From 6679588e43b0f694421d48e4ddb071972a127dca Mon Sep 17 00:00:00 2001
From: RaindropsSys <contact@minteck.org>
Date: Sun, 11 Jun 2023 16:47:34 +0200
Subject: Updated 11 files and added 2 files (automated)

---
 includes/components/navigation.inc | 14 +++++++++++---
 includes/components/planner.inc    |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'includes/components')

diff --git a/includes/components/navigation.inc b/includes/components/navigation.inc
index 478420d..4d0cc5e 100644
--- a/includes/components/navigation.inc
+++ b/includes/components/navigation.inc
@@ -118,13 +118,21 @@ $navigation_admin = [
             "minimal" => false,
             "items" => [
                 time() >= 1686787200 ? null : [
-                    "name" => $pages["fronting"]["name"][$lang["_name"]],
+                    "name" => "Front planner<span class='badge bg-warning text-black rounded-pill' style='position:relative;top:-1px; margin-left: 5px;'>EOL</span>",
                     "icon" => "/assets/icons/fronting.svg",
                     "invert" => true,
                     "link" => "/-/fronting",
                     "stepped" => null,
                     "private" => false
                 ],
+                [
+                    "name" => $pages["evening"]["name"][$lang["_name"]] . (time() >= 1686787200 ? "" : "<span class='badge bg-info text-black rounded-pill' style='position:relative;top:-1px; margin-left: 5px;'>Beta</span>"),
+                    "icon" => "/assets/icons/evening.svg",
+                    "invert" => true,
+                    "link" => "/-/evening",
+                    "stepped" => null,
+                    "private" => false
+                ],
                 [
                     "name" => $pages["profiles"]["name"][$lang["_name"]],
                     "icon" => "/assets/icons/profiles.svg",
@@ -173,8 +181,8 @@ $navigation_admin = [
                     "stepped" => null,
                     "private" => true
                 ],
-                [
-                    "name" => $pages["computers"]["name"][$lang["_name"]] . "<span class='badge bg-warning text-black rounded-pill' style='position:relative;top:-1px; margin-left: 5px;'>EOL</span>",
+                time() >= 1688169600 ? null : [
+                    "name" => "Devices<span class='badge bg-warning text-black rounded-pill' style='position:relative;top:-1px; margin-left: 5px;'>EOL</span>",
                     "icon" => "/assets/icons/computers.svg",
                     "invert" => true,
                     "link" => "/-/computers",
diff --git a/includes/components/planner.inc b/includes/components/planner.inc
index b5fc7a5..9385b67 100644
--- a/includes/components/planner.inc
+++ b/includes/components/planner.inc
@@ -577,7 +577,7 @@
                 if (fronting[system][date][id][0] === "lzlaq" || fronting[system][date][id][0] === "irxyh") {
                     document.getElementById("edit-fronter-name").innerText = "merged members";
                 } else {
-                    document.getElementById("edit-fronter-name").innerText = names[fronting[system][date][id][0]] ?? fronting[system][date][id][0];
+                    document.getElementById("edit-fronter-name").innerText = names[fronting[system][date][id][0]] ?? fronting[system][date][id][0] + " [" + fronting[system][date][id][0] + "]";
                 }
 
                 document.getElementById("edit-fronter-date").innerText = display;
@@ -863,7 +863,7 @@
                         <div id="list">
                             <div class="list-group">
                                 <?php foreach (array_filter(scoreOrderGlobal(), function ($i) { return $i["system"] === "gdapd" || $i["system"] === "ynmuc"; }) as $member): ?>
-                                    <a id="list-pony-<?= $member['id'] ?>" onclick="confirmFronterAdd(window.addSystem, '<?= $member['id'] ?>');" class="new-fronter-link list-group-item list-group-item-action"><img src="<?= getAsset($member["system"], $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?><peh-schedule-add></peh-schedule-add></a>
+                                    <a id="list-pony-<?= $member['id'] ?>" onclick="confirmFronterAdd(window.addSystem, '<?= $member['id'] ?>');" class="new-fronter-link list-group-item list-group-item-action"><img src="<?= getAsset($member["system"], $member["id"], "heads") ?>" style="width:24px;"> <?= $member["display_name"] ?? $member["name"] ?> [<?= $member["id"] ?>]<peh-schedule-add></peh-schedule-add></a>
                                 <?php endforeach; $member = getSystemMember("gdapd", "irxyh") ?>
                                 <a id="list-pony-irxyh" onclick="confirmFronterAdd(window.addSystem, 'irxyh');" class="new-fronter-link list-group-item list-group-item-action"><img src="/assets/logo/newlogo3.png" style="filter:grayscale(1);width:24px;"> <span style="opacity:.75">Multiple merged members</span></a>
                                 <a id="list-pony-zdtsg" onclick="confirmFronterAdd(window.addSystem, 'zdtsg');" class="new-fronter-link list-group-item list-group-item-action"><img src="/assets/logo/newlogo3.png" style="filter:grayscale(1);width:24px;"> <span style="opacity:.75">Other/unknown</span></a>
-- 
cgit