fs
6e3fc63c1d
Replace the single tenant avatar with a pair of theme-scoped brand logos.
Render only the theme-matching <img> server-side and swap src on theme
toggle via a JS hook — no reload, no double request, no CSS tricks.
Tenant logos
- TenantLogoService (ImageUploadTrait) with theme whitelist and per-theme
storage storage/tenants/{uuid}/logo/{light|dark}/, SIZES 128/256/512
- Public serving endpoint auth/tenant-logo-file so login can show the
logo pre-auth; matching authenticated admin preview endpoint
- appTenantLogoUrl(?size, ?theme) with 4-step fallback cascade; PDF +
mail always request 'light'
- Admin tenant edit: avatar block replaced by "Tenant logos" details
block inside the Master-data tab, two side-by-side slots via Pico
.grid with the core app-file-upload partial
- Policy rename ABILITY_ADMIN_TENANTS_AVATAR_VIEW -> LOGO_VIEW, action
routes logo / logo-delete / logo-file with theme body/query param
- API endpoint path kept (backward compat), internals on new service
- CLI tenant:logo-migrate-avatars moves legacy avatar/ -> logo/light/
idempotently (--dry-run, --yes, --cleanup)
- i18n "Tenant image" removed, 12 new keys synced across de/en
File upload component
- Full-width preview + filename/actions below (3D stack layout)
- Fixed 16:9 aspect ratio with 1rem inner padding for consistent
preview size across any logo aspect
- Transparency checker pattern as background so black logos stay
visible on dark mode and white logos on light mode
- form="" + deleteFormId support so the partial works with barrier
forms inside another form
Buttons
- width:100% dropped from button[type="submit"]; scoped back via
.login-main for the auth-flow primary CTA
- .outline base rule now tints background via color-mix of --app-color
so secondary/primary/danger outlines all gain a subtle surface
- .outline.secondary restyled Stripe-style in both themes: solid white
chip with soft shadow in light, solid elevated dark chip with white
text in dark; neutral border replaces role-colored border
- .app-action-success/.app-action-danger outlines get color-mix bg +
theme-aware outline-text tokens for stronger contrast
- Filled .primary/.app-action-success/.app-action-danger get raised
box-shadow (inset highlight + drop) — opt-in via class so chrome
buttons stay flat
- Dropped the legacy .secondary utility that was clobbering the
custom-property cascade with a hardcoded muted color
Theme swap
- Logo img carries data-src-light + data-src-dark; theme-toggle JS
swaps src when data-theme changes, keeping the topbar/login logo in
sync without a page reload
Quality gates: PHPUnit (2045), PHPStan L5, CS-Fixer, docs link/drift,
codex skills sync — all green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
85 lines
4.9 KiB
PHTML
85 lines
4.9 KiB
PHTML
<?php
|
|
|
|
/**
|
|
* Shared file-upload component — card-based dropzone with drag-and-drop, current file preview, and pending preview.
|
|
*
|
|
* This is a deliberate exception to the "plain HTML inputs" convention: the file-upload markup is complex enough
|
|
* (3 states, nested elements, data attributes, confirm dialog, i18n) that a partial prevents drift across call sites.
|
|
*
|
|
* Usage:
|
|
* $fileUpload = [
|
|
* 'name' => 'avatar', // required — input name attribute
|
|
* 'accept' => 'image/*', // required — accepted file types
|
|
* 'hint' => t('Allowed file types: SVG, PNG, JPG, WEBP'),// optional — hint text below dropzone label
|
|
* 'currentSrc' => 'admin/tenants/logo-file?uuid=…&theme=light&size=128', // optional — URL of existing server file
|
|
* 'currentLabel' => t('Current image'), // optional — label for current file preview
|
|
* 'deleteAction' => 'admin/tenants/logo-delete/…', // optional — formaction for delete button (requires currentSrc)
|
|
* 'deleteConfirm' => t('Delete this image?'), // optional — confirm message on delete
|
|
* 'required' => false, // optional — make input required
|
|
* 'formId' => 'tenant-logo-light-form', // optional — HTML5 form attribute to associate input with an external form
|
|
* 'deleteFormId' => 'tenant-logo-light-delete-form', // optional — HTML5 form attribute for the delete button (bypasses formaction)
|
|
* ];
|
|
* require templatePath('partials/app-file-upload.phtml');
|
|
*
|
|
* @var array<string, mixed> $fileUpload
|
|
*/
|
|
|
|
$fileUpload = is_array($fileUpload ?? null) ? $fileUpload : [];
|
|
$uploadName = trim((string) ($fileUpload['name'] ?? ''));
|
|
if ($uploadName === '') {
|
|
return;
|
|
}
|
|
|
|
$uploadAccept = trim((string) ($fileUpload['accept'] ?? ''));
|
|
$uploadHint = trim((string) ($fileUpload['hint'] ?? ''));
|
|
$uploadCurrentSrc = trim((string) ($fileUpload['currentSrc'] ?? ''));
|
|
$uploadCurrentLabel = trim((string) ($fileUpload['currentLabel'] ?? t('Current image')));
|
|
$uploadDeleteAction = trim((string) ($fileUpload['deleteAction'] ?? ''));
|
|
$uploadDeleteConfirm = trim((string) ($fileUpload['deleteConfirm'] ?? t('Delete this image?')));
|
|
$uploadRequired = (bool) ($fileUpload['required'] ?? false);
|
|
$uploadFormId = trim((string) ($fileUpload['formId'] ?? ''));
|
|
$uploadDeleteFormId = trim((string) ($fileUpload['deleteFormId'] ?? ''));
|
|
$hasCurrent = $uploadCurrentSrc !== '';
|
|
$hasDelete = $hasCurrent && ($uploadDeleteAction !== '' || $uploadDeleteFormId !== '');
|
|
|
|
?>
|
|
<div data-app-component="file-upload" class="app-file-upload"
|
|
<?php if ($hasCurrent): ?>data-current-src="<?php e($uploadCurrentSrc); ?>" data-current-label="<?php e($uploadCurrentLabel); ?>"<?php endif; ?>>
|
|
<?php if ($hasCurrent): ?>
|
|
<div class="app-file-upload-current">
|
|
<img class="app-file-upload-current-image" src="" alt="">
|
|
<div class="app-file-upload-current-meta">
|
|
<span class="app-file-upload-current-label"></span>
|
|
<span class="app-file-upload-current-actions">
|
|
<button type="button" class="app-file-upload-replace-button"><?php e(t('Replace')); ?></button>
|
|
<?php if ($hasDelete): ?>
|
|
<button type="submit" class="app-file-upload-delete-button"
|
|
<?php if ($uploadDeleteFormId !== ''): ?>form="<?php e($uploadDeleteFormId); ?>"<?php else: ?>formaction="<?php e($uploadDeleteAction); ?>" formmethod="post"<?php endif; ?>
|
|
data-confirm-message="<?php e($uploadDeleteConfirm); ?>"><?php e(t('Delete')); ?></button>
|
|
<?php endif; ?>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
<?php endif; ?>
|
|
<label class="app-file-upload-dropzone">
|
|
<input type="file" name="<?php e($uploadName); ?>"
|
|
<?php if ($uploadAccept !== ''): ?>accept="<?php e($uploadAccept); ?>"<?php endif; ?>
|
|
<?php if ($uploadFormId !== ''): ?>form="<?php e($uploadFormId); ?>"<?php endif; ?>
|
|
<?php if ($uploadRequired): ?>required<?php endif; ?>>
|
|
<span class="app-file-upload-dropzone-icon"><i class="bi bi-cloud-arrow-up"></i></span>
|
|
<span class="app-file-upload-dropzone-label"><?php e(t('Drop file here or click to select')); ?></span>
|
|
<?php if ($uploadHint !== ''): ?>
|
|
<span class="app-file-upload-dropzone-hint"><?php e($uploadHint); ?></span>
|
|
<?php endif; ?>
|
|
</label>
|
|
<div class="app-file-upload-preview">
|
|
<img class="app-file-upload-thumbnail" alt="" hidden>
|
|
<span class="app-file-upload-file-icon" hidden><i class="bi bi-file-earmark"></i></span>
|
|
<span class="app-file-upload-meta">
|
|
<span class="app-file-upload-filename"></span>
|
|
<span class="app-file-upload-filesize"></span>
|
|
</span>
|
|
<button type="button" class="app-file-upload-clear" aria-label="<?php e(t('Remove selected file')); ?>"><i class="bi bi-x-lg"></i></button>
|
|
</div>
|
|
</div>
|