From fdcad4928ef62c5569ef7b746c8862d1f0b93eb3 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 15:06:37 +0100
Subject: [PATCH 01/12] Tinystatesummary: Adjust styles for summaries and
 headers

refs #7976
---
 .../list/components/hostssummary.phtml        |  6 +--
 .../list/components/servicesummary.phtml      | 10 ++--
 .../partials/host/servicesummary.phtml        | 10 ++--
 modules/monitoring/public/css/module.less     | 14 +++---
 public/css/icinga/defaults.less               | 48 +++++++++++--------
 5 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 2e19ff352..64bd63165 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -4,9 +4,7 @@ use Icinga\Web\Url;
 
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-
-?>
-<h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
     <?= $this->qlink(sprintf($this->translate('%s hosts:'), $this->stats->hosts_total), $selfUrl); ?>
   <span class="badges">
     <?php if($this->stats->hosts_up): ?>
@@ -81,4 +79,4 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     </span>
     <?php endif; ?>
   </span>
-</h1>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index c870b09b0..11d7b5d07 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -1,10 +1,10 @@
 <?php
 
 use Icinga\Web\Url;
+
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-
-?><h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
 <?= $this->qlink(sprintf($this->translate('%s services:'), $this->stats->services_total), $selfUrl) ?>
 <span class="badges">
 <?php if ($this->stats->services_ok): ?>
@@ -15,9 +15,7 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
 )  ?></span>
 <?php endif ?>
-
 <?php
-
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
     $pre = 'services_' . $state;
     if ($this->stats->$pre) {
@@ -70,7 +68,6 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         echo "</span>\n";
     }
 }
-
 ?>
 <?php if ($this->stats->services_pending): ?>
  <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 99))->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
@@ -81,5 +78,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 )  ?></span>
 <?php endif ?>
 </span>
-</h1>
-
+</div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index 641dd026a..d45415c72 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -1,11 +1,10 @@
 <?php
 
 use Icinga\Web\Url;
+
 $selfUrl = Url::fromPath('monitoring/show/services', array('host' => $this->object->host_name));
 $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
-
-?>
-<h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
 <?php if ($object->stats->services_total > 0): ?>
 <?= $this->qlink(sprintf($this->translatePlural('%d configured service:', '%d configured services:', $object->stats->services_total), $object->stats->services_total), $selfUrl) ?>
 <?php else: ?>
@@ -21,7 +20,6 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 )  ?></span>
 <?php endif ?>
 <?php
-
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
     $pre = 'services_' . $state;
     if ($object->stats->$pre) {
@@ -74,7 +72,6 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         echo "</span>\n";
     }
 }
-
 ?>
 <?php if ($object->stats->services_pending): ?>
  <span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
@@ -85,5 +82,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 )  ?></span>
 <?php endif ?>
 </span>
-</h1>
-
+</div>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index b0793ee8d..387df892b 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -91,19 +91,19 @@ div.contacts div.notification-periods {
   margin-top: 0.5em;
 }
 
-h1.tinystatesummary .badges {
+div.tinystatesummary {
+  .page-header();
+  font-size: 1em;
+  .badges {
     display: inline-block;
     margin-bottom: 4px;
     margin-left: 1em;
-}
-
-h1.tinystatesummary .state > a {
+  }
+  .state > a {
     color: white;
     font-size: 0.8em;
     padding: 2px 5px;
-}
-
-h1.tinystatesummary .state.handled a {
+  }
 }
 
 /* State badges */
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index d3c718db2..3dc277300 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -24,7 +24,20 @@
 @colorPending: #77aaff;
 @colorInvalid: #999;
 
+/* Mixins */
 
+.page-header(@borderSize: 2px; @fontSize: 2em; @textColor: @colorTextDarkDefault) {
+  font-size: @fontSize;
+  color: @textColor;
+  border-bottom: @borderSize solid @colorPetrol;
+  a {
+    text-decoration: none;
+    color: inherit;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
 
 /*** Base rules ***/
 * {
@@ -76,9 +89,7 @@ a:hover {
 
 /* W3C Recommendation <http://www.w3.org/TR/CSS21/sample.html> (except h4) */
 h1 {
-    font-size:    2em;
-    color: @colorTextDefault;
-    border-bottom: 2px solid @colorPetrol;
+    .page-header();
 }
 
 h2 {
@@ -87,19 +98,16 @@ h2 {
 }
 
 h3 {
-    font-size: 1.17em;
-    color: @colorTextDefault;
-    border-bottom: 1px solid @colorPetrol;
+  .page-header(1px, 1.17em);
 }
 
 h4 {
-    font-size:    1em;
-    color: @colorPetrol;
+  font-size:    1em;
+  color: @colorPetrol;
 }
 
 h5 {
-    font-size:  .83em;
-    border-bottom: 1px solid @colorPetrol;
+  .page-header(1px, .83em);
 }
 
 h6 {
@@ -107,17 +115,19 @@ h6 {
     color: @colorPetrol;
 }
 
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
-  text-decoration: none;
-  color: inherit;
-}
+h1, h2, h3, h4, h5, h6 {
+  a {
+    text-decoration: none;
+    color: inherit;
 
-h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {
-  text-decoration: underline;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
 }
 
 button {
-    font-family: inherit;
+  font-family: inherit;
 }
 
 #fontsize-calc {
@@ -128,6 +138,4 @@ button {
   position: absolute;
   top: -2em;
 }
-/*** END of Base rules */
-
-
+/*** END of Base rules */
\ No newline at end of file

From f586714f022e62a73129b9689841ff34ba7b5df9 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 16:14:07 +0100
Subject: [PATCH 02/12] Skip Links: Select a more useful object

Skip links can select a container and find a usable element inside. Adapt
project jquery variable style.

refs #7976
---
 public/css/icinga/menu.less |  5 ++++-
 public/js/icinga/events.js  | 21 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 873e6abb0..6653a250a 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -298,5 +298,8 @@ a:focus {
   }
 }
 .skip-links-inline {
-  margin-top: -3.5em;
+  margin-top: -4em;
+  ul > li > a {
+    width: 16em;
+  }
 }
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index cae835351..57c365649 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -335,14 +335,25 @@
         },
 
         handleAnchor: function(query) {
-            var element = $(query);
-            if (element.length > 0) {
+            var $element = $(query);
+            if ($element.length > 0) {
+                // Try to find the first header. It is more pleasant to users
+                // to select the header instead a container
+                var $header = $element.find(':header:first');
+                if ($header.length > 0) {
+                    $element = $header;
+                } else {
+                    var $input = $element.find(':header:first');
+                    if ($input.length > 0) {
+                        $element = $input
+                    }
+                }
                 // If we want to focus an element which has no tabindex
                 // add one that we can focus is
-                if (element.prop('tabindex') < 0) {
-                    element.prop('tabindex', 0);
+                if ($element.prop('tabindex') < 0) {
+                    $element.prop('tabindex', 0);
                 }
-                element.focus();
+                $element.focus();
             }
         },
 

From 513de11f20f993d4e434a73375ae015685980e3e Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 16:43:08 +0100
Subject: [PATCH 03/12] Header: Application config and authentication

refs #7976
---
 .../views/scripts/config/application.phtml    | 14 ++++++-----
 .../config/authentication/create.phtml        | 20 ++++++++++------
 .../config/authentication/modify.phtml        | 10 ++++++--
 .../config/authentication/remove.phtml        | 10 ++++++--
 .../config/authentication/reorder.phtml       | 24 ++++++++++++++++++-
 5 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/application.phtml
index 1ffd120b4..c34aa8349 100644
--- a/application/views/scripts/config/application.phtml
+++ b/application/views/scripts/config/application.phtml
@@ -1,11 +1,13 @@
 <div class="controls" data-base-target="_main">
-<?= $this->tabs->render($this); ?>
+  <?= $this->tabs->render($this); ?>
 </div>
 
 <div class="content">
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?= $this->form ?>
+  <h1 tabindex="0" id="application-configuration">
+    <?= t('Generic Configuration'); ?>
+  </h1>
+  <?php if (isset($this->messageBox)): ?>
+    <?= $this->messageBox->render() ?>
+  <?php endif ?>
+  <?= $this->form ?>
 </div>
diff --git a/application/views/scripts/config/authentication/create.phtml b/application/views/scripts/config/authentication/create.phtml
index 427758292..5f840aea0 100644
--- a/application/views/scripts/config/authentication/create.phtml
+++ b/application/views/scripts/config/authentication/create.phtml
@@ -1,10 +1,16 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Create New Authentication Backend'); ?></h4>
-<p>
-  <?= $this->translate(
-    'Create a new backend for authenticating your users. This backend will be added at the end of your authentication order.'
-  ); ?>
-</p>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="authentication-create">
+        <?= $this->translate('Create New Authentication Backend'); ?>
+    </h1>
+    <p>
+        <?= $this->translate(
+            'Create a new backend for authenticating your users. This backend will be added at the end of your authentication order.'
+        ); ?>
+    </p>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/authentication/modify.phtml
index b01d7095a..5aeee7d12 100644
--- a/application/views/scripts/config/authentication/modify.phtml
+++ b/application/views/scripts/config/authentication/modify.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Edit Backend'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="authentication-modify">
+        <?= $this->translate('Edit Backend'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml
index 424aff9a0..cdd615ac7 100644
--- a/application/views/scripts/config/authentication/remove.phtml
+++ b/application/views/scripts/config/authentication/remove.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Remove Backend'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="authentication-remove">
+        <?= $this->translate('Remove Backend'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index 83f285285..a31062025 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -2,10 +2,32 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
+  <h1 tabindex="0" id="authentication-reorder">
+    <?= t('Authentication Configuration'); ?>
+  </h1>
+  <div class="skip-links skip-links-inline">
+    <nav>
+      <ul>
+        <li>
+          <a tabindex="0" href="#authentication-reorder-form">
+            <?= t('Skip To Authentication Reorder Form'); ?>
+          </a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <h2 tabindex="0" id="authentication-new-backend" class="sr-only">
+    <?= t('New Authentication Backend'); ?>
+  </h2>
   <p>
     <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
       <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?>
     </a>
   </p>
-  <?= $form; ?>
+  <h2 tabindex="0" id="authentication-reorder" class="sr-only">
+    <?= t('Reorder Authentication Backends'); ?>
+  </h2>
+  <div id="authentication-reorder-form">
+    <?= $form; ?>
+  </div>
 </div>

From 069e86c2fd1ea692a3af513ad454c097a49e428e Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 17:10:38 +0100
Subject: [PATCH 04/12] Header: Add header and skip links to resource
 configuration

refs #7976
---
 .../views/scripts/config/resource.phtml       | 26 ++++++++++++++++---
 .../scripts/config/resource/create.phtml      | 12 ++++++---
 .../scripts/config/resource/modify.phtml      | 10 +++++--
 .../scripts/config/resource/remove.phtml      | 10 +++++--
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 384993f52..013dfed19 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,18 +2,38 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
+  <h1 tabindex="0" id="resource-index">
+    <?= t('Resource Configuration'); ?>
+  </h1>
+  <div class="skip-links skip-links-inline">
+    <nav>
+      <ul>
+        <li>
+          <a tabindex="0" href="#resource-edit-table">
+            <?= t('Skip To Existing Resources'); ?>
+          </a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <h2 tabindex="0" id="resource-new-resource" class="sr-only">
+    <?= t('Create New Resource'); ?>
+  </h2>
   <p>
     <a href="<?= $this->href('/config/createresource'); ?>">
       <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
-  <table class="action">
+  <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
+    <?= t('Edit Existing Resources'); ?>
+  </h2>
+  <table class="action" id="resource-edit-table">
     <thead>
       <th><?= $this->translate('Resource'); ?></th>
       <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
     </thead>
     <tbody>
-<?php foreach ($this->resources as $name): ?>
+    <?php foreach ($this->resources as $name): ?>
       <tr>
         <td>
           <a href="<?= $this->href('config/editresource', array('resource' => $name)); ?>">
@@ -26,7 +46,7 @@
           </a>
         </td>
       </tr>
-<?php endforeach; ?>
+    <?php endforeach; ?>
     </tbody>
   </table>
 </div>
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index 0750a5aa9..c70bd4779 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -1,6 +1,12 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Create A New Resource'); ?></h4>
-<p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="resource-create">
+        <?= $this->translate('Create A New Resource'); ?>
+    </h1>
+    <p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index d355aeb4c..48255261b 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Edit Existing Resource'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="resource-edit">
+        <?= $this->translate('Edit Existing Resource'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml
index 14829ab40..ad5ed59cb 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Remove Existing Resource'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="resource-remove">
+        <?= $this->translate('Remove Existing Resource'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file

From 9bf8488f68aacbe8ad5937b002fff97ec79c33b5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Feb 2015 09:59:34 +0100
Subject: [PATCH 05/12] js: Remove out-commented function hrefIsHashtag from
 events.js

---
 public/js/icinga/events.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 57c365649..528899dcb 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -517,14 +517,6 @@
             return $target;
         },
 
-    /*
-        hrefIsHashtag: function(href) {
-            // WARNING: IE gives full URL :(
-            // Also it doesn't support negativ indexes in substr
-            return href.substr(href.length - 1, 1) == '#';
-        },
-    */
-
         unbindGlobalHandlers: function () {
             $.each(self.icinga.behaviors, function (name, behavior) {
                 behavior.unbind($(document));

From cd11cf3469f4317e6b18948b414c0c9b9bb23637 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 11:45:20 +0100
Subject: [PATCH 06/12] Fix close button: Test the anchor if it belongs to us

---
 public/js/icinga/events.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 528899dcb..3fbb9cf79 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -415,7 +415,8 @@
             event.preventDefault();
 
             // This is an anchor only
-            if (href.substr(0, 1) === '#' && href.substr(1, 1) !== '!') {
+            if (href.substr(0, 1) === '#' && href.length > 1
+                && href.substr(1, 1) !== '!') {
                 self.handleAnchor(href);
                 return;
             }

From 97f5018247027fd0c3894b7114d3f9e251774200 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:23:54 +0100
Subject: [PATCH 07/12] WCAG/1.1.1: Fix example for accessible icon fonts to
 work with NVDA too

refs #8358
---
 doc/accessibility/ifont.html | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/doc/accessibility/ifont.html b/doc/accessibility/ifont.html
index 481cbff71..32f122127 100644
--- a/doc/accessibility/ifont.html
+++ b/doc/accessibility/ifont.html
@@ -10,22 +10,9 @@
         .icon-star:before {
             content: "★";
         }
-        .sr-only {
-            border: 0;
-            clip: rect(0 0 0 0);
-            height: 1px;
-            margin: -1px;
-            overflow: hidden;
-            padding: 0;
-            position: absolute;
-            width: 1px;
-        }
     </style>
 </head>
 <body>
-<span tabindex="0">
-    <i class="icon-star" aria-hidden="true"></i>
-    <span class="sr-only">Top rated article</span>
-</span>
+    <i role="img" class="icon-star" aria-label="Top rated article" title="Top rated article"></i>
 </body>
-</html>
+</html>
\ No newline at end of file

From 243bc6ec0cdcddc6363533a28d2d62055e32740f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:26:03 +0100
Subject: [PATCH 08/12] Make the view helpers qlink, img and icon handle
 aria-tags automatically

refs #8358
refs #8360
---
 library/Icinga/Web/View/helpers/url.php | 63 +++++++++++++++----------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index 1f1450b5e..9fa5d4a69 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -27,55 +27,68 @@ $this->addHelperFunction('url', function ($path = null, $params = null) {
     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(
         '<a href="%s"%s>%s</a>',
         $view->url($url, $params),
         $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)) {
         $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(
         '<img src="%s"%s />',
-        $view->url($url),
+        $view->url($url, $params),
         $view->propertiesToString($properties)
     );
 });
 
 $this->addHelperFunction('icon', function ($img, $title = null, array $properties = array()) use ($view) {
-    $isClass = strpos($img, '.') === false;
-    $class = null;
-
-    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;
+    if (strpos($img, '.') !== false) {
+        if (array_key_exists('class', $properties)) {
+            $properties['class'] .= ' icon';
         } 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);
     }
+
+    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) {

From 5321c2f9e5bd7ae23a5b5ea5d8d1492f99662c63 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:52:42 +0100
Subject: [PATCH 09/12] Mute icons properly using the new automatic mechanisms
 of our view helpers

refs #8360
---
 application/layouts/scripts/pdf.phtml              |  2 +-
 .../views/scripts/authentication/login.phtml       |  4 ++--
 .../scripts/config/authentication/reorder.phtml    |  2 +-
 application/views/scripts/config/resource.phtml    |  2 +-
 .../Icinga/Web/Form/Decorator/NoScriptApply.php    |  2 +-
 library/Icinga/Web/Widget/FilterEditor.php         |  2 +-
 library/Icinga/Web/Widget/Tab.php                  |  4 ++--
 library/Icinga/Web/Widget/Tabs.php                 |  2 +-
 .../views/scripts/alertsummary/index.phtml         |  6 +++---
 .../application/views/scripts/config/index.phtml   |  4 ++--
 .../application/views/scripts/hosts/show.phtml     | 14 +++++++-------
 .../views/scripts/list/contactgroups.phtml         |  2 +-
 .../application/views/scripts/list/contacts.phtml  |  2 +-
 .../partials/command/objects-command-form.phtml    |  4 ++--
 .../application/views/scripts/services/show.phtml  | 14 +++++++-------
 .../scripts/show/components/acknowledgement.phtml  |  2 +-
 .../scripts/show/components/checkstatistics.phtml  |  2 +-
 .../views/scripts/show/components/command.phtml    |  2 +-
 .../views/scripts/show/components/comments.phtml   |  2 +-
 .../views/scripts/show/components/contacts.phtml   |  4 ++--
 .../views/scripts/show/components/downtime.phtml   |  2 +-
 .../views/scripts/show/components/hostgroups.phtml |  2 +-
 .../scripts/show/components/servicegroups.phtml    |  2 +-
 .../setup/application/forms/AuthenticationPage.php |  4 ++--
 24 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/application/layouts/scripts/pdf.phtml b/application/layouts/scripts/pdf.phtml
index 38c9bdc2c..c5b28ecbf 100644
--- a/application/layouts/scripts/pdf.phtml
+++ b/application/layouts/scripts/pdf.phtml
@@ -31,7 +31,7 @@ if ( isset($pdf) )
 }
 
 </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">
   <table>
     <tr>
diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index f40f5c4e0..4b1de3961 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -7,7 +7,7 @@
   <div class="form" data-base-target="layout">
     <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
     <?php if ($requiresSetup): ?>
-    <p tabindex="0" class="config-note"><?= sprintf(
+    <p 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'
@@ -18,7 +18,7 @@
       '</a>'
     ); ?></p>
     <?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.'
       . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index a31062025..ad0d0ebc5 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -21,7 +21,7 @@
   </h2>
   <p>
     <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>
   </p>
   <h2 tabindex="0" id="authentication-reorder" class="sr-only">
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 013dfed19..12c9cf6ce 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -21,7 +21,7 @@
   </h2>
   <p>
     <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>
   </p>
   <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index 2ea810e16..fbc96756b 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -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', null, array('aria-hidden' => 'true')) . '&nbsp;' . t('Apply')
+                . Icinga::app()->getViewRenderer()->view->icon('refresh.png') . '&nbsp;' . t('Apply')
                 . '</button></noscript>';
         }
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 38eecb722..999a825ac 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -669,7 +669,7 @@ class FilterEditor extends AbstractWidget
             . '" title="'
             . $title
             . '">'
-            . '<i class="icon-filter"></i>'
+            . '<i aria-hidden="true" class="icon-filter"></i>'
             . '</a>';
     }
 
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 2d24d5f40..143c3e552 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -215,9 +215,9 @@ class Tab extends AbstractWidget
 
         if ($this->icon !== null) {
             if (strpos($this->icon, '.') === false) {
-                $caption = $view->icon($this->icon, null, array('aria-hidden' => 'true')) . $caption;
+                $caption = $view->icon($this->icon) . $caption;
             } 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) {
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 9df556f65..56bd3404c 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -33,7 +33,7 @@ EOT;
      */
     private $dropdownTpl = <<< 'EOT'
 <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">
     {TABS}
   </ul>
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index b71456ab6..dbfff6433 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -42,11 +42,11 @@
 
             <span>
                 <?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'): ?>
-                    <?= $this->icon('right-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('right-open'); ?>
                 <?php else: ?>
-                    <?= $this->icon('down-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('down-open'); ?>
                 <?php endif; ?>
             </span>
         </div>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index a0f922ba4..b1729f9b1 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -6,7 +6,7 @@
 <div class="content" data-base-target="_next">
   <p>
     <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>
   </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', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Instance'); ?>
+      <?= $this->icon('plus'); ?> <?= $this->translate('Create New Instance'); ?>
     </a>
   </p>
   <table class="action">
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 0da62ad77..9a7c850f2 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -31,21 +31,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reschedule'); ?>
                 <?= $this->translate('Reschedule host checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= $this->translate('Schedule host downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
+                <?= $this->icon('reply'); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -71,7 +71,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled host problem',
@@ -91,7 +91,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('ok'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled host problem',
@@ -133,7 +133,7 @@
                        ),
                        $inDowntimeCount
                    ) ?>">
-                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('plug'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host currently in downtime',
@@ -158,7 +158,7 @@
                        ),
                        $commentCount
                    ) ?>">
-                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('comment'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host comment',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 99d070c31..f32a22815 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -20,7 +20,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
             <div class="box contents">
 <?php foreach ($groupInfo['contacts'] as $c): ?>
                 <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(
                         'monitoring/show/contact',
                         array('contact' => $c->contact_name)
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 292617493..4623a5027 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -14,7 +14,7 @@
     }
     foreach ($contacts as $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(
                 'monitoring/show/contact',
                 array('contact' => $contact->contact_name)
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index a92302775..da58fc9cb 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -9,8 +9,8 @@
     <table class="objectlist">
         <thead>
             <tr>
-                <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>
+                <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+                <th><?= $this->icon('conf'); ?> <?= $this->translate('Service'); ?></th>
             </tr>
         </thead>
         <tbody>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 44951735a..8f818627a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -19,21 +19,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reschedule'); ?>
                 <?= $this->translate('Reschedule service checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= $this->translate('Schedule service downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
+                <?= $this->icon('reply'); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -59,7 +59,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled service problem',
@@ -79,7 +79,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('ok'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled service problem',
@@ -119,7 +119,7 @@
                         $inDowntimeCount
                     ),
                 $inDowntimeCount) ?>">
-                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('plug'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service currently in downtime',
@@ -143,7 +143,7 @@
                     ),
                     $commentCount
                 ) ?>">
-                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('comment'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service comment',
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index c5c2a5667..8da35590f 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -36,7 +36,7 @@ if ($object->acknowledged): ?>
                 }
             ?>
             <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>
             <?php } else {
                 echo '&#45;';
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 5545790ab..ec0c2792a 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -40,7 +40,7 @@ if ($object->getType() === $object::TYPE_HOST) {
           }
       ?>
       <a href="<?= $reschedule ?>" data-base-target="_self">
-          <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+          <?= $this->icon('reschedule') ?>
           <?= $this->translate('Reschedule') ?>
       </a>
       <?php } // endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 1041b7ff6..a74b5b884 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -22,7 +22,7 @@ $command = array_shift($parts);
                 );
             } ?>
             <a href="<?= $processCheckResult ?>" data-base-target="_self">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reply') ?>
                 <?= $this->translate('Process check result') ?>
             </a>
         <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 9973ff037..a6503a70b 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $addCommentLink ?>" data-base-target="_self">
-            <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+            <?= $this->icon('comment') ?>
             <?= $this->translate('Add comment') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index 68e6423ff..50b173381 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -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', null, array('aria-hidden' => 'true')),
+        $this->icon('user'),
         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', null, array('aria-hidden' => 'true')),
+        $this->icon('users'),
         implode(', ', $list)
     );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index f838b3d61..4aa1e21c1 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
-            <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+            <?= $this->icon('plug') ?>
             <?= $this->translate('Schedule downtime') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index 3a41f0cd8..165df627a 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -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', null, array('aria-hidden' => 'true')),
+    $this->icon('host'),
     implode(', ', $list)
 );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index 01de6d71c..50b71d839 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -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', null, array('aria-hidden' => 'true')),
+    $this->icon('services'),
     implode(', ', $list)
 );
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index b55dcff10..d7c26d460 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -41,7 +41,7 @@ class AuthenticationPage extends Form
                 'note',
                 'external_note',
                 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 '
                         . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
                         . 'log into Icinga Web 2.'
@@ -50,7 +50,7 @@ class AuthenticationPage extends Form
                         'ViewHelper',
                         array(
                             'HtmlTag',
-                            array('tag' => 'p', 'class' => 'icon-info info-box')
+                            array('tag' => 'p', 'class' => 'info-box')
                         )
                     )
                 )

From 27cb5e24db8f2837ffd1883b741fc72c2fd5ac42 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:53:48 +0100
Subject: [PATCH 10/12] Ensure that all standalone icons have proper labels

refs #8358
---
 .../application/views/scripts/list/comments.phtml           | 6 +++---
 .../application/views/scripts/list/downtimes.phtml          | 6 +++---
 .../monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../application/views/scripts/list/notifications.phtml      | 4 ++--
 .../application/views/scripts/list/services.phtml           | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 7d8fe4646..6f49bf4a8 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -50,16 +50,16 @@
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
-          <?= $this->icon('service') ?>
+          <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
               $comment->service, $comment->service_display_name, $comment->host, $comment->host_display_name
           ) ?>
         <?php else: ?>
-          <?= $this->icon('host') ?>
+          <?= $this->icon('host', $this->translate('Host')); ?>
           <?= $this->link()->host($comment->host, $comment->host_display_name) ?>
         <?php endif ?>
           <br>
-          <?= $this->icon('comment', null, array('aria-hidden' => 'true')); ?> <?= isset($comment->author)
+          <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
             ? '[' . $comment->author . '] '
             : '';
           ?><?= $this->escape($comment->comment); ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index eaf4b7f8e..1fbaa713f 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -55,16 +55,16 @@ use Icinga\Module\Monitoring\Object\Service;
         </td>
         <td>
         <?php if ($isService): ?>
-          <?= $this->icon('service') ?>
+          <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
               $downtime->service, $downtime->service_display_name, $downtime->host, $downtime->host_display_name
           ) ?>
         <?php else: ?>
-          <?= $this->icon('host') ?>
+          <?= $this->icon('host', $this->translate('Host')); ?>
           <?= $this->link()->host($downtime->host, $downtime->host_display_name) ?>
         <?php endif ?>
           <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>
           <small>
         <?php if ($downtime->is_flexible): ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 07410ddc7..b9fa25975 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -74,7 +74,7 @@ if ($hosts->count() === 0) {
     }
 
     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' : '' ?>">
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 44f33851f..9cc5f724b 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -42,7 +42,7 @@ use Icinga\Module\Monitoring\Object\Service;
             </td>
             <td style="font-size: 0.8em">
                 <?php if ($isService): ?>
-                    <?= $this->icon('service') ?>
+                    <?= $this->icon('service', $this->translate('Service')); ?>
                     <?= $this->link()->service(
                         $notification->service,
                         $notification->service_display_name,
@@ -50,7 +50,7 @@ use Icinga\Module\Monitoring\Object\Service;
                         $notification->host_display_name
                     ) ?>
                 <?php else: ?>
-                    <?= $this->icon('host') ?>
+                    <?= $this->icon('host', $this->translate('Host')); ?>
                     <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 4cb073fc3..e8d39c7c3 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -90,7 +90,7 @@ foreach ($services as $service):
         <?php endif ?>
 
         <?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 if (!$service->service_active_checks_enabled): ?>

From 936bfd43b022b785cee82e1c6f0ea7633bfb2899 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 16 Feb 2015 10:57:31 +0100
Subject: [PATCH 11/12] Skip Links: Remove logo focus and move links into the
 menu

---
 application/layouts/scripts/body.phtml        | 21 +++----------------
 .../layouts/scripts/parts/navigation.phtml    |  8 +++++++
 public/css/icinga/menu.less                   |  2 +-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 9f0b78ce9..03c0f5905 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -7,22 +7,6 @@ use Icinga\Authentication\Manager as Auth;
 
 if (Auth::getInstance()->isAuthenticated()): ?>
  <div id="header">
-   <div class="skip-links">
-     <nav>
-       <h1 class="sr-only"><?= t('Accessibility Skip Links'); ?></h1>
-       <ul>
-         <li>
-           <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
-         </li>
-         <li>
-           <a tabindex="0" href="#search"><?= t('Skip to Search'); ?></a>
-         </li>
-         <li>
-           <a tabindex="0" href="#navigation"><?= t('Skip to Navigation'); ?></a>
-         </li>
-       </ul>
-     </nav>
-   </div>
    <ul id="notifications"><?php
 
 $moduleName = $this->layout()->moduleName;
@@ -44,8 +28,9 @@ if ($notifications->hasMessages()) {
     }
 }
    ?></ul>
-   <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 id="logo" data-base-target="_main">
+           <img aria-hidden="true" src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" />
+   </div>
  </div>
 
 <?php if (!$this->layout()->isIframe): ?>
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index dc56b9199..1a3c6dff9 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -10,6 +10,14 @@ if (! $this->auth()->isAuthenticated()) {
 }
 
 ?>
+<div class="skip-links">
+    <h1 class="sr-only"><?= t('Accessibility Skip Links'); ?></h1>
+    <ul>
+        <li>
+            <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
+        </li>
+    </ul>
+</div>
 <div  id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container"
       data-icinga-url="<?= $this->href('layout/menu') ?>"  data-icinga-refresh="15">
     <?= $this->partial(
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 6653a250a..dd8dbe07b 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -285,7 +285,7 @@ a:focus {
         display: block;
         left: -999em;
         width: 10.4em;
-        top: 0.4em;
+        top: 0em;
         padding: 0.8em;
         background-color: white;
         z-index: 4;

From 2dea398f3b666a94b430c433e4cf1190949e8644 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 11:02:09 +0100
Subject: [PATCH 12/12] Mute all icons that are part of an anchor and add
 simple labels to such anchors

The labels I've added are probably just of temporary nature as it's not
defined yet how to handle link labels properly for screen readers. What
is sure is that all icons that are part of a link are not important for the
meaning of it as this is expressed by the link itself.

refs #8360
refs #8358
---
 .../views/scripts/config/modules.phtml        | 29 +++++++-----
 .../views/scripts/config/resource.phtml       | 24 +++++++---
 .../views/scripts/dashboard/settings.phtml    | 22 +++++----
 .../scripts/form/reorder-authbackend.phtml    | 46 +++++++++++++++----
 application/views/scripts/roles/index.phtml   | 14 +++---
 .../views/scripts/config/index.phtml          | 40 +++++++++++-----
 6 files changed, 120 insertions(+), 55 deletions(-)

diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index ed5a2426c..01fc1c48d 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -10,17 +10,24 @@
   <?php foreach ($modules as $module): ?>
     <tr>
       <td>
-      <?php if ($module->enabled): ?>
-      <?= $this->icon('thumbs-up', $this->translate('Module is enabled')) ?>
-      <?php else: ?>
-      <?= $this->icon('thumbs-down', $this->translate('Module is disabled')) ?>
-      <?php endif ?>
-        <a href="<?= $this->url(
-            'config/module/',
-            array('name' => $module->name)
-        ) ?>"><?= $this->escape($module->name); ?></a> (<?=
-            $module->enabled ? ($module->loaded ? $this->translate('enabled') : $this->translate('failed')) : $this->translate('disabled')
-        ?>)
+        <?php if ($module->enabled && $module->loaded) {
+          $icon = $this->icon('thumbs-up');
+          $title = sprintf($this->translate('Module %s is enabled'), $module->name);
+        } elseif (! $module->enabled) {
+          $icon = $this->icon('thumbs-down');
+          $title = sprintf($this->translate('Module %s is disabled'), $module->name);
+        } else { // ! $module->loaded
+          $icon = $this->icon('thumbs-down');
+          $title = sprintf($this->translate('Module %s has failed to load'), $module->name);
+        }
+
+        echo $this->qlink(
+          $icon . $this->escape($module->name),
+          'config/module/',
+          array('name' => $module->name),
+          array('title' => $title),
+          false
+        ); ?>
       </td>
     </tr>
   <?php endforeach ?>
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 12c9cf6ce..8b58ea15a 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -36,14 +36,24 @@
     <?php foreach ($this->resources as $name): ?>
       <tr>
         <td>
-          <a href="<?= $this->href('config/editresource', array('resource' => $name)); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($name); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($name),
+            'config/editresource',
+            array('resource' => $name),
+            array('title' => sprintf($this->translate('Edit resource %s'), $name)),
+            false
+          ); ?>
         </td>
-        <td style="text-align: center">
-          <a href="<?= $this->href('config/removeresource', array('resource' => $name)); ?>">
-            <?= $this->icon('cancel'); ?>
-          </a>
+        <td>
+          <center>
+            <?= $this->qlink(
+              $this->icon('cancel'),
+              'config/removeresource',
+              array('resource' => $name),
+              array('title' => sprintf($this->translate('Remove resource %s'), $name)),
+              false
+            ); ?>
+          </center>
         </td>
       </tr>
     <?php endforeach; ?>
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index 19a846ace..2ac9a1dfa 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -1,5 +1,3 @@
-<?php
-?>
 <div class="controls">
     <?= $this->tabs ?>
 </div>
@@ -25,9 +23,13 @@
                         <?= $pane->getName(); ?>
                     </th>
                     <th>
-                        <a href="<?= $this->href('dashboard/remove-pane', array('pane' => $pane->getName()));  ?>">
-                            <?= $this->icon('cancel'); ?>
-                        </a>
+                        <?= $this->qlink(
+                            $this->icon('cancel'),
+                            'dashboard/remove-pane',
+                            array('pane' => $pane->getName()),
+                            array('title' => sprintf($this->translate('Remove pane %s'), $pane->getName())),
+                            false
+                        ); ?>
                     </th>
                 </tr>
                 <?php $dashlets = $pane->getDashlets(); ?>
@@ -50,9 +52,13 @@
                                 <a href="<?= $this->href($dashlet->getUrl()); ?>"><?= $dashlet->getUrl(); ?></a>
                             </td>
                             <td>
-                                <a href="<?= $this->href('dashboard/remove-dashlet', array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()));  ?>">
-                                <?= $this->icon('cancel'); ?>
-                                </a>
+                                <?= $this->qlink(
+                                    $this->icon('cancel'),
+                                    '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>
                         </tr>
                     <?php endforeach; ?>
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 90319e0ad..8cfe62cc4 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -10,24 +10,50 @@
 <?php for ($i = 0; $i < count($backendNames); $i++): ?>
       <tr>
         <td class="action">
-          <a href="<?= $this->href('config/editAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($backendNames[$i]); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($backendNames[$i]),
+            'config/editAuthenticationBackend',
+            array('auth_backend' => $backendNames[$i]),
+            array('title' => sprintf($this->translate('Edit authentication backend %s'), $backendNames[$i])),
+            false
+          ); ?>
         </td>
         <td>
-          <a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>">
-            <?= $this->icon('cancel', $this->translate('Remove')); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('cancel'),
+            'config/removeAuthenticationBackend',
+            array('auth_backend' => $backendNames[$i]),
+            array('title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])),
+            false
+          ); ?>
         </td>
         <td>
 <?php if ($i > 0): ?>
-          <button type="submit" name="backend_newpos" value="<?= sprintf('%s|%s', $backendNames[$i], $i - 1); ?>">
-            <?= $this->icon('up-big', $this->translate('Move up in authentication order')); ?>
+          <button type="submit" name="backend_newpos" value="<?= sprintf(
+            '%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>
 <?php endif; ?>
 <?php if ($i + 1 < count($backendNames)): ?>
-          <button type="submit" name="backend_newpos" value="<?= sprintf('%s|%s', $backendNames[$i], $i + 1); ?>">
-            <?= $this->icon('down-big', $this->translate('Move down in authentication order')); ?>
+          <button type="submit" name="backend_newpos" value="<?= sprintf(
+            '%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>
 <?php endif; ?>
         </td>
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index c08a0b6a4..ea70bbe3f 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -51,13 +51,13 @@
                         <td><?= $this->escape($role->users) ?></td>
                         <td><?= $this->escape($role->groups) ?></td>
                         <td>
-                            <a href="<?= $this->url('roles/remove', array('role' => $name)) ?>"
-                               title="<?= sprintf(
-                                   $this->translate('Remove role %s'),
-                                   $name
-                               ) ?>">
-                                <?= $this->icon('cancel') ?>
-                            </a>
+                            <?= $this->qlink(
+                                $this->icon('cancel'),
+                                'roles/remove',
+                                array('role' => $name),
+                                array('title' => sprintf($this->translate('Remove role %s'), $name)),
+                                false
+                            ); ?>
                         </td>
                     </tr>
                 <?php endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index b1729f9b1..0fdb5f8c3 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -18,18 +18,26 @@
     <?php foreach ($this->backendsConfig as $backendName => $config): ?>
       <tr>
         <td>
-          <a href="<?= $this->href('/monitoring/config/editbackend', array('backend' => $backendName)); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($backendName); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($backendName),
+            '/monitoring/config/editbackend',
+            array('backend' => $backendName),
+            array('title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)),
+            false
+          ); ?>
           <small>(<?= sprintf(
             $this->translate('Type: %s'),
             $this->escape($config->type === 'ido' ? 'IDO' : ucfirst($config->type))
           ); ?>)</small>
         </td>
         <td>
-          <a href="<?= $this->href('/monitoring/config/removebackend', array('backend' => $backendName)); ?>">
-            <?= $this->icon('cancel'); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('cancel'),
+            '/monitoring/config/removebackend',
+            array('backend' => $backendName),
+            array('title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)),
+            false
+          ); ?>
         </td>
       </tr>
     <?php endforeach; ?>
@@ -50,18 +58,26 @@
     <?php foreach ($this->instancesConfig as $instanceName => $config): ?>
       <tr>
         <td>
-          <a href="<?= $this->href('/monitoring/config/editinstance', array('instance' => $instanceName)); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($instanceName); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($instanceName),
+            '/monitoring/config/editinstance',
+            array('instance' => $instanceName),
+            array('title' => sprintf($this->translate('Edit monitoring instance %s'), $instanceName)),
+            false
+          ); ?>
           <small>(<?= sprintf(
             $this->translate('Type: %s'),
             $config->host !== null ? $this->translate('Remote') : $this->translate('Local')
           ); ?>)</small>
         </td>
         <td>
-          <a href="<?= $this->href('/monitoring/config/removeinstance', array('instance' => $instanceName)); ?>">
-            <?= $this->icon('cancel'); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('cancel'),
+            '/monitoring/config/removeinstance',
+            array('instance' => $instanceName),
+            array('title' => sprintf($this->translate('Remove monitoring instance %s'), $instanceName)),
+            false
+          ); ?>
         </td>
       </tr>
     <?php endforeach; ?>