Skip to content

GitLab

Commit 39840e64 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch '753-html5-validitat' into 'development' 

Resolve "HTML5-Validität"

Closes #753

See merge request !1255
parents a852a8a3 f8d99f92
Hide whitespace changes
Inline Side-by-side
resources/assets/less/metager/specific.less
View file @ 39840e64
......@@ -206,7 +206,6 @@ main {
background-color: #eee;
border-radius: 5px;
padding: 10px;
margin: 10px;
}
}
}
\ No newline at end of file
resources/views/datenschutz/datenschutz.blade.php
View file @ 39840e64
......@@ -11,7 +11,7 @@
<p>{!! trans('datenschutz.general.3') !!}</p>
</div>
<div class="card-heavy">
<h1>{!! trans('datenschutz.policy.1') !!}</h2>
<h1>{!! trans('datenschutz.policy.1') !!}</h1>
<ul class="dotlist">
<li>{!! trans('datenschutz.policy.2') !!}</li>
<li>{!! trans('datenschutz.policy.5') !!}</li>
......
resources/views/hilfe.blade.php
View file @ 39840e64
......@@ -13,7 +13,7 @@
<p>{!! trans('hilfe.stopworte.1') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.stopworte.2') !!}</li>
<div class="search-example">{!! trans('hilfe.stopworte.3') !!}</div>
<li class="nodot"><div class="search-example">{!! trans('hilfe.stopworte.3') !!}</div></li>
</ul>
</div>
</section>
......@@ -25,9 +25,9 @@
<p>{!! trans('hilfe.mehrwortsuche.2') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.mehrwortsuche.3') !!}</li>
<div class = "search-example">{!! trans('hilfe.mehrwortsuche.3.example') !!}</div>
<li class="nodot"><div class = "search-example">{!! trans('hilfe.mehrwortsuche.3.example') !!}</div></li>
<li>{!! trans('hilfe.mehrwortsuche.4') !!}</li>
<div class = "search-example">{!! trans('hilfe.mehrwortsuche.4.example') !!}</div>
<li class="nodot"><div class = "search-example">{!! trans('hilfe.mehrwortsuche.4.example') !!}</div></li>
</ul>
</div>
</section>
......@@ -37,9 +37,9 @@
<p>{!! trans('hilfe.grossklein.1') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.grossklein.2') !!}</li>
<div class="search-example">{!! trans('hilfe.grossklein.2.example') !!}</div>
<li class="nodot"><div class="search-example">{!! trans('hilfe.grossklein.2.example') !!}</div></li>
<li class="nodot">{!! trans('hilfe.grossklein.3') !!}</li>
<div class="search-example">{!! trans('hilfe.grossklein.3.example') !!}</div>
<li class="nodot"><div class="search-example">{!! trans('hilfe.grossklein.3.example') !!}</div></li>
</ul>
</div>
</section>
......@@ -49,24 +49,26 @@
<p>{!! trans('hilfe.domains.sitesearch.explanation') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.domains.sitesearch.example.1') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.sitesearch.example.2') !!}</div>
<li class="nodot"><div class="search-example">{!! trans('hilfe.domains.sitesearch.example.2') !!}</div></li>
<li>{!! trans('hilfe.domains.sitesearch.example.3') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.sitesearch.example.4') !!}</div>
<li class="nodot"><div class="search-example">{!! trans('hilfe.domains.sitesearch.example.4') !!}</div></li>
</ul>
<p>{!! trans('hilfe.domains.blacklist.explanation') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.domains.blacklist.example.1') !!}</li>
<ul>
<li>{!! trans('hilfe.domains.blacklist.example.2') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.blacklist.example.3') !!}</div>
<li class="nodot">{!! trans('hilfe.domains.blacklist.example.4') !!}</li>
<li>{!! trans('hilfe.domains.blacklist.example.5') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.blacklist.example.6') !!}</div>
</ul>
<li class="nodot">
<ul>
<li>{!! trans('hilfe.domains.blacklist.example.2') !!}</li>
<li class="nodot"><div class="search-example">{!! trans('hilfe.domains.blacklist.example.3') !!}</div></li>
<li class="nodot">{!! trans('hilfe.domains.blacklist.example.4') !!}</li>
<li>{!! trans('hilfe.domains.blacklist.example.5') !!}</li>
<li class="nodot"><div class="search-example">{!! trans('hilfe.domains.blacklist.example.6') !!}</div></li>
</ul>
</li>
</ul>
<p>{!! trans('hilfe.domains.showcase.explanation.1') !!}</p>
@include('parts/fake-result')
<script type="text/javascript">
<script>
function setDummySearch(value) {
document.getElementById("dummy-search").innerHTML = value
}
......@@ -82,7 +84,7 @@
<p>{!! trans('hilfe.domains.showcase.menu.6') !!}</p>
</div>
<div>
<div class="search-example"><i>meine suche</i> <i id="dummy-search"></span></i>
<div class="search-example"><i>meine suche</i> <i id="dummy-search"></i></div>
</div>
</div>
</section>
......@@ -92,7 +94,7 @@
<p>{!! trans('hilfe.urls.explanation') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.urls.example.1') !!}</li>
<div class = "search-example">{!! trans('hilfe.urls.example.2') !!}</div>
<li class="nodot"><div class = "search-example">{!! trans('hilfe.urls.example.2') !!}</div></li>
</ul>
</div>
</section>
......
resources/views/index.blade.php
View file @ 39840e64
......@@ -9,10 +9,10 @@
</h1>
@include('parts.searchbar', ['class' => 'startpage-searchbar'])
<div id="show-plugin-modal">
<label for="plugin-modal-checkbox" role="button" class="btn btn-default open-plugin-modal" title="{{ trans('index.plugin.open-modal.title') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin.open-modal') }}</label>
<label for="plugin-modal-checkbox" class="btn btn-default open-plugin-modal" title="{{ trans('index.plugin.open-modal.title') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin.open-modal') }}</label>
</div>
<script type="text/javascript" src="{{ mix('js/scriptStartPage.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/searchbar.js') }}"></script>
<script src="{{ mix('js/scriptStartPage.js') }}"></script>
<script src="{{ mix('js/searchbar.js') }}"></script>
@endsection
@section('optionalContent')
......
resources/views/kontakt/kontakt.blade.php
View file @ 39840e64
......@@ -45,5 +45,5 @@
<p>{!! trans('kontakt.letter.2') !!}</p>
<address>{!! trans('kontakt.letter.3') !!}</address>
</div>
<script type="text/javascript" src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/lib.js') }}"></script>
@endsection
resources/views/languages/edit.blade.php
View file @ 39840e64
......@@ -57,6 +57,6 @@
<p>{!! trans('languages.email') !!}</p>
<p><input type="email" name="email" form="submit" value="{{$email}}"/></p>
<button class="btn btn-success" type="submit" form="submit">Daten übermitteln</button>
<script type="text/javascript" src="{{ mix('js/lib.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/editLanguage.js') }}"></script>
<script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/editLanguage.js') }}"></script>
@endsection
resources/views/languages/synoptic.blade.php
View file @ 39840e64
......@@ -65,6 +65,6 @@
-->
<button name="download" class="btn btn-success" type="submit" form="submit">Dateien herunterladen</button>
<button name="nextpage" class="btn btn-success" type="submit" form="submit">Nächste Seite</button>
<script type="text/javascript" src="{{ mix('js/lib.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/editLanguage.js') }}"></script>
<script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/editLanguage.js') }}"></script>
@endsection
resources/views/layouts/result.blade.php
View file @ 39840e64
......@@ -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
......@@ -59,7 +59,7 @@
<a class="result-open-proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
{!! trans('result.options.5') !!}
</a>
<label class="open-result-options" for="result-toggle-{{$result->number}}" role="button">
<label class="open-result-options" for="result-toggle-{{$result->number}}">
MEHR
</label>
</div>
......
resources/views/layouts/resultPage.blade.php
View file @ 39840e64
<!DOCTYPE html>
<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,10 +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="language" content="{!! trans('staticPages.meta.language') !!}" />
<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" />
......@@ -43,10 +40,10 @@
</div>
@endif
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="{{ mix('js/lib.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/scriptResultPage.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/searchbar.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/focus-creator.js') }}"></script>
<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>
<script src="{{ mix('js/searchbar.js') }}"></script>
</body>
</html>
resources/views/layouts/staticPages.blade.php
View file @ 39840e64
......@@ -2,7 +2,6 @@
<html lang="{!! trans('staticPages.meta.language') !!}">
<head>
<meta charset="utf-8" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>@yield('title')</title>
<meta name="description" content="{!! trans('staticPages.meta.Description') !!}" />
<meta name="keywords" content="{!! trans('staticPages.meta.Keywords') !!}" />
......@@ -10,9 +9,9 @@
<meta name="robots" content="index,follow" />
<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, user-scalable=no" />
<meta rel="icon" type="image/x-icon" href="/favicon.ico" />
<meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<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') }}" />
......
resources/views/modals/create-focus-modal.blade.php
View file @ 39840e64
<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>
......
resources/views/modals/plugin-modal.blade.php
View file @ 39840e64
<input type="checkbox" id="plugin-modal-checkbox" class="hidden" @if( isset($pluginmodal) && $pluginmodal == 'on') checked @endif>
<div class="metager-modal" id="plugin-modal" tab-index="-1" role="dialog">
<div class="metager-modal" id="plugin-modal" role="dialog">
<div class="metager-modal-dialog ">
<div class="metager-modal-content">
<div class="metager-modal-header">
<label type="button" for="plugin-modal-checkbox" class="close">
<label for="plugin-modal-checkbox" class="close">
<span aria-hidden="true">&times;</span>
</label>
<h4>
......
resources/views/parts/fake-result.blade.php
View file @ 39840e64
......@@ -28,7 +28,7 @@
ANONYM ÖFFNEN
</a>
<div class="open-result-options">
<label for="result-toggle-1" role="button" data-tooltip="{{ trans('fake-result.options.more') }}">
<label for="result-toggle-1" data-tooltip="{{ trans('fake-result.options.more') }}">
MEHR
</label>
</div>
......
resources/views/parts/foki.blade.php
View file @ 39840e64
......@@ -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" role="button" id="">
<label for="show-create-focus">
<i class="fa fa-sliders"></i>
</label>
</div>
resources/views/parts/searchbar.blade.php
View file @ 39840e64
{{-- Don't forget @include('modals.create-focus-modal') --}}
{{-- Don't forget <script type="text/javascript" src="{{ mix('js/searchbar.js') }}"></script> --}}
{{-- Don't forget <script src="{{ mix('js/searchbar.js') }}"></script> --}}
<fieldset>
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<div class="searchbar {{$class or ''}}">
......
resources/views/parts/sidebar-opener.blade.php
View file @ 39840e64
<label class="openSidebar {{$class or ''}}" role="button" for="sideBarToggle"></label>
\ No newline at end of file
<label class="openSidebar {{$class or ''}}" for="sideBarToggle"></label>
\ No newline at end of file
resources/views/parts/sidebar.blade.php
View file @ 39840e64
<input id="sideBarToggle" style="display: none;" type="checkbox">
<div class="sideBar">
<label id="closeSidebar" role="button" for="sideBarToggle"></label>
<label id="closeSidebar" for="sideBarToggle"></label>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<p>MetaGer</p>
</a>
......@@ -13,7 +13,7 @@
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<input id="servicesToggle" class="sideBarCheckbox" type="checkbox">
<label for="servicesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225">
<label for="servicesToggle" class="metager-dropdown-toggle" aria-haspopup="true" tabindex="225">
<i class="fa fa-wrench" aria-hidden="true"></i>
<span>&nbsp;{{ trans('sidebar.nav15') }}</span>
<span class="caret"></span>
......@@ -53,7 +53,7 @@
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'hilfe') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<input id="helpToggle" class="sideBarCheckbox" type="checkbox">
<label for="helpToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216">
<label for="helpToggle" class="metager-dropdown-toggle" aria-haspopup="true" id="navigationHilfe" tabindex="216">
<i class="fa fa-info-circle" aria-hidden="true"></i>
<span>&nbsp;{{ trans('sidebar.nav20') }}</span>
<span class="caret"></span>
......@@ -69,7 +69,7 @@
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'foerdern') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<input id="donationToggle" class="sideBarCheckbox" type="checkbox">
<label for="donationToggle" class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201">
<label for="donationToggle" class="metager-dropdown-toggle" tabindex="201">
<i class="fa fa-money" aria-hidden="true"></i>
<span>&nbsp;{{ trans('sidebar.nav16') }}</span>
<span class="caret"></span>
......@@ -93,7 +93,7 @@
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'kontakt') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<input id="contactToggle" class="sideBarCheckbox" type="checkbox">
<label for="contactToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219">
<label for="contactToggle" class="metager-dropdown-toggle" aria-haspopup="true" id="navigationKontakt" tabindex="219">
<i class="fa fa-comments-o" aria-hidden="true"></i>
<span>&nbsp;{{ trans('sidebar.nav18') }}</span>
<span class="caret"></span>
......@@ -118,7 +118,7 @@
</li>
<li class="metager-dropdown">
<input id="languagesToggle" class="sideBarCheckbox" type="checkbox">
<label for="languagesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235">
<label for="languagesToggle" class="metager-dropdown-toggle" aria-haspopup="true" id="navigationSprache" tabindex="235">
<i class="fa fa-globe" aria-hidden="true"></i>
<span>&nbsp;{{ trans('sidebar.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})</span>
<span class="caret"></span>
......
resources/views/spende/beitritt.blade.php
View file @ 39840e64
......@@ -6,7 +6,7 @@
@section('content')
<link type="text/css" rel="stylesheet" href="{{ mix('/css/beitritt.css') }}" />
<script type="text/javascript" src="{{ mix('js/scriptJoinPage.js') }}"></script>
<script src="{{ mix('js/scriptJoinPage.js') }}"></script>
<form id="donation-form">
<div class="card-heavy">
<h1>{{ trans('beitritt.heading.1') }}</h1>
......@@ -37,7 +37,7 @@
</div>
<div>
<label for="webpage">{{ trans('beitritt.beitritt.11') }}</label>
<input type="text" class="form-control beitritt-input" name="webpage"></div>
<input type="text" class="form-control beitritt-input" id="webpage"></div>
<div>
<label class="beitritt-required-info" for="adresse">{{ trans('beitritt.beitritt.6') }}</label>
<input type="text" class="form-control beitritt-input" id="adresse" placeholder="{{trans('beitritt.placeholder.6')}}" required>
......
resources/views/spende/spende.blade.php
View file @ 39840e64
......@@ -70,7 +70,7 @@
<input name="tax" value="0" type="hidden">
<input name="lc" value="DE" type="hidden">
<input name="bn" value="PP-DonationsBF" type="hidden">
<input src="/img/paypalspenden.gif" name="submit" width="120px" alt="{!! trans('spende.paypal.2') !!}" type="image">
<input src="/img/paypalspenden.gif" name="submit" width="120" alt="{!! trans('spende.paypal.2') !!}" type="image">
</form>
</div>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment