tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the configuration warning on the login screen further up 

..and add translation support to the login screen.

refs #8274
refs #8134
This commit is contained in:
Johannes Meyer 2015-01-27 13:31:14 +01:00
parent afd4a9a134
commit 6c292f7e56
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
application/views/scripts/authentication/login.phtml
View File

@ -1,11 +1,23 @@
<div id="login"> <div id="login">
<div class="logo"> <div class="logo">
<div class="image"> <div class="image">
<img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png') ?>" alt="<?= t('The Icinga logo') ?>" > <img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
</div> </div>
</div> </div>
<div class="form" data-base-target="layout"> <div class="form" data-base-target="layout">
<h1>Welcome to Icinga Web 2</h1> <?php if ($requiresSetup): ?>
<div class="config-note"><?= sprintf(
$this->translate(
'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
. 'authentication method. Please define a authentication method by following the instructions in the'
. ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
),
'<a href="http://docs.icinga.org/" title="' . $this->translate('Icinga Web 2 Documentation') . '">', // TODO: More exact documentation link..
'<a href="' . $this->href('setup') . '" title="' . $this->translate('Icinga Web 2 Setup-Wizard') . '">',
'</a>'
); ?></div>
<?php endif ?>
<h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
<?php <?php
/* TODO: remove this as soon as notifications and forms are ready */ /* TODO: remove this as soon as notifications and forms are ready */
if (isset($this->errorInfo)): ?> if (isset($this->errorInfo)): ?>
@ -14,18 +26,6 @@
</div> </div>
<?php endif ?> <?php endif ?>
<?= $this->form ?> <?= $this->form ?>
<div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org">The Icinga Project</a></div> <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
<?php if ($requiresSetup): ?>
<div class="config-note"><?= sprintf(
t(
'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
. 'authentication method. Please define a authentication method by following the instructions in the'
. ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
),
'<a href="http://docs.icinga.org/" title="Icinga Web 2 Documentation">', // TODO: Documentation link
'<a href="' . $this->href('setup') . '" title="Icinga Web 2 Setup-Wizard">',
'</a>'
); ?></div>
<?php endif ?>
</div> </div>
</div> </div>

2
public/css/icinga/login.less
View File

@ -116,7 +116,7 @@
div.config-note { div.config-note {
width: 50%; width: 50%;
padding: 1em; padding: 1em;
margin: 5em auto 0; margin: 0 auto 2.5em;
text-align: center; text-align: center;
color: white; color: white;
background-color: @colorCritical; background-color: @colorCritical;