-
Notifications
You must be signed in to change notification settings - Fork 275
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'bugfix/Prettify-page-layout-when-accessing-a-non-existe…
…nt-route-while-not-being-authenticated-10009' fixes #10009
- Loading branch information
Showing
8 changed files
with
82 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<div class="logo"> | ||
<div class="image"> | ||
<img aria-hidden="true" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" > | ||
</div> | ||
</div> | ||
<div class="below-logo"> | ||
<?= $this->render('inline.phtml') ?> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
<?php if (! $hideControls): ?> | ||
<div class="controls"> | ||
<?= $this->tabs->showOnlyCloseButton() ?> | ||
<?= $tabs->showOnlyCloseButton(); ?> | ||
</div> | ||
<div class="content"> | ||
<p><strong><?= nl2br($this->escape($message)) ?></strong></p> | ||
<?php if (isset($stackTrace)) : ?> | ||
<hr /> | ||
<pre><?= $this->escape($stackTrace) ?></pre> | ||
<?php endif ?> | ||
</div> | ||
<div class="content"> | ||
<p><strong><?= nl2br($this->escape($message)); ?></strong></p> | ||
<?php if (isset($stackTrace)): ?> | ||
<hr /> | ||
<pre><?= $this->escape($stackTrace) ?></pre> | ||
<?php endif ?> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ | ||
|
||
.logo { | ||
background-color: @colorPetrol; | ||
position: absolute; | ||
top: 0; | ||
left: 0; | ||
right: 0; | ||
bottom: 60%; | ||
border-bottom: 1px solid #d9d9d9d; | ||
text-align: center; | ||
-webkit-box-shadow: 0 3px 7px -3px #000; | ||
-moz-box-shadow: 0 3px 7px -3px #000; | ||
box-shadow: 0 3px 7px -3px #000; | ||
|
||
.image { | ||
position: absolute; | ||
bottom: 1em; | ||
left: 0px; | ||
right: 0px; | ||
text-align: center; | ||
|
||
img { | ||
width: 375px; | ||
} | ||
} | ||
} | ||
|
||
.below-logo { | ||
position: absolute; | ||
font-size: 0.9em; | ||
top: 45%; | ||
left: 0; | ||
bottom: 0; | ||
right: 0; | ||
} | ||
|
||
#layout.minimal-layout { | ||
.logo .image img { | ||
width: 70%; | ||
} | ||
|
||
.below-logo { | ||
width: 100%; | ||
margin: auto; | ||
} | ||
} |