diff options
| author | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
|---|---|---|
| committer | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
| commit | 4459dd7917f4d1c34f40bb68f0e991e9c3d53e4c (patch) | |
| tree | 5c07151ae61276d334e88f6309c30d439a85c12e /templates/layouts | |
| parent | da0022e5c1abbf9825ae76debaabdff7e8623bb4 (diff) | |
| parent | 97a188592c679890a25c37ab78463add76a52ff7 (diff) | |
Merge branch 'main' into issue-3911issue-3911
Diffstat (limited to 'templates/layouts')
| -rw-r--r-- | templates/layouts/base.php | 19 | ||||
| -rw-r--r-- | templates/layouts/dialog.php | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/templates/layouts/base.php b/templates/layouts/base.php index 180e020..1f2ac32 100644 --- a/templates/layouts/base.php +++ b/templates/layouts/base.php @@ -53,7 +53,9 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']); 'ACTIONMENU_THRESHOLD' => Config::get()->ACTION_MENU_THRESHOLD, 'ENTRIES_PER_PAGE' => Config::get()->ENTRIES_PER_PAGE, 'OPENGRAPH_ENABLE' => Config::get()->OPENGRAPH_ENABLE, - 'COURSEWARE_CERTIFICATES_ENABLE' => Config::get()->COURSEWARE_CERTIFICATES_ENABLE + 'COURSEWARE_CERTIFICATES_ENABLE' => Config::get()->COURSEWARE_CERTIFICATES_ENABLE, + 'PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED' => + (bool) User::findCurrent()?->getConfiguration()->PERSONAL_NOTIFICATIONS_AUDIO_DEACTIVATED, ]) ?>, } </script> @@ -90,19 +92,28 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']); <?= Icon::create('zoom-out2')->asImg(24) ?> </button> <? endif; ?> - <?= implode(PageLayout::getMessages()) ?> <?= $content_for_layout ?> </div> + <system-notification-manager + id="system-notifications" + :notifications='<?= htmlReady(json_encode(PageLayout::getMessages())) ?>' + placement="<?= User::findCurrent()?->getConfiguration()->SYSTEM_NOTIFICATIONS_PLACEMENT ?? 'topcenter' ?>"></system-notification-manager> </main> <!-- End main content --> - <a id="scroll-to-top" class="hide"> + <a id="scroll-to-top" class="hide" tabindex="0" title="<?= _('Zurück zum Seitenanfang') ?>"> <?= Icon::create('arr_1up', 'info_alt')->asImg(24, ['class' => '']) ?> </a> - <?= $this->render_partial('footer', ['link_params' => $header_template->link_params]); ?> + <?= $this->render_partial('footer', ['link_params' => $header_template->link_params ?? null]); ?> <?= SkipLinks::getHTML() ?> <section class="sr-only" id="notes_for_screenreader" aria-live="polite"></section> + +<?php +if (Studip\Debug\DebugBar::isActivated()) { + echo app()->get(\DebugBar\DebugBar::class)->getJavascriptRenderer()->render(); +} +?> </body> </html> <?php NotificationCenter::postNotification('PageDidRender', PageLayout::getBodyElementId()); diff --git a/templates/layouts/dialog.php b/templates/layouts/dialog.php index ddf9280..147f69d 100644 --- a/templates/layouts/dialog.php +++ b/templates/layouts/dialog.php @@ -1,2 +1,2 @@ -<?= implode(PageLayout::getMessages()) ?> -<?= $content_for_layout ?>
\ No newline at end of file +<?= implode('', PageLayout::getMessages()) ?> +<?= $content_for_layout ?> |