Body: Restructure layout markup

This commit is contained in:
Florian Strohmaier 2019-07-03 15:49:12 +02:00 committed by Johannes Meyer
parent 722cbfe47f
commit 204fd5d636
1 changed files with 22 additions and 19 deletions

View File

@ -23,28 +23,30 @@ if ($this->layout()->inlineLayout) {
} }
?> ?>
<div id="header"> <div id="announcements" class="container">
<div id="announcements" class="container">
<?= $this->widget('announcements') ?> <?= $this->widget('announcements') ?>
</div>
<div id="header-logo-container">
<?= $this->qlink(
'',
Auth::getInstance()->isAuthenticated() ? 'dashboard' : '',
null,
array(
'aria-hidden' => 'true',
'data-base-target' => '_main',
'id' => 'header-logo'
)
); ?>
</div>
</div> </div>
<?php if (! $this->layout()->isIframe): ?> <div id="content-wrapper">
<div id="sidebar"> <?php if (! $this->layout()->isIframe): ?>
<?= $this->render('parts/navigation.phtml'); ?> <div id="sidebar">
<div id="header">
<div id="header-logo-container">
<?= $this->qlink(
'',
Auth::getInstance()->isAuthenticated() ? 'dashboard' : '',
null,
array(
'aria-hidden' => 'true',
'data-base-target' => '_main',
'id' => 'header-logo'
)
); ?>
</div>
</div>
<?= $this->render('parts/navigation.phtml'); ?>
</div>
<?php endif ?>
</div> </div>
<?php endif ?>
<div id="main" role="main"> <div id="main" role="main">
<div id="col1" <div id="col1"
class="container<?= $moduleClass ?>" class="container<?= $moduleClass ?>"
@ -72,3 +74,4 @@ if ($this->layout()->inlineLayout) {
?></ul> ?></ul>
<div id="application-state-summary" class="container" data-icinga-url="<?= $this->url('application-state/summary') ?>" data-last-update="-1" data-icinga-refresh="60"></div> <div id="application-state-summary" class="container" data-icinga-url="<?= $this->url('application-state/summary') ?>" data-last-update="-1" data-icinga-refresh="60"></div>
</div> </div>