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

Phrase external auth warnings more neutral 

refs #8274
This commit is contained in:
Johannes Meyer 2015-01-28 16:22:20 +01:00
parent 7ad44b8411
commit 78f5bf4f3d
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,13 +17,9 @@
'</a>'
); ?></p>
<?php elseif ($requiresExternalAuth): ?>
<p class="icon-info info-box"><?= sprintf(
$this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
. ' Make sure you\'ll configure such either by using the %s or by setting it up manually,'
. ' otherwise you\'ll not be able to login.'
),
'<em title="icingacli help users">IcingaCLI</em>'
<p class="info-box"><span class="icon-info"></span><?= $this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
. ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
); ?></p>
<?php endif ?>
<h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>

12
modules/setup/application/forms/AuthenticationPage.php
View File

@ -42,14 +42,10 @@ class AuthenticationPage extends Form
'note',
'external_note',
array(
'value' => sprintf(
$this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication '
. 'mechanisms. Make sure you\'ll configure such either by using the %s once the '
. 'wizard is complete or by setting it up manually, otherwise you\'ll not be able '
. 'to log into Icinga Web 2.'
),
'<em title="icingacli help users">IcingaCLI</em>'
'value' => $this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication '
. 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
. 'log into Icinga Web 2.'
),
'decorators' => array(
'ViewHelper',

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

@ -129,8 +129,14 @@
p.info-box {
width: 50%;
height: 2.2em;
margin: 0 auto 2.5em;
span.icon-info {
float: left;
height: 100%;
}
em {
text-decoration: underline;
}