From 2edfb0f2a1d9fdd4aa19de4787eb660d3eb71981 Mon Sep 17 00:00:00 2001
From: Aria <aria@suma-ev.de>
Date: Fri, 13 Jul 2018 10:18:47 +0200
Subject: [PATCH] =?UTF-8?q?Weitere=20=C3=84nderungen=20im=20head-Tag=20der?=
=?UTF-8?q?=20resultPages=20sowie=20L=C3=B6schung=20von=20type-/role-Attri?=
=?UTF-8?q?buten=20in=20Labels?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/layouts/result.blade.php | 2 +-
resources/views/layouts/resultPage.blade.php | 6 ++----
resources/views/layouts/staticPages.blade.php | 2 ++
resources/views/modals/create-focus-modal.blade.php | 4 ++--
resources/views/parts/foki.blade.php | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 8ba5225f0..a358a060e 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -19,7 +19,7 @@
</a>
@if( isset($result->partnershop) && $result->partnershop === TRUE )
<span class="partnershop-info">
- <img src="/img/boosticon.png" height="13" alt="">
+ <img src="/img/boosticon.png" height="13" alt="Partnershops">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
</span>
@endif
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 5bbaf1f4c..a72e8b247 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="{!! trans('staticPages.meta.language') !!}">
<head>
+ <meta charset="utf-8">
<title>{{ $eingabe }} - MetaGer</title>
<link href="/favicon.ico" rel="icon" type="image/x-icon" />
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
@@ -10,9 +11,6 @@
<meta name="l" content="{{ LaravelLocalization::getCurrentLocale() }}" />
<meta name="mm" content="{{ Request::input('verification_id') }}" />
<meta name="mn" content="{{ Request::input('verification_count') }}" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="Cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" />
@@ -42,7 +40,7 @@
</div>
@endif
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
- <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
+ <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" alt=""/>
<script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/scriptResultPage.js') }}"></script>
<script src="{{ mix('js/focus-creator.js') }}"></script>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 114c6c5c9..826b40e28 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -10,6 +10,8 @@
<meta name="revisit-after" content="7 days" />
<meta name="audience" content="all" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+ <link href="/favicon.ico" rel="icon" type="image/x-icon" />
+ <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link type="text/css" rel="stylesheet" href="/fonts/liberation-fonts/liberation-fonts.css" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
diff --git a/resources/views/modals/create-focus-modal.blade.php b/resources/views/modals/create-focus-modal.blade.php
index 8a68de53b..6c2bc5c77 100644
--- a/resources/views/modals/create-focus-modal.blade.php
+++ b/resources/views/modals/create-focus-modal.blade.php
@@ -1,9 +1,9 @@
<input type="checkbox" id="show-create-focus" class="hidden">
-<div class="metager-modal" id="create-focus-modal" tab-index="-1" role="dialog">
+<div class="metager-modal" id="create-focus-modal" role="dialog">
<div class="metager-modal-dialog">
<div class="metager-modal-content">
<div class="metager-modal-header">
- <label type="button" class="close-metager-modal" role= "button" for="show-create-focus"></label>
+ <label class="close-metager-modal" for="show-create-focus"></label>
<h4>
@lang("index.focus-creator.head")
</h4>
diff --git a/resources/views/parts/foki.blade.php b/resources/views/parts/foki.blade.php
index 3629e4f85..077a387f4 100644
--- a/resources/views/parts/foki.blade.php
+++ b/resources/views/parts/foki.blade.php
@@ -14,7 +14,7 @@
<a href="https://maps.metager.de/map/{{ $metager->getQ() }}/9.7380161,52.37119740000003,12" target="_self" tabindex="6">@lang('index.foki.maps')</a>
</div>
<div class="search-option-frame hide-tooltip-on-resultpage" data-tooltip="@lang("index.focus-creator.head")">
- <label for="show-create-focus" id="">
+ <label for="show-create-focus">
<i class="fa fa-sliders"></i>
</label>
</div>
--
GitLab