UI Improvements and TV mode
This commit is contained in:
+97
-43
@@ -9,33 +9,72 @@
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
||||
<link rel="stylesheet" href="assets/css/style.css">
|
||||
</head>
|
||||
<body class="family-hub-body" style="--person-accent: <?= htmlspecialchars($favoriteColor ?? '#4a90e2', ENT_QUOTES, 'UTF-8') ?>;">
|
||||
<header class="app-header text-white p-3 mb-0">
|
||||
<body class="family-hub-body <?= htmlspecialchars($headerThemeClass ?? 'header-tone-dark', ENT_QUOTES, 'UTF-8') ?>" style="--person-accent: <?= htmlspecialchars($favoriteColor ?? '#4a90e2', ENT_QUOTES, 'UTF-8') ?>;">
|
||||
<?php $hideTopHeader = !empty($isCalendarTvView); ?>
|
||||
<?php if (!$hideTopHeader): ?>
|
||||
<header class="app-header app-header-with-tabs text-white pt-3 px-3 pb-2 mb-0">
|
||||
<div class="container">
|
||||
<div class="d-flex flex-column flex-md-row align-items-start align-items-md-center justify-content-between gap-3">
|
||||
<h1 class="h3 mb-0">Family Hub</h1>
|
||||
<div class="d-flex flex-column align-items-start align-items-md-end gap-2 ms-md-auto">
|
||||
<?php
|
||||
$hdrSym = trim((string) ($familySettings['currency_symbol'] ?? '★'));
|
||||
$hdrName = trim((string) ($familySettings['currency_name'] ?? ''));
|
||||
$hdrBal = 0.0;
|
||||
if ($activePerson !== null) {
|
||||
$hdrBal = is_numeric($activePerson['currency_balance'] ?? null)
|
||||
? (float) $activePerson['currency_balance']
|
||||
: 0.0;
|
||||
}
|
||||
?>
|
||||
<?php if ($activePerson !== null && count($people) > 0): ?>
|
||||
<div class="user-balance badge rounded-pill bg-light text-dark px-3 py-2 text-wrap text-start" title="Current balance for the selected profile">
|
||||
<span class="text-muted small">Balance</span><br>
|
||||
<strong class="fs-6"><?= htmlspecialchars(number_format($hdrBal, 2, '.', ''), ENT_QUOTES, 'UTF-8') ?></strong>
|
||||
<span class="ms-1"><?= htmlspecialchars($hdrSym, ENT_QUOTES, 'UTF-8') ?><?php if ($hdrName !== ''): ?><span class="text-muted small"> <?= htmlspecialchars($hdrName, ENT_QUOTES, 'UTF-8') ?></span><?php endif; ?></span>
|
||||
<?php
|
||||
$hdrSym = trim((string) ($familySettings['currency_symbol'] ?? '★'));
|
||||
$hdrName = trim((string) ($familySettings['currency_name'] ?? ''));
|
||||
$hdrBal = 0.0;
|
||||
if ($activePerson !== null) {
|
||||
$hdrBal = is_numeric($activePerson['currency_balance'] ?? null)
|
||||
? (float) $activePerson['currency_balance']
|
||||
: 0.0;
|
||||
}
|
||||
?>
|
||||
<div class="app-header-top">
|
||||
<h1 class="h3 mb-0 app-header-brand">Family Hub</h1>
|
||||
<div class="app-header-actions d-flex align-items-center gap-2 flex-wrap justify-content-end">
|
||||
<?php if (count($people) === 0): ?>
|
||||
<span class="small opacity-75 text-end">Add people in Family settings.</span>
|
||||
<?php else: ?>
|
||||
<?php if ($activePerson !== null): ?>
|
||||
<div class="user-balance app-header-balance badge rounded-pill bg-light text-dark px-3 py-2 text-wrap text-start" title="Current balance for the selected profile">
|
||||
<span class="text-muted small">Balance</span><br>
|
||||
<strong class="fs-6"><?= htmlspecialchars(number_format($hdrBal, 2, '.', ''), ENT_QUOTES, 'UTF-8') ?></strong>
|
||||
<span class="ms-1"><?= htmlspecialchars($hdrSym, ENT_QUOTES, 'UTF-8') ?><?php if ($hdrName !== ''): ?><span class="text-muted small"> <?= htmlspecialchars($hdrName, ENT_QUOTES, 'UTF-8') ?></span><?php endif; ?></span>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<div class="persona-switcher d-none d-md-flex flex-wrap gap-2 align-items-center justify-content-end" role="toolbar" aria-label="Who is using the hub">
|
||||
<?php foreach ($people as $p): ?>
|
||||
<?php
|
||||
$pid = $p['id'] ?? '';
|
||||
$pname = $p['name'] ?? 'Unknown';
|
||||
$isActive = $activePerson && ($activePerson['id'] ?? '') === $pid;
|
||||
$needsPin = personRequiresPinToActivate($p) ? '1' : '0';
|
||||
$roleLabel = $p['role'] ?? '';
|
||||
?>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm persona-chip <?= $isActive ? 'btn-light active' : 'btn-outline-light' ?>"
|
||||
data-person-id="<?= htmlspecialchars($pid, ENT_QUOTES, 'UTF-8') ?>"
|
||||
data-needs-pin="<?= $needsPin ?>"
|
||||
data-person-name="<?= htmlspecialchars($pname, ENT_QUOTES, 'UTF-8') ?>"
|
||||
>
|
||||
<?= sanitizeInput($pname) ?>
|
||||
<?php if ($roleLabel === ROLE_HEAD): ?>
|
||||
<span class="visually-hidden">(Head of household)</span>
|
||||
<i class="fa fa-house-chimney-user ms-1" aria-hidden="true"></i>
|
||||
<?php elseif ($roleLabel === ROLE_ADULT): ?>
|
||||
<i class="fa fa-person ms-1" aria-hidden="true"></i>
|
||||
<?php elseif ($roleLabel === ROLE_CHILD): ?>
|
||||
<i class="fa fa-child ms-1" aria-hidden="true"></i>
|
||||
<?php endif; ?>
|
||||
</button>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<div class="persona-switcher d-flex flex-wrap gap-2 align-items-center" role="toolbar" aria-label="Who is using the hub">
|
||||
<?php if (count($people) === 0): ?>
|
||||
<span class="small opacity-75">Add people in Family settings.</span>
|
||||
<?php else: ?>
|
||||
</div>
|
||||
|
||||
<?php if (count($people) > 0): ?>
|
||||
<div class="dropdown d-md-none app-header-persona-mobile">
|
||||
<button class="btn btn-light btn-sm dropdown-toggle w-100 text-start" type="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="fa fa-user-group me-1" aria-hidden="true"></i>
|
||||
<?= $activePerson !== null ? sanitizeInput((string) ($activePerson['name'] ?? 'Select family member')) : 'Select family member' ?>
|
||||
</button>
|
||||
<ul class="dropdown-menu w-100">
|
||||
<?php foreach ($people as $p): ?>
|
||||
<?php
|
||||
$pid = $p['id'] ?? '';
|
||||
@@ -44,30 +83,45 @@
|
||||
$needsPin = personRequiresPinToActivate($p) ? '1' : '0';
|
||||
$roleLabel = $p['role'] ?? '';
|
||||
?>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm persona-chip <?= $isActive ? 'btn-light active' : 'btn-outline-light' ?>"
|
||||
data-person-id="<?= htmlspecialchars($pid, ENT_QUOTES, 'UTF-8') ?>"
|
||||
data-needs-pin="<?= $needsPin ?>"
|
||||
data-person-name="<?= htmlspecialchars($pname, ENT_QUOTES, 'UTF-8') ?>"
|
||||
>
|
||||
<?= sanitizeInput($pname) ?>
|
||||
<?php if ($roleLabel === ROLE_HEAD): ?>
|
||||
<span class="visually-hidden">(Head of household)</span>
|
||||
<i class="fa fa-house-chimney-user ms-1" aria-hidden="true"></i>
|
||||
<?php elseif ($roleLabel === ROLE_ADULT): ?>
|
||||
<i class="fa fa-person ms-1" aria-hidden="true"></i>
|
||||
<?php elseif ($roleLabel === ROLE_CHILD): ?>
|
||||
<i class="fa fa-child ms-1" aria-hidden="true"></i>
|
||||
<?php endif; ?>
|
||||
</button>
|
||||
<li>
|
||||
<button
|
||||
type="button"
|
||||
class="dropdown-item persona-chip persona-chip-mobile <?= $isActive ? 'active' : '' ?>"
|
||||
data-person-id="<?= htmlspecialchars($pid, ENT_QUOTES, 'UTF-8') ?>"
|
||||
data-needs-pin="<?= $needsPin ?>"
|
||||
data-person-name="<?= htmlspecialchars($pname, ENT_QUOTES, 'UTF-8') ?>"
|
||||
>
|
||||
<?= sanitizeInput($pname) ?>
|
||||
<?php if ($roleLabel === ROLE_HEAD): ?>
|
||||
<i class="fa fa-house-chimney-user ms-1" aria-hidden="true"></i>
|
||||
<?php elseif ($roleLabel === ROLE_ADULT): ?>
|
||||
<i class="fa fa-person ms-1" aria-hidden="true"></i>
|
||||
<?php elseif ($roleLabel === ROLE_CHILD): ?>
|
||||
<i class="fa fa-child ms-1" aria-hidden="true"></i>
|
||||
<?php endif; ?>
|
||||
</button>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php
|
||||
$_nav = isset($navTabs) && is_array($navTabs) && $navTabs !== [] ? $navTabs : ($TABS ?? []);
|
||||
?>
|
||||
<?php if ($_nav !== []): ?>
|
||||
<nav class="tabs" aria-label="Sections">
|
||||
<?php foreach ($_nav as $tabId => $tab): ?>
|
||||
<a href="?tab=<?= htmlspecialchars($tabId, ENT_QUOTES, 'UTF-8') ?>" class="tab <?= ($activeTab ?? '') === $tabId ? 'active' : '' ?>">
|
||||
<i class="fa fa-<?= htmlspecialchars($tab['icon'], ENT_QUOTES, 'UTF-8') ?>" aria-hidden="true"></i>
|
||||
<span><?= htmlspecialchars($tab['title'], ENT_QUOTES, 'UTF-8') ?></span>
|
||||
</a>
|
||||
<?php endforeach; ?>
|
||||
</nav>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</header>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="modal fade" id="hohPinModal" tabindex="-1" aria-labelledby="hohPinModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
|
||||
@@ -57,6 +57,18 @@ function personRequiresPinToActivate(?array $person): bool {
|
||||
return ($person['role'] ?? '') === ROLE_HEAD && !empty($person['pin_hash']);
|
||||
}
|
||||
|
||||
/**
|
||||
* True when at least one person is recorded as Head of household (setup complete).
|
||||
*/
|
||||
function familyHubHasHeadOfHousehold(array $people): bool {
|
||||
foreach ($people as $p) {
|
||||
if (($p['role'] ?? '') === ROLE_HEAD) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function assertHoHCanManagePeople(array $people): void {
|
||||
if (count($people) === 0) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user