tbh/breadcrumb-the-shire
1
0
Fork 0
forked from fa/breadcrumb-the-shire
Code Pull Requests Activity

Consolidate settings normalization tests

Browse Source
This commit is contained in:
Felix Schneider
2026-03-19 19:43:55 +01:00
parent 83aadb3535
commit bc72fa50a6
14 changed files with 424 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/default.phtml
View File

@@ -145,7 +145,7 @@ $componentPageConfig = [
'components' => [
'confirmActions' => [],
'flashAutoDismiss' => [
'selector' => '.notice[data-flash-timeout]',
'selector' => '.app-toast-stack .notice[data-flash-timeout]',
],
'passwordHints' => [],
'copyBadge' => [],
@@ -329,7 +329,6 @@ $componentPageConfig['moduleRuntimeComponents'] = $moduleRuntimeComponents;
<main>
<?php require __DIR__ . '/partials/app-topbar.phtml'; ?>
<div id="app-main-content" class="app-main-content" tabindex="-1">
<?php require __DIR__ . '/partials/app-flash.phtml'; ?>
<?php Buffer::get('html'); ?>
</div>
</main>
@@ -360,6 +359,7 @@ $componentPageConfig['moduleRuntimeComponents'] = $moduleRuntimeComponents;
<?php endforeach; ?>
<script type="application/json" id="page-config-app-components"><?php gridJsonForJs($componentPageConfig); ?></script>
<script type="module" src="<?php e(assetVersion('js/app-init.js')); ?>"></script>
<?php require __DIR__ . '/partials/app-flash.phtml'; ?>
</body>
</html>

6
templates/login.phtml
View File

@@ -15,7 +15,7 @@ if ($bufferTitle !== '') {
$loginComponentConfig = [
'components' => [
'flashAutoDismiss' => [
'selector' => '.notice[data-flash-timeout]',
'selector' => '.app-toast-stack .notice[data-flash-timeout]',
],
'passwordHints' => [
'selector' => '[data-password-hints]',
@@ -58,9 +58,6 @@ $loginComponentConfig = [
<body>
<main class="login-main">
<div class="container-small login-flash-container">
<?php require __DIR__ . '/partials/app-flash.phtml'; ?>
</div>
<div class="container-small login-content-container">
<?php Buffer::get('html'); ?>
</div>
@@ -69,6 +66,7 @@ $loginComponentConfig = [
<div id="gradient"></div>
<script type="application/json" id="page-config-login-components"><?php gridJsonForJs($loginComponentConfig); ?></script>
<script type="module" src="<?php e(assetVersion('js/app-login-init.js')); ?>"></script>
<?php require __DIR__ . '/partials/app-flash.phtml'; ?>
</body>
</html>

2
templates/page.phtml
View File

@@ -48,12 +48,12 @@ if ($bufferTitle !== '') {
</header>
<main>
<div class="page-content">
<?php require __DIR__ . '/partials/app-flash.phtml'; ?>
<?php Buffer::get('html'); ?>
</div>
</main>
<?php require __DIR__ . '/partials/app-footer.phtml'; ?>
</div>
<?php require __DIR__ . '/partials/app-flash.phtml'; ?>
</body>
</html>

9
templates/partials/app-flash.phtml
View File

@@ -18,15 +18,16 @@ $timeouts = [
];
?>
<div class="flash-stack" data-app-component="flash-auto-dismiss" role="status" aria-live="polite">
<div class="app-toast-stack" data-app-component="flash-auto-dismiss" aria-live="polite">
<?php foreach ($messages as $message) : ?>
<?php $type = $message['type'] ?? 'info'; ?>
<?php $timeout = $timeouts[$type] ?? 5000; ?>
<div class="notice" data-variant="<?php e($type); ?>" data-flash-timeout="<?php e($timeout); ?>">
<?php e(t($message['message'] ?? '')); ?>
<?php $isAssertive = $type === 'error' || $type === 'warning'; ?>
<div class="notice" data-variant="<?php e($type); ?>" data-flash-timeout="<?php e($timeout); ?>" role="<?php echo $isAssertive ? 'alert' : 'status'; ?>">
<span><?php e(t($message['message'] ?? '')); ?></span>
<form method="post" action="flash/dismiss/<?php e($message['id'] ?? ''); ?>">
<input type="hidden" name="return" value="<?php e($returnTarget); ?>">
<button type="submit" class="contrast outline small"><i class="bi bi-x"></i></button>
<button type="submit" aria-label="<?php e(t('Dismiss')); ?>"><i class="bi bi-x-lg"></i></button>
<?php Session::getCsrfInput(); ?>
</form>
</div>

2
templates/partials/app-topbar.phtml
View File

@@ -36,7 +36,7 @@ $moduleTopbarSlots = is_array($moduleSlots['topbar.right_item'] ?? null) ? $modu
<li>
<a id="global-forward" data-tooltip-pos="bottom" data-tooltip="<?php e(t('Forward')); ?> (Alt+→)" title="<?php e(t('Forward')); ?> (Alt+→)" aria-label="<?php e(t('Forward')); ?> (Alt+→)" href="admin"><i class="bi bi-arrow-right"></i></a>
</li>
<li id="async-messages" role="status" aria-live="polite"></li>
<li id="async-messages" role="status" aria-live="polite" aria-hidden="true"></li>
</ul>
<div class="app-topbar-center" aria-hidden="true"></div>
<ul class="app-topbar-right">