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] 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;