diff options
| author | RaindropsSys <contact@minteck.org> | 2023-03-27 22:22:53 +0200 |
|---|---|---|
| committer | RaindropsSys <contact@minteck.org> | 2023-03-27 22:22:53 +0200 |
| commit | e98e95d89939cdc1252d02df04ae8d91c6aa8c92 (patch) | |
| tree | a5d5535f8058f1a7b45a31a1caf36ab7e24ff19d /includes/components | |
| parent | 6ab243c12f2514cd0f40e80504223664755a6da4 (diff) | |
| download | pluralconnect-e98e95d89939cdc1252d02df04ae8d91c6aa8c92.tar.gz pluralconnect-e98e95d89939cdc1252d02df04ae8d91c6aa8c92.tar.bz2 pluralconnect-e98e95d89939cdc1252d02df04ae8d91c6aa8c92.zip | |
Updated 9 files, added 9 files, deleted 3 files and renamed includes/refresh/logo.inc (automated)
Diffstat (limited to 'includes/components')
| -rw-r--r-- | includes/components/footer.inc | 3 | ||||
| -rw-r--r-- | includes/components/planner.inc | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/includes/components/footer.inc b/includes/components/footer.inc index 2cef58f..d75b480 100644 --- a/includes/components/footer.inc +++ b/includes/components/footer.inc @@ -17,8 +17,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/functions.inc"; global $lang; global $pages; ?> - © <?= date("Y") ?> <a href="https://equestria.horse" target="_blank" class="text-muted"><?= $lang["footer"]["copyright"] ?></a> · build <?= $version["build"] ?>.<?= $version["revision"] ?><br> - <a class="debug-outer text-muted" style="text-decoration: none;"><?= $lang["footer"]["update"] ?> <?= trim(timeAgo($refresh["timestamp"], $lang["_french"])) ?><span class="debug-hidden"> (<?php if (time() - $refresh["timestamp"] > 360): ?><?= $lang["footer"]["no_update"] ?><?= $lang["footer"]["separator"] ?>; <?php endif; ?><?= date('D j M, G:i:s T', (int)$refresh["timestamp"]) ?><?= $lang["footer"]["separator"] ?>; <?= $lang["footer"]["took"] ?> <?= round($refresh["duration"]) ?> sec)</span></a> + © <?= date("Y") ?> <a href="https://equestria.horse" target="_blank" class="text-muted"><?= $lang["footer"]["copyright"] ?></a> · build <?= $version["build"] ?>.<?= $version["revision"] ?> <br><br><br><br><br> </div> </div> diff --git a/includes/components/planner.inc b/includes/components/planner.inc index a7ec44f..9be9cb7 100644 --- a/includes/components/planner.inc +++ b/includes/components/planner.inc @@ -122,11 +122,11 @@ function school($time, $first = false) { if (isset($school[$day])) { if (isset($school[$day]["wakeUp"]["timestamp"])) { - $parts[] = "waking up at " . formatTime($school[$day]["wakeUp"][$_PROFILE["login"]]) . " (your time)"; + $parts[] = "waking up at " . formatTime($school[$day]["wakeUp"][$_PROFILE["login"]]); } if (isset($school[$day]["sleep"]["timestamp"])) { - $parts[] = "sleeping at " . formatTime($school[$day]["sleep"][$_PROFILE["login"]]) . " (your time)"; + $parts[] = "sleeping at " . formatTime($school[$day]["sleep"][$_PROFILE["login"]]); } } @@ -136,7 +136,7 @@ function school($time, $first = false) { if ($first) { return ucfirst(implode(", ", $parts)); } else { - return " · " . implode(", ", $parts); + return "<br>" . ucfirst(implode(", ", $parts)); } } else { if ($first) { @@ -278,7 +278,7 @@ function day($display, $diff): void { if ($diff < 0) $disabled = true; else $dis <td colspan="10" style="padding: 0;border:none;"> <div style="padding: 5px 10px;border: 1px solid #404040;margin:-1px;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;"> <?php if (count($dayCloudburst) > 0 && count($dayRaindrops) > 0): ?> - <?= getMiniName(getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["name"]) ?> will sleep with <?= getMiniName(getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["name"]) ?><?= school(time() + 86400 * $diff, false) ?> + <?= getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayCloudburst[count($dayCloudburst) - 1][0])["name"] ?> will sleep with <?= getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["display_name"] ?? getMemberWithoutSystem($dayRaindrops[count($dayRaindrops) - 1][0])["name"] ?><?= school(time() + 86400 * $diff, false) ?> <?php else: ?> <?= school(time() + 86400 * $diff, true) ?> <?php endif; ?> |