From 0bc2036a6a0e39988606efbd89d117b96392f993 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Mon, 25 Feb 2019 11:17:50 +0100
Subject: [PATCH] removed tabindex from navigation bar

---
 resources/views/layouts/resultPage.blade.php |  4 +-
 resources/views/parts/sidebar.blade.php      | 48 ++++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index b17a270dd..00a2cd207 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -26,8 +26,6 @@
 			{!! @trans('resultPage.metager3') !!}
 		</div>
 		@endif
-		@include('parts.sidebar', ['id' => 'resultPageSideBar'])
-		@include('parts.sidebar-opener', ['class' => 'fixed'])
 		@if( !isset($suspendheader) )
 			@include('layouts.researchandtabs')
 		@else
@@ -41,6 +39,8 @@
 			</div>
 			@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
 		@endif
+		@include('parts.sidebar', ['id' => 'resultPageSideBar'])
+		@include('parts.sidebar-opener', ['class' => 'fixed'])
 		<script src="{{ mix('js/lib.js') }}"></script>
 		<script src="{{ mix('js/scriptResultPage.js') }}" defer></script>
 		<script src="{{ mix('js/searchbar.js') }}" defer></script>
diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php
index 1e85a4693..32198d127 100644
--- a/resources/views/parts/sidebar.blade.php
+++ b/resources/views/parts/sidebar.blade.php
@@ -5,53 +5,53 @@
   </a>
   <ul class="sidebar-list">
     <li>
-      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche">
+      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"  id="navigationSuche">
         <i class="fa fa-search" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav1') }}</span>
       </a>
     </li>
     <hr>
     <li>
-      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" tabindex="215">
+      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" >
         <i class="fa fa-user-secret" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav3') }}</span>
       </a>
     </li>
     <hr>
     <li>
-      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" tabindex="217">
+      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" >
         <i class="fa fa-info" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav20') }}</span>
       </a>
     </li>
     <li>
-      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}" tabindex="218">
+      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}" >
         <i class="fa fa-question" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav21') }}</span>
       </a>
     </li>
     <hr>
     <li>
-      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" tabindex="202">
+      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" >
         <i class="fa fa-donate" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav2') }}</span>
       </a>
     </li>
     <li>
-      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" tabindex="203">
+      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" >
         <i class="fa fa-users" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav23') }}</span>
       </a>
     </li>
     <hr>
     <li>
-      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" tabindex="229">
+      <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" >
         <i class="fa fa-mobile-alt" aria-hidden="true"></i>
         <span>@lang('sidebar.nav25')</span>
       </a>
     </li>
     <li>
-      <a class="inlink" href="https://maps.metager.de" target="_blank" tabindex="231">
+      <a class="inlink" href="https://maps.metager.de" target="_blank" >
         <i class="fa fa-map" aria-hidden="true"></i>
         <span>Maps.MetaGer.de</span>
       </a>
@@ -59,54 +59,54 @@
     <hr>
     <li class="metager-dropdown">
       <input id="contactToggle" class="sidebarCheckbox" type="checkbox">
-      <label for="contactToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationKontakt" tabindex="219">
+      <label for="contactToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationKontakt" >
         <i class="fa fa-comments" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav18') }}</span>
         <span class="caret"></span>
       </label>
       <ul class="metager-dropdown-content">
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}" tabindex="221">{{ trans('sidebar.nav5') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}" >{{ trans('sidebar.nav5') }}</a>
         </li>
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" tabindex="222">{{ trans('sidebar.nav6') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" >{{ trans('sidebar.nav6') }}</a>
         </li>
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" tabindex="223">{{ trans('sidebar.nav7') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" >{{ trans('sidebar.nav7') }}</a>
         </li>
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" tabindex="224">{{ trans('sidebar.nav8') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" >{{ trans('sidebar.nav8') }}</a>
         </li>
       </ul>
     </li>
     <li class="metager-dropdown">
       <input id="servicesToggle" class="sidebarCheckbox" type="checkbox">
-        <label for="servicesToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" tabindex="225">
+        <label for="servicesToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" >
           <i class="fa fa-wrench" aria-hidden="true"></i>
           <span>{{ trans('sidebar.nav15') }}</span>
           <span class="caret"></span>
         </label>
       <ul class="metager-dropdown-content">
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin/") }}" tabindex="226">{{ trans('sidebar.plugin') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin/") }}" >{{ trans('sidebar.plugin') }}</a>
         </li>
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" tabindex="227">{{ trans('sidebar.nav10') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" >{{ trans('sidebar.nav10') }}</a>
         </li>
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" tabindex="228">{{ trans('sidebar.nav22') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" >{{ trans('sidebar.nav22') }}</a>
         </li>
         <li>
-          <a href="{{ action('Assoziator@asso') }}" tabindex="229">{{ trans('sidebar.nav11') }}</a>
+          <a href="{{ action('Assoziator@asso') }}" >{{ trans('sidebar.nav11') }}</a>
         </li>
         <li>
-          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/tips/") }}" tabindex="230">{{ trans('sidebar.titles.tips') }}</a>
+          <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/tips/") }}" >{{ trans('sidebar.titles.tips') }}</a>
         </li>
         <li>
-          <a class="outlink" href="https://gitlab.metager3.de/open-source/MetaGer" tabindex="232">{{ trans('sidebar.nav24') }}</a>
+          <a class="outlink" href="https://gitlab.metager3.de/open-source/MetaGer" >{{ trans('sidebar.nav24') }}</a>
         </li>
         <li>
-          <a class="outlink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/tor/") }}" tabindex="234">{{ trans('sidebar.nav14') }}</a>
+          <a class="outlink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/tor/") }}" >{{ trans('sidebar.nav14') }}</a>
         </li>
         @if(LaravelLocalization::getCurrentLocale() == "de")
           <li>
@@ -114,13 +114,13 @@
           </li>
         @endif
         <li>
-          <a class="outlink" href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" tabindex="204">{{ trans('sidebar.nav17') }}</a>
+          <a class="outlink" href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" >{{ trans('sidebar.nav17') }}</a>
         </li>
       </ul>
     </li>
     <li class="metager-dropdown">
       <input id="languagesToggle" class="sidebarCheckbox" type="checkbox">
-      <label for="languagesToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationSprache" tabindex="235">
+      <label for="languagesToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationSprache" >
         <i class="fa fa-globe" aria-hidden="true"></i>
         <span>{{ trans('sidebar.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})</span>
         <span class="caret"></span>
@@ -128,7 +128,7 @@
       <ul class="metager-dropdown-content">
         @foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
           <li>
-            <a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}" tabindex="{{235 + $loop->index}}">{{{ $properties['native'] }}}</a>
+            <a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}" >{{{ $properties['native'] }}}</a>
           </li>
         @endforeach
       </ul>
-- 
GitLab