tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 05:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make error messages accessible

Browse Source
This commit is contained in:
Eric Lippmann 2016-01-25 07:44:48 +01:00
parent 2e1e0bb89f
commit ec177e78e5
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/controllers/ErrorController.php
View File

@ -3,7 +3,6 @@
namespace Icinga\Controllers; namespace Icinga\Controllers;
use Icinga\Web\Response\JsonResponse;
use Zend_Controller_Plugin_ErrorHandler; use Zend_Controller_Plugin_ErrorHandler;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Logger; use Icinga\Application\Logger;
@ -13,6 +12,7 @@ use Icinga\Exception\Http\HttpNotFoundException;
use Icinga\Exception\MissingParameterException; use Icinga\Exception\MissingParameterException;
use Icinga\Security\SecurityException; use Icinga\Security\SecurityException;
use Icinga\Web\Controller\ActionController; use Icinga\Web\Controller\ActionController;
use Icinga\Web\Url;
/** /**
* Application wide controller for displaying exceptions * Application wide controller for displaying exceptions
@ -100,6 +100,15 @@ class ErrorController extends ActionController
} }
$this->view->request = $error->request; $this->view->request = $error->request;
$this->view->hideControls = ! $isAuthenticated; if (! $isAuthenticated) {
$this->view->hideControls = true;
} else {
$this->view->hideControls = false;
$this->getTabs()->add('error', array(
'active' => true,
'label' => $this->translate('Error'),
'url' => Url::fromRequest()
));
}
} }
} }

12
application/views/scripts/error/error.phtml
View File

@ -1,12 +1,12 @@
<?php if (! $this->compact && ! $hideControls): ?> <?php if (! $this->compact && ! $hideControls): ?>
<div class="controls"> <div class="controls">
<?= $tabs->showOnlyCloseButton() ?> <?= $tabs ?>
</div> </div>
<?php endif ?> <?php endif ?>
<div class="content"> <div class="content">
<p class="autofocus error-message"><?= nl2br($this->escape($message)) ?></p> <p tabindex="-1" class="autofocus error-message"><?= nl2br($this->escape($message)) ?></p>
<?php if (isset($stackTrace)): ?> <?php if (isset($stackTrace)): ?>
<hr /> <hr>
<pre><?= $this->escape($stackTrace) ?></pre> <pre><?= $this->escape($stackTrace) ?></pre>
<?php endif ?> <?php endif ?>
</div> </div>

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

@ -113,8 +113,10 @@
background-color: @gray-lighter; background-color: @gray-lighter;
} }
.container { .container,
// Don't outline containers when focused because they receive focus for accessibility only programmatically .error-message {
// Don't outline containers and error messages when focused because they receive focus for accessibility only
// programmatically
outline: none; outline: none;
} }