Move the login form's heading above the authentication warnings

This commit is contained in:
Johannes Meyer 2015-02-12 13:47:50 +01:00
parent 9232c5cf22
commit 1d6c65f7fc
2 changed files with 4 additions and 11 deletions

View File

@ -5,6 +5,7 @@
</div> </div>
</div> </div>
<div class="form" data-base-target="layout"> <div class="form" data-base-target="layout">
<h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
<?php if ($requiresSetup): ?> <?php if ($requiresSetup): ?>
<p tabindex="0" class="config-note"><?= sprintf( <p tabindex="0" class="config-note"><?= sprintf(
$this->translate( $this->translate(
@ -22,15 +23,7 @@
. ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.' . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
); ?></p> ); ?></p>
<?php endif ?> <?php endif ?>
<h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1> <?= $this->form ?>
<?php <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
/* TODO: remove this as soon as notifications and forms are ready */
if (isset($this->errorInfo)): ?>
<div class="error">
<?= $this->errorInfo ?>
</div>
<?php endif ?>
<?= $this->form ?>
<div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
</div> </div>
</div> </div>

View File

@ -129,7 +129,7 @@
p.info-box { p.info-box {
width: 50%; width: 50%;
height: 2.2em; height: 2.2em;
margin: 0 auto 2.5em; margin: 2em auto 2.5em;
i.icon-info { i.icon-info {
float: left; float: left;