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

Merge branch 'feature/adjust-icon-markup-for-screen-readers-8358'

Browse Source 
resolves #8358
This commit is contained in:
Johannes Meyer 2015-02-16 11:03:14 +01:00
commit bfc289c89e
35 changed files with 214 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/layouts/scripts/pdf.phtml
View File

@ -31,7 +31,7 @@ if ( isset($pdf) )
} }
</script> </script>
<?= $this->img('img/logo_icinga_big_dark.png', array('align' => 'right', 'width' => '75')) ?> <?= $this->img('img/logo_icinga_big_dark.png', null, array('align' => 'right', 'width' => '75')) ?>
<!--<div id="page-header"> <!--<div id="page-header">
<table> <table>
<tr> <tr>

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

@ -7,7 +7,7 @@
<div class="form" data-base-target="layout"> <div class="form" data-base-target="layout">
<h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1> <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
<?php if ($requiresSetup): ?> <?php if ($requiresSetup): ?>
<p tabindex="0" class="config-note"><?= sprintf( <p class="config-note"><?= sprintf(
$this->translate( $this->translate(
'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined ' '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' . 'authentication method. Please define a authentication method by following the instructions in the'
@ -18,7 +18,7 @@
'</a>' '</a>'
); ?></p> ); ?></p>
<?php elseif ($requiresExternalAuth): ?> <?php elseif ($requiresExternalAuth): ?>
<p tabindex="0" class="info-box"><i aria-hidden="true" class="icon-info"></i><?= $this->translate( <p class="info-box"><?= $this->icon('icon-info'); ?><?= $this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.' '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.' . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
); ?></p> ); ?></p>

2
application/views/scripts/config/authentication/reorder.phtml
View File

@ -21,7 +21,7 @@
</h2> </h2>
<p> <p>
<a href="<?= $this->href('/config/createAuthenticationBackend'); ?>"> <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?> <?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
</a> </a>
</p> </p>
<h2 tabindex="0" id="authentication-reorder" class="sr-only"> <h2 tabindex="0" id="authentication-reorder" class="sr-only">

29
application/views/scripts/config/modules.phtml
View File

@ -10,17 +10,24 @@
<?php foreach ($modules as $module): ?> <?php foreach ($modules as $module): ?>
<tr> <tr>
<td> <td>
<?php if ($module->enabled): ?> <?php if ($module->enabled && $module->loaded) {
<?= $this->icon('thumbs-up', $this->translate('Module is enabled')) ?> $icon = $this->icon('thumbs-up');
<?php else: ?> $title = sprintf($this->translate('Module %s is enabled'), $module->name);
<?= $this->icon('thumbs-down', $this->translate('Module is disabled')) ?> } elseif (! $module->enabled) {
<?php endif ?> $icon = $this->icon('thumbs-down');
<a href="<?= $this->url( $title = sprintf($this->translate('Module %s is disabled'), $module->name);
'config/module/', } else { // ! $module->loaded
array('name' => $module->name) $icon = $this->icon('thumbs-down');
) ?>"><?= $this->escape($module->name); ?></a> (<?= $title = sprintf($this->translate('Module %s has failed to load'), $module->name);
$module->enabled ? ($module->loaded ? $this->translate('enabled') : $this->translate('failed')) : $this->translate('disabled') }
?>)
echo $this->qlink(
$icon . $this->escape($module->name),
'config/module/',
array('name' => $module->name),
array('title' => $title),
false
); ?>
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>

26
application/views/scripts/config/resource.phtml
View File

@ -21,7 +21,7 @@
</h2> </h2>
<p> <p>
<a href="<?= $this->href('/config/createresource'); ?>"> <a href="<?= $this->href('/config/createresource'); ?>">
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?> <?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
</a> </a>
</p> </p>
<h2 tabindex="0" id="resource-edit-resource" class="sr-only"> <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
@ -36,14 +36,24 @@
<?php foreach ($this->resources as $name): ?> <?php foreach ($this->resources as $name): ?>
<tr> <tr>
<td> <td>
<a href="<?= $this->href('config/editresource', array('resource' => $name)); ?>"> <?= $this->qlink(
<?= $this->icon('edit'); ?> <?= $this->escape($name); ?> $this->icon('edit') . ' ' . $this->escape($name),
</a> 'config/editresource',
array('resource' => $name),
array('title' => sprintf($this->translate('Edit resource %s'), $name)),
false
); ?>
</td> </td>
<td style="text-align: center"> <td>
<a href="<?= $this->href('config/removeresource', array('resource' => $name)); ?>"> <center>
<?= $this->icon('cancel'); ?> <?= $this->qlink(
</a> $this->icon('cancel'),
'config/removeresource',
array('resource' => $name),
array('title' => sprintf($this->translate('Remove resource %s'), $name)),
false
); ?>
</center>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>

22
application/views/scripts/dashboard/settings.phtml
View File

@ -1,5 +1,3 @@
<?php
?>
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
</div> </div>
@ -25,9 +23,13 @@
<?= $pane->getName(); ?> <?= $pane->getName(); ?>
</th> </th>
<th> <th>
<a href="<?= $this->href('dashboard/remove-pane', array('pane' => $pane->getName())); ?>"> <?= $this->qlink(
<?= $this->icon('cancel'); ?> $this->icon('cancel'),
</a> 'dashboard/remove-pane',
array('pane' => $pane->getName()),
array('title' => sprintf($this->translate('Remove pane %s'), $pane->getName())),
false
); ?>
</th> </th>
</tr> </tr>
<?php $dashlets = $pane->getDashlets(); ?> <?php $dashlets = $pane->getDashlets(); ?>
@ -50,9 +52,13 @@
<a href="<?= $this->href($dashlet->getUrl()); ?>"><?= $dashlet->getUrl(); ?></a> <a href="<?= $this->href($dashlet->getUrl()); ?>"><?= $dashlet->getUrl(); ?></a>
</td> </td>
<td> <td>
<a href="<?= $this->href('dashboard/remove-dashlet', array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle())); ?>"> <?= $this->qlink(
<?= $this->icon('cancel'); ?> $this->icon('cancel'),
</a> 'dashboard/remove-dashlet',
array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()),
array('title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getName())),
false
); ?>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>

46
application/views/scripts/form/reorder-authbackend.phtml
View File

@ -10,24 +10,50 @@
<?php for ($i = 0; $i < count($backendNames); $i++): ?> <?php for ($i = 0; $i < count($backendNames); $i++): ?>
<tr> <tr>
<td class="action"> <td class="action">
<a href="<?= $this->href('config/editAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>"> <?= $this->qlink(
<?= $this->icon('edit'); ?> <?= $this->escape($backendNames[$i]); ?> $this->icon('edit') . ' ' . $this->escape($backendNames[$i]),
</a> 'config/editAuthenticationBackend',
array('auth_backend' => $backendNames[$i]),
array('title' => sprintf($this->translate('Edit authentication backend %s'), $backendNames[$i])),
false
); ?>
</td> </td>
<td> <td>
<a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>"> <?= $this->qlink(
<?= $this->icon('cancel', $this->translate('Remove')); ?> $this->icon('cancel'),
</a> 'config/removeAuthenticationBackend',
array('auth_backend' => $backendNames[$i]),
array('title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])),
false
); ?>
</td> </td>
<td> <td>
<?php if ($i > 0): ?> <?php if ($i > 0): ?>
<button type="submit" name="backend_newpos" value="<?= sprintf('%s|%s', $backendNames[$i], $i - 1); ?>"> <button type="submit" name="backend_newpos" value="<?= sprintf(
<?= $this->icon('up-big', $this->translate('Move up in authentication order')); ?> '%s|%s',
$backendNames[$i],
$i - 1
); ?>" title="<?= $this->translate(
'Move up in authentication order'
); ?>" aria-label="<?= sprintf(
$this->translate('Move authentication backend %s upwards'),
$backendNames[$i]
); ?>">
<?= $this->icon('up-big'); ?>
</button> </button>
<?php endif; ?> <?php endif; ?>
<?php if ($i + 1 < count($backendNames)): ?> <?php if ($i + 1 < count($backendNames)): ?>
<button type="submit" name="backend_newpos" value="<?= sprintf('%s|%s', $backendNames[$i], $i + 1); ?>"> <button type="submit" name="backend_newpos" value="<?= sprintf(
<?= $this->icon('down-big', $this->translate('Move down in authentication order')); ?> '%s|%s',
$backendNames[$i],
$i + 1
); ?>" title="<?= $this->translate(
'Move down in authentication order'
); ?>" aria-label="<?= sprintf(
$this->translate('Move authentication backend %s downwards'),
$backendNames[$i]
); ?>">
<?= $this->icon('down-big'); ?>
</button> </button>
<?php endif; ?> <?php endif; ?>
</td> </td>

14
application/views/scripts/roles/index.phtml
View File

@ -51,13 +51,13 @@
<td><?= $this->escape($role->users) ?></td> <td><?= $this->escape($role->users) ?></td>
<td><?= $this->escape($role->groups) ?></td> <td><?= $this->escape($role->groups) ?></td>
<td> <td>
<a href="<?= $this->url('roles/remove', array('role' => $name)) ?>" <?= $this->qlink(
title="<?= sprintf( $this->icon('cancel'),
$this->translate('Remove role %s'), 'roles/remove',
$name array('role' => $name),
) ?>"> array('title' => sprintf($this->translate('Remove role %s'), $name)),
<?= $this->icon('cancel') ?> false
</a> ); ?>
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>

15
doc/accessibility/ifont.html
View File

@ -10,22 +10,9 @@
.icon-star:before { .icon-star:before {
content: "★"; content: "★";
} }
.sr-only {
border: 0;
clip: rect(0 0 0 0);
height: 1px;
margin: -1px;
overflow: hidden;
padding: 0;
position: absolute;
width: 1px;
}
</style> </style>
</head> </head>
<body> <body>
<span tabindex="0"> <i role="img" class="icon-star" aria-label="Top rated article" title="Top rated article"></i>
<i class="icon-star" aria-hidden="true"></i>
<span class="sr-only">Top rated article</span>
</span>
</body> </body>
</html> </html>

2
library/Icinga/Web/Form/Decorator/NoScriptApply.php
View File

@ -25,7 +25,7 @@ class NoScriptApply extends Zend_Form_Decorator_Abstract
{ {
if ($content) { if ($content) {
$content .= '<noscript><button name="noscript_apply" style="margin-left: 0.5em;" type="submit" value="1">' $content .= '<noscript><button name="noscript_apply" style="margin-left: 0.5em;" type="submit" value="1">'
. Icinga::app()->getViewRenderer()->view->icon('refresh.png', null, array('aria-hidden' => 'true')) . '&nbsp;' . t('Apply') . Icinga::app()->getViewRenderer()->view->icon('refresh.png') . '&nbsp;' . t('Apply')
. '</button></noscript>'; . '</button></noscript>';
} }

63
library/Icinga/Web/View/helpers/url.php
View File

@ -27,55 +27,68 @@ $this->addHelperFunction('url', function ($path = null, $params = null) {
return $url; return $url;
}); });
$this->addHelperFunction('qlink', function ($title, $url, $params = null, $properties = array(), $escape = true) use ($view) {
if (array_key_exists('title', $properties) && !array_key_exists('aria-label', $properties)) {
$properties['aria-label'] = $properties['title'];
}
$this->addHelperFunction('qlink', function ($title, $url, $params = null, $properties = array()) use ($view) {
return sprintf( return sprintf(
'<a href="%s"%s>%s</a>', '<a href="%s"%s>%s</a>',
$view->url($url, $params), $view->url($url, $params),
$view->propertiesToString($properties), $view->propertiesToString($properties),
$view->escape($title) $escape ? $view->escape($title) : $title
); );
}); });
$this->addHelperFunction('img', function ($url, array $properties = array()) use ($view) { $this->addHelperFunction('img', function ($url, $params = null, array $properties = array()) use ($view) {
if (! array_key_exists('alt', $properties)) { if (! array_key_exists('alt', $properties)) {
$properties['alt'] = ''; $properties['alt'] = '';
} }
if (array_key_exists('title', $properties)) {
if (! array_key_exists('aria-label', $properties)) {
$properties['aria-label'] = $properties['title'];
}
} elseif (! array_key_exists('aria-hidden', $properties)) {
$properties['aria-hidden'] = 'true';
}
return sprintf( return sprintf(
'<img src="%s"%s />', '<img src="%s"%s />',
$view->url($url), $view->url($url, $params),
$view->propertiesToString($properties) $view->propertiesToString($properties)
); );
}); });
$this->addHelperFunction('icon', function ($img, $title = null, array $properties = array()) use ($view) { $this->addHelperFunction('icon', function ($img, $title = null, array $properties = array()) use ($view) {
$isClass = strpos($img, '.') === false; if (strpos($img, '.') !== false) {
$class = null; if (array_key_exists('class', $properties)) {
$properties['class'] .= ' icon';
if ($isClass) {
$class = 'icon-' . $img;
} else {
$class = 'icon';
}
if ($title !== null) {
$properties['alt'] = $title;
$properties['title'] = $title;
}
if ($class !== null) {
if (isset($props['class'])) {
$properties['class'] .= ' ' . $class;
} else { } else {
$properties['class'] = $class; $properties['class'] = 'icon';
} }
}
if ($isClass) {
return sprintf('<i %s ></i>', $view->propertiesToString($properties));
} else {
return $view->img('img/icons/' . $img, $properties); return $view->img('img/icons/' . $img, $properties);
} }
if ($title !== null) {
$properties['role'] = 'img';
$properties['title'] = $title;
if (! array_key_exists('aria-label', $properties)) {
$properties['aria-label'] = $title;
}
} elseif (! array_key_exists('aria-hidden', $properties)) {
$properties['aria-hidden'] = 'true';
}
if (isset($properties['class'])) {
$properties['class'] .= ' icon-' . $img;
} else {
$properties['class'] = 'icon-' . $img;
}
return sprintf('<i %s></i>', $view->propertiesToString($properties));
}); });
$this->addHelperFunction('propertiesToString', function ($properties) use ($view) { $this->addHelperFunction('propertiesToString', function ($properties) use ($view) {

2
library/Icinga/Web/Widget/FilterEditor.php
View File

@ -669,7 +669,7 @@ class FilterEditor extends AbstractWidget
. '" title="' . '" title="'
. $title . $title
. '">' . '">'
. '<i class="icon-filter"></i>' . '<i aria-hidden="true" class="icon-filter"></i>'
. '</a>'; . '</a>';
} }

4
library/Icinga/Web/Widget/Tab.php
View File

@ -215,9 +215,9 @@ class Tab extends AbstractWidget
if ($this->icon !== null) { if ($this->icon !== null) {
if (strpos($this->icon, '.') === false) { if (strpos($this->icon, '.') === false) {
$caption = $view->icon($this->icon, null, array('aria-hidden' => 'true')) . $caption; $caption = $view->icon($this->icon) . $caption;
} else { } else {
$caption = $view->img($this->icon, array('aria-hidden' => 'true', 'class' => 'icon')) . $caption; $caption = $view->img($this->icon, null, array('class' => 'icon')) . $caption;
} }
} }
if ($this->url !== null) { if ($this->url !== null) {

2
library/Icinga/Web/Widget/Tabs.php
View File

@ -33,7 +33,7 @@ EOT;
*/ */
private $dropdownTpl = <<< 'EOT' private $dropdownTpl = <<< 'EOT'
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle"><i class="icon-down-open"></i></a> <a href="#" class="dropdown-toggle"><i aria-hidden="true" class="icon-down-open"></i></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{TABS} {TABS}
</ul> </ul>

6
modules/monitoring/application/views/scripts/alertsummary/index.phtml
View File

@ -42,11 +42,11 @@
<span> <span>
<?php if ($this->trend->trend === 'up'): ?> <?php if ($this->trend->trend === 'up'): ?>
<?= $this->icon('up-open', null, array('aria-hidden' => 'true')); ?> <?= $this->icon('up-open'); ?>
<?php elseif ($this->trend->trend === 'unchanged'): ?> <?php elseif ($this->trend->trend === 'unchanged'): ?>
<?= $this->icon('right-open', null, array('aria-hidden' => 'true')); ?> <?= $this->icon('right-open'); ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('down-open', null, array('aria-hidden' => 'true')); ?> <?= $this->icon('down-open'); ?>
<?php endif; ?> <?php endif; ?>
</span> </span>
</div> </div>

44
modules/monitoring/application/views/scripts/config/index.phtml
View File

@ -6,7 +6,7 @@
<div class="content" data-base-target="_next"> <div class="content" data-base-target="_next">
<p> <p>
<a href="<?= $this->href('/monitoring/config/createbackend'); ?>"> <a href="<?= $this->href('/monitoring/config/createbackend'); ?>">
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Monitoring Backend'); ?> <?= $this->icon('plus'); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
</a> </a>
</p> </p>
<table class="action"> <table class="action">
@ -18,18 +18,26 @@
<?php foreach ($this->backendsConfig as $backendName => $config): ?> <?php foreach ($this->backendsConfig as $backendName => $config): ?>
<tr> <tr>
<td> <td>
<a href="<?= $this->href('/monitoring/config/editbackend', array('backend' => $backendName)); ?>"> <?= $this->qlink(
<?= $this->icon('edit'); ?> <?= $this->escape($backendName); ?> $this->icon('edit') . ' ' . $this->escape($backendName),
</a> '/monitoring/config/editbackend',
array('backend' => $backendName),
array('title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)),
false
); ?>
<small>(<?= sprintf( <small>(<?= sprintf(
$this->translate('Type: %s'), $this->translate('Type: %s'),
$this->escape($config->type === 'ido' ? 'IDO' : ucfirst($config->type)) $this->escape($config->type === 'ido' ? 'IDO' : ucfirst($config->type))
); ?>)</small> ); ?>)</small>
</td> </td>
<td> <td>
<a href="<?= $this->href('/monitoring/config/removebackend', array('backend' => $backendName)); ?>"> <?= $this->qlink(
<?= $this->icon('cancel'); ?> $this->icon('cancel'),
</a> '/monitoring/config/removebackend',
array('backend' => $backendName),
array('title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)),
false
); ?>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
@ -38,7 +46,7 @@
<h1><?= $this->translate('Monitoring Instances') ?></h1> <h1><?= $this->translate('Monitoring Instances') ?></h1>
<p> <p>
<a href="<?= $this->href('/monitoring/config/createinstance'); ?>"> <a href="<?= $this->href('/monitoring/config/createinstance'); ?>">
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Instance'); ?> <?= $this->icon('plus'); ?> <?= $this->translate('Create New Instance'); ?>
</a> </a>
</p> </p>
<table class="action"> <table class="action">
@ -50,18 +58,26 @@
<?php foreach ($this->instancesConfig as $instanceName => $config): ?> <?php foreach ($this->instancesConfig as $instanceName => $config): ?>
<tr> <tr>
<td> <td>
<a href="<?= $this->href('/monitoring/config/editinstance', array('instance' => $instanceName)); ?>"> <?= $this->qlink(
<?= $this->icon('edit'); ?> <?= $this->escape($instanceName); ?> $this->icon('edit') . ' ' . $this->escape($instanceName),
</a> '/monitoring/config/editinstance',
array('instance' => $instanceName),
array('title' => sprintf($this->translate('Edit monitoring instance %s'), $instanceName)),
false
); ?>
<small>(<?= sprintf( <small>(<?= sprintf(
$this->translate('Type: %s'), $this->translate('Type: %s'),
$config->host !== null ? $this->translate('Remote') : $this->translate('Local') $config->host !== null ? $this->translate('Remote') : $this->translate('Local')
); ?>)</small> ); ?>)</small>
</td> </td>
<td> <td>
<a href="<?= $this->href('/monitoring/config/removeinstance', array('instance' => $instanceName)); ?>"> <?= $this->qlink(
<?= $this->icon('cancel'); ?> $this->icon('cancel'),
</a> '/monitoring/config/removeinstance',
array('instance' => $instanceName),
array('title' => sprintf($this->translate('Remove monitoring instance %s'), $instanceName)),
false
); ?>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>

14
modules/monitoring/application/views/scripts/hosts/show.phtml
View File

@ -31,21 +31,21 @@
<div> <div>
<a href="<?= $rescheduleAllLink ?>"> <a href="<?= $rescheduleAllLink ?>">
<?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('reschedule'); ?>
<?= $this->translate('Reschedule host checks') ?> <?= $this->translate('Reschedule host checks') ?>
</a> </a>
</div> </div>
<div> <div>
<a href="<?= $downtimeAllLink ?>"> <a href="<?= $downtimeAllLink ?>">
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('plug'); ?>
<?= $this->translate('Schedule host downtimes') ?> <?= $this->translate('Schedule host downtimes') ?>
</a> </a>
</div> </div>
<div> <div>
<a href="<?= $processCheckResultAllLink; ?>"> <a href="<?= $processCheckResultAllLink; ?>">
<?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?> <?= $this->icon('reply'); ?>
<?= $this->translate('Submit passive check results'); ?> <?= $this->translate('Submit passive check results'); ?>
</a> </a>
</div> </div>
@ -71,7 +71,7 @@
), ),
$unhandledCount $unhandledCount
) ?>"> ) ?>">
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('plug'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'Schedule downtime for unhandled host problem', 'Schedule downtime for unhandled host problem',
@ -91,7 +91,7 @@
), ),
$unhandledCount $unhandledCount
) ?>"> ) ?>">
<?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('ok'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'Acknowledge unhandled host problem', 'Acknowledge unhandled host problem',
@ -133,7 +133,7 @@
), ),
$inDowntimeCount $inDowntimeCount
) ?>"> ) ?>">
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('plug'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'List %u host currently in downtime', 'List %u host currently in downtime',
@ -158,7 +158,7 @@
), ),
$commentCount $commentCount
) ?>"> ) ?>">
<?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('comment'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'List %u host comment', 'List %u host comment',

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); ?>

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

@ -20,7 +20,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
<div class="box contents"> <div class="box contents">
<?php foreach ($groupInfo['contacts'] as $c): ?> <?php foreach ($groupInfo['contacts'] as $c): ?>
<div class="box entry"> <div class="box entry">
<img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" /> <?= $this->img('/static/gravatar', array('email' => $c->contact_email)); ?>
<a href="<?= $this->href( <a href="<?= $this->href(
'monitoring/show/contact', 'monitoring/show/contact',
array('contact' => $c->contact_name) array('contact' => $c->contact_name)

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

@ -14,7 +14,7 @@
} }
foreach ($contacts as $contact): ?> foreach ($contacts as $contact): ?>
<div class="contact"> <div class="contact">
<img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>" /> <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
<a href="<?= $this->href( <a href="<?= $this->href(
'monitoring/show/contact', 'monitoring/show/contact',
array('contact' => $contact->contact_name) array('contact' => $contact->contact_name)

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): ?>

4
modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
View File

@ -9,8 +9,8 @@
<table class="objectlist"> <table class="objectlist">
<thead> <thead>
<tr> <tr>
<th><?= $this->icon('host', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Host'); ?></th> <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
<th><?= $this->icon('conf', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Service'); ?></th> <th><?= $this->icon('conf'); ?> <?= $this->translate('Service'); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

14
modules/monitoring/application/views/scripts/services/show.phtml
View File

@ -19,21 +19,21 @@
<div> <div>
<a href="<?= $rescheduleAllLink ?>"> <a href="<?= $rescheduleAllLink ?>">
<?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('reschedule'); ?>
<?= $this->translate('Reschedule service checks') ?> <?= $this->translate('Reschedule service checks') ?>
</a> </a>
</div> </div>
<div> <div>
<a href="<?= $downtimeAllLink ?>"> <a href="<?= $downtimeAllLink ?>">
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('plug'); ?>
<?= $this->translate('Schedule service downtimes') ?> <?= $this->translate('Schedule service downtimes') ?>
</a> </a>
</div> </div>
<div> <div>
<a href="<?= $processCheckResultAllLink; ?>"> <a href="<?= $processCheckResultAllLink; ?>">
<?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?> <?= $this->icon('reply'); ?>
<?= $this->translate('Submit passive check results'); ?> <?= $this->translate('Submit passive check results'); ?>
</a> </a>
</div> </div>
@ -59,7 +59,7 @@
), ),
$unhandledCount $unhandledCount
) ?>"> ) ?>">
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('plug'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'Schedule downtime for unhandled service problem', 'Schedule downtime for unhandled service problem',
@ -79,7 +79,7 @@
), ),
$unhandledCount $unhandledCount
) ?>"> ) ?>">
<?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('ok'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'Acknowledge unhandled service problem', 'Acknowledge unhandled service problem',
@ -119,7 +119,7 @@
$inDowntimeCount $inDowntimeCount
), ),
$inDowntimeCount) ?>"> $inDowntimeCount) ?>">
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('plug'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'List %u service currently in downtime', 'List %u service currently in downtime',
@ -143,7 +143,7 @@
), ),
$commentCount $commentCount
) ?>"> ) ?>">
<?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('comment'); ?>
<?= sprintf( <?= sprintf(
$this->translatePlural( $this->translatePlural(
'List %u service comment', 'List %u service comment',

2
modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
View File

@ -36,7 +36,7 @@ if ($object->acknowledged): ?>
} }
?> ?>
<a href="<?= $ackLink ?>" data-base-target="_self"> <a href="<?= $ackLink ?>" data-base-target="_self">
<?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?> <?= $this->translate('Acknowledge') ?> <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
</a> </a>
<?php } else { <?php } else {
echo '&#45;'; echo '&#45;';

2
modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
View File

@ -40,7 +40,7 @@ if ($object->getType() === $object::TYPE_HOST) {
} }
?> ?>
<a href="<?= $reschedule ?>" data-base-target="_self"> <a href="<?= $reschedule ?>" data-base-target="_self">
<?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('reschedule') ?>
<?= $this->translate('Reschedule') ?> <?= $this->translate('Reschedule') ?>
</a> </a>
<?php } // endif ?> <?php } // endif ?>

2
modules/monitoring/application/views/scripts/show/components/command.phtml
View File

@ -22,7 +22,7 @@ $command = array_shift($parts);
); );
} ?> } ?>
<a href="<?= $processCheckResult ?>" data-base-target="_self"> <a href="<?= $processCheckResult ?>" data-base-target="_self">
<?= $this->icon('reply', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('reply') ?>
<?= $this->translate('Process check result') ?> <?= $this->translate('Process check result') ?>
</a> </a>
<?php endif ?> <?php endif ?>

2
modules/monitoring/application/views/scripts/show/components/comments.phtml
View File

@ -16,7 +16,7 @@
} }
?> ?>
<a href="<?= $addCommentLink ?>" data-base-target="_self"> <a href="<?= $addCommentLink ?>" data-base-target="_self">
<?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('comment') ?>
<?= $this->translate('Add comment') ?> <?= $this->translate('Add comment') ?>
</a> </a>
<?php } else { <?php } else {

4
modules/monitoring/application/views/scripts/show/components/contacts.phtml
View File

@ -12,7 +12,7 @@ if (! empty($object->contacts)) {
printf( printf(
"<tr><th>%s</th><td>%s %s</td></tr>\n", "<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Contacts'), $this->translate('Contacts'),
$this->icon('user', null, array('aria-hidden' => 'true')), $this->icon('user'),
implode(', ', $list) implode(', ', $list)
); );
@ -31,7 +31,7 @@ if (! empty($object->contactgroups)) {
printf( printf(
"<tr><th>%s</th><td>%s %s</td></tr>\n", "<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Contactgroups'), $this->translate('Contactgroups'),
$this->icon('users', null, array('aria-hidden' => 'true')), $this->icon('users'),
implode(', ', $list) implode(', ', $list)
); );

2
modules/monitoring/application/views/scripts/show/components/downtime.phtml
View File

@ -16,7 +16,7 @@
} }
?> ?>
<a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self"> <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?> <?= $this->icon('plug') ?>
<?= $this->translate('Schedule downtime') ?> <?= $this->translate('Schedule downtime') ?>
</a> </a>
<?php } else { <?php } else {

2
modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
View File

@ -11,7 +11,7 @@ foreach ($object->hostgroups as $name => $alias) {
printf( printf(
"<tr><th>%s</th><td>%s %s</td></tr>\n", "<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Hostgroups'), $this->translate('Hostgroups'),
$this->icon('host', null, array('aria-hidden' => 'true')), $this->icon('host'),
implode(', ', $list) implode(', ', $list)
); );

2
modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
View File

@ -12,7 +12,7 @@ foreach ($object->servicegroups as $name => $alias) {
printf( printf(
"<tr><th>%s</th><td>%s %s</td></tr>\n", "<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Servicegroups'), $this->translate('Servicegroups'),
$this->icon('services', null, array('aria-hidden' => 'true')), $this->icon('services'),
implode(', ', $list) implode(', ', $list)
); );

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

@ -41,7 +41,7 @@ class AuthenticationPage extends Form
'note', 'note',
'external_note', 'external_note',
array( array(
'value' => $this->translate( 'value' => '<i aria-hidden="true" class="icon-info"></i>' . $this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication ' '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 ' . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
. 'log into Icinga Web 2.' . 'log into Icinga Web 2.'
@ -50,7 +50,7 @@ class AuthenticationPage extends Form
'ViewHelper', 'ViewHelper',
array( array(
'HtmlTag', 'HtmlTag',
array('tag' => 'p', 'class' => 'icon-info info-box') array('tag' => 'p', 'class' => 'info-box')
) )
) )
) )