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

Ensure that all standalone icons have proper labels 

refs #8358
This commit is contained in:
Johannes Meyer 2015-02-16 10:53:48 +01:00
parent 5321c2f9e5
commit 27cb5e24db
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -50,16 +50,16 @@
</td> </td>
<td> <td>
<?php if ($comment->objecttype === 'service'): ?> <?php if ($comment->objecttype === 'service'): ?>
<?= $this->icon('service') ?> <?= $this->icon('service', $this->translate('Service')); ?>
<?= $this->link()->service( <?= $this->link()->service(
$comment->service, $comment->service_display_name, $comment->host, $comment->host_display_name $comment->service, $comment->service_display_name, $comment->host, $comment->host_display_name
) ?> ) ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('host') ?> <?= $this->icon('host', $this->translate('Host')); ?>
<?= $this->link()->host($comment->host, $comment->host_display_name) ?> <?= $this->link()->host($comment->host, $comment->host_display_name) ?>
<?php endif ?> <?php endif ?>
<br> <br>
<?= $this->icon('comment', null, array('aria-hidden' => 'true')); ?> <?= isset($comment->author) <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
? '[' . $comment->author . '] ' ? '[' . $comment->author . '] '
: ''; : '';
?><?= $this->escape($comment->comment); ?> ?><?= $this->escape($comment->comment); ?>

6
modules/monitoring/application/views/scripts/list/downtimes.phtml
View File

@ -55,16 +55,16 @@ use Icinga\Module\Monitoring\Object\Service;
</td> </td>
<td> <td>
<?php if ($isService): ?> <?php if ($isService): ?>
<?= $this->icon('service') ?> <?= $this->icon('service', $this->translate('Service')); ?>
<?= $this->link()->service( <?= $this->link()->service(
$downtime->service, $downtime->service_display_name, $downtime->host, $downtime->host_display_name $downtime->service, $downtime->service_display_name, $downtime->host, $downtime->host_display_name
) ?> ) ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('host') ?> <?= $this->icon('host', $this->translate('Host')); ?>
<?= $this->link()->host($downtime->host, $downtime->host_display_name) ?> <?= $this->link()->host($downtime->host, $downtime->host_display_name) ?>
<?php endif ?> <?php endif ?>
<br> <br>
<?= $this->icon('comment') ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?> <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>
<br> <br>
<small> <small>
<?php if ($downtime->is_flexible): ?> <?php if ($downtime->is_flexible): ?>

2
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -74,7 +74,7 @@ if ($hosts->count() === 0) {
} }
if (isset($host->host_last_comment) && $host->host_last_comment !== null) { if (isset($host->host_last_comment) && $host->host_last_comment !== null) {
$icons[] = $this->icon('comment', $this->translate('Comment: ') . $host->host_last_comment); $icons[] = $this->icon('comment', $this->translate('Last Comment: ') . $host->host_last_comment);
} }
?> ?>
<tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>"> <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">

4
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -42,7 +42,7 @@ use Icinga\Module\Monitoring\Object\Service;
</td> </td>
<td style="font-size: 0.8em"> <td style="font-size: 0.8em">
<?php if ($isService): ?> <?php if ($isService): ?>
<?= $this->icon('service') ?> <?= $this->icon('service', $this->translate('Service')); ?>
<?= $this->link()->service( <?= $this->link()->service(
$notification->service, $notification->service,
$notification->service_display_name, $notification->service_display_name,
@ -50,7 +50,7 @@ use Icinga\Module\Monitoring\Object\Service;
$notification->host_display_name $notification->host_display_name
) ?> ) ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('host') ?> <?= $this->icon('host', $this->translate('Host')); ?>
<?= $this->link()->host($notification->host, $notification->host_display_name) ?> <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
<?php endif ?> <?php endif ?>
<br> <br>

2
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -90,7 +90,7 @@ foreach ($services as $service):
<?php endif ?> <?php endif ?>
<?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?> <?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?>
<?= $this->icon('comment', $this->translate('Comment: ') . $service->service_last_comment) ?> <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
<?php endif ?> <?php endif ?>
<?php if (!$service->service_active_checks_enabled): ?> <?php if (!$service->service_active_checks_enabled): ?>