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

Merge branch 'feature/mute-icons-8360' 

resolves #8360
This commit is contained in:
Johannes Meyer 2015-02-12 13:50:07 +01:00
parent c1ef8318d7 d37129dfed
commit 9427766908
28 changed files with 56 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ if ($notifications->hasMessages()) {
}
}
?></ul>
<div id="logo" data-base-target="_main"><a href="<?= $this->href('/dashboard') ?>"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" /></a>
<div id="logo" data-base-target="_main"><a href="<?= $this->href('/dashboard') ?>"><img aria-hidden="true" src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" /></a>
</div>
</div>

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

@ -1,12 +1,13 @@
<div id="login">
<div class="logo">
<div class="image">
<img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
<img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
</div>
</div>
<div class="form" data-base-target="layout">
<h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
<?php if ($requiresSetup): ?>
<p class="config-note"><?= sprintf(
<p tabindex="0" 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'
@ -17,20 +18,12 @@
'</a>'
); ?></p>
<?php elseif ($requiresExternalAuth): ?>
<p class="info-box"><span class="icon-info"></span><?= $this->translate(
<p tabindex="0" class="info-box"><i aria-hidden="true" class="icon-info"></i><?= $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>
<?php
/* TODO: remove this as soon as notifications and forms are ready */
if (isset($this->errorInfo)): ?>
<div class="error">
<?= $this->errorInfo ?>
</div>
<?php endif ?>
<?= $this->form ?>
<div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
<?= $this->form ?>
<div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
</div>
</div>

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

@ -4,7 +4,7 @@
<div class="content" data-base-target="_next">
<p>
<a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
<?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?>
</a>
</p>
<?= $form; ?>

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

@ -4,7 +4,7 @@
<div class="content" data-base-target="_next">
<p>
<a href="<?= $this->href('/config/createresource'); ?>">
<?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
</a>
</p>
<table class="action">

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

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

2
library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
View File

@ -16,7 +16,7 @@ class ForeignMenuItemRenderer implements MenuItemRenderer {
return sprintf(
'<a href="%s" target="_self">%s%s<span></span></a>',
$menu->getUrl() ?: '#',
$menu->getIcon() ? '<img src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
$menu->getIcon() ? '<img aria-hidden="true" src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
htmlspecialchars($menu->getTitle())
);
}

4
library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
View File

@ -80,7 +80,7 @@ class MonitoringMenuItemRenderer implements MenuItemRenderer {
}
if ($menu->getIcon() && strpos($menu->getIcon(), '.') === false) {
return sprintf(
'%s <a href="%s" class="icon-%s">%s</a>',
'%s <a href="%s"><i aria-hidden="true" class="icon-%s"></i>%s</a>',
$badge,
$menu->getUrl() ?: '#',
$menu->getIcon(),
@ -92,7 +92,7 @@ class MonitoringMenuItemRenderer implements MenuItemRenderer {
'%s<a href="%s">%s%s<span></span></a>',
$badge,
$menu->getUrl() ?: '#',
$menu->getIcon() ? '<img src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
$menu->getIcon() ? '<img aria-hidden="true" src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
htmlspecialchars($menu->getTitle())
);
}

6
library/Icinga/Web/MenuRenderer.php
View File

@ -115,7 +115,7 @@ class MenuRenderer extends RecursiveIteratorIterator
}
if ($child->getIcon() && strpos($child->getIcon(), '.') === false) {
return sprintf(
'<a href="%s" class="icon-%s">%s</a>',
'<a href="%s"><i aria-hidden="true" class="icon-%s"></i>%s</a>',
$child->getUrl() ?: '#',
$child->getIcon(),
htmlspecialchars($child->getTitle())
@ -124,7 +124,9 @@ class MenuRenderer extends RecursiveIteratorIterator
return sprintf(
'<a href="%s">%s%s</a>',
$child->getUrl() ?: '#',
$child->getIcon() ? '<img src="' . Url::fromPath($child->getIcon()) . '" class="icon" /> ' : '',
$child->getIcon()
? '<img aria-hidden="true" src="' . Url::fromPath($child->getIcon()) . '" class="icon" /> '
: '',
htmlspecialchars($child->getTitle())
);
}

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

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

3
modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
View File

@ -35,7 +35,8 @@ class CheckNowCommandForm extends ObjectsCommandForm
'ignore' => true,
'type' => 'submit',
'value' => $this->translate('Check now'),
'label' => '<i class="icon-reschedule"></i> ' . $this->translate('Check now'),
'label' => '<i aria-hidden="true" class="icon-reschedule"></i> '
. $this->translate('Check now'),
'decorators' => array('ViewHelper'),
'escape' => false,
'class' => 'link-like'

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

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

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

@ -6,7 +6,7 @@
<div class="content" data-base-target="_next">
<p>
<a href="<?= $this->href('/monitoring/config/createbackend'); ?>">
<?= $this->icon('plus'); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
</a>
</p>
<table class="action">
@ -38,7 +38,7 @@
<h1><?= $this->translate('Monitoring Instances') ?></h1>
<p>
<a href="<?= $this->href('/monitoring/config/createinstance'); ?>">
<?= $this->icon('plus'); ?> <?= $this->translate('Create New Instance'); ?>
<?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Instance'); ?>
</a>
</p>
<table class="action">

28
modules/monitoring/application/views/scripts/config/show-configuration.phtml
View File

@ -1,28 +0,0 @@
<div class="alert alert-error">
<h4><i><i class="icinga-icon-error"></i> </i> Saving &quot;<?= $this->escape($this->file); ?>&quot; failed</h4>
<br/>
<p>
Your <?= $this->escape($this->file); ?> configuration couldn't be stored (error: "<?= $this->exceptionMessage; ?>").<br/>
This could have one or more of the following reasons:
</p>
<ul>
<li>You don't have file-system permissions to write to the <?= $this->escape($this->file); ?> file</li>
<li>Something went wrong while writing the file</li>
<li>There's an application error preventing you from persisting the configuration</li>
</ul>
</div>
<p>
Details can be seen in your application log (if you don't have access to this file, call your administrator in this case).
<br/>
In case you can access the configuration file (config/<?= $this->escape($this->file); ?>) by yourself, you can open it and
insert the config manually:
</p>
<p>
<pre>
<code>
<?= $this->escape($this->iniConfigurationString); ?>
</code>
</pre>
</p>

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

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

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

@ -59,7 +59,7 @@
<?= $this->link()->host($comment->host, $comment->host_display_name) ?>
<?php endif ?>
<br>
<?= $this->icon('comment'); ?> <?= isset($comment->author)
<?= $this->icon('comment', null, array('aria-hidden' => 'true')); ?> <?= isset($comment->author)
? '[' . $comment->author . '] '
: '';
?><?= $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">
<?php foreach ($groupInfo['contacts'] as $c): ?>
<div class="box entry">
<img src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" />
<img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" />
<a href="<?= $this->href(
'monitoring/show/contact',
array('contact' => $c->contact_name)

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

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

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

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

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

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

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

@ -12,7 +12,7 @@ if (! empty($object->contacts)) {
printf(
"<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Contacts'),
$this->icon('user'),
$this->icon('user', null, array('aria-hidden' => 'true')),
implode(', ', $list)
);
@ -31,7 +31,7 @@ if (! empty($object->contactgroups)) {
printf(
"<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Contactgroups'),
$this->icon('users'),
$this->icon('users', null, array('aria-hidden' => 'true')),
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">
<?= $this->icon('plug') ?>
<?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
<?= $this->translate('Schedule downtime') ?>
</a>
<?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(
"<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Hostgroups'),
$this->icon('host'),
$this->icon('host', null, array('aria-hidden' => 'true')),
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(
"<tr><th>%s</th><td>%s %s</td></tr>\n",
$this->translate('Servicegroups'),
$this->icon('services'),
$this->icon('services', null, array('aria-hidden' => 'true')),
implode(', ', $list)
);

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

@ -129,9 +129,9 @@
p.info-box {
width: 50%;
height: 2.2em;
margin: 0 auto 2.5em;
margin: 2em auto 2.5em;
span.icon-info {
i.icon-info {
float: left;
height: 100%;
}