diff options
| author | Thomas Hackl <hackl@data-quest.de> | 2022-12-16 07:33:40 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-12-16 07:33:40 +0000 |
| commit | f6b1acb3db5a70a82bd51efb5e16dfb772c93e05 (patch) | |
| tree | c94fdcfbbe44b6c4e5ddf634a8d3f036548d72db /templates/header.php | |
| parent | b64e995dc2760ddab04f51f15794ff55ae744ab0 (diff) | |
Resolve "Polishing für die neue HTML-Struktur und die responsive Ansicht" Teil 2
Closes #1858, #1906, #1905, #1881, #1884, and #1882
Merge request studip/studip!1234
Diffstat (limited to 'templates/header.php')
| -rw-r--r-- | templates/header.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/templates/header.php b/templates/header.php index 5e4ed10..c59d081 100644 --- a/templates/header.php +++ b/templates/header.php @@ -58,7 +58,6 @@ if ($navigation) { <!-- Top bar with site title, quick search and avatar menu --> <div id="top-bar" role="banner"> - <?= $this->render_partial('responsive-navigation.php') ?> <div id="responsive-menu"> <? $user = User::findCurrent(); @@ -71,15 +70,19 @@ if ($navigation) { 'perm' => $GLOBALS['perm']->get_perm() ]; - $hasSidebar = Sidebar::get()->countWidgets(NavigationWidget::class) > 0; + $navWidget = Sidebar::get()->countWidgets(NavigationWidget::class); + $allWidgets = Sidebar::get()->countWidgets(); + $hasSidebar = $allWidgets - $navWidget > 0; ?> <? } else { $me = ['username' => 'nobody']; $hasSidebar = false; } ?> - <responsive-navigation :me="<?= htmlReady(json_encode($me)) ?>" context="<?= htmlReady(Context::get() ? - Context::get()->getFullname() : '') ?>" :has-sidebar="<?= $hasSidebar ? 'true' : 'false' ?>"> - </responsive-navigation> + <responsive-navigation :me="<?= htmlReady(json_encode($me)) ?>" + context="<?= htmlReady(Context::get() ? Context::get()->getFullname() : '') ?>" + :has-sidebar="<?= $hasSidebar ? 'true' : 'false' ?>" + :navigation="<?= htmlReady(json_encode(ResponsiveHelper::getNavigationObject($_COOKIE['responsive-navigation-hash'] ?? null))) ?>" + ></responsive-navigation> </div> <div id="site-title"> <?= htmlReady(Config::get()->UNI_NAME_CLEAN) ?> |