Merge branch 'MetaGer-Redesign' of...

Merge branch 'MetaGer-Redesign' of https://gitlab.metager3.de/open-source/MetaGer into MetaGer-Redesign

resources/views/metager3.blade.php

 @extends('layouts.resultPage')
 
 @section('results')
-	{{-- Show all errors --}}
-	@if(sizeof($errors) > 0)
-		<div class="alert alert-danger">
-			<ul>
-				@foreach($errors as $error)
-					<li>{!! $error !!}</li>
-				@endforeach
-			</ul>
-		</div>
-	@endif
-	{{-- Show all warnings --}}
-	@if(sizeof($warnings) > 0)
-		<div class="alert alert-warning">
-			<ul>
-				@foreach($warnings as $warning)
-					<li>{!! $warning !!}</li>
-				@endforeach
-			</ul>
-		</div>
-	@endif
 	<div id="results">
+		{{-- Show all errors --}}
+		@if(sizeof($errors) > 0)
+			<div class="alert alert-danger">
+				<ul>
+					@foreach($errors as $error)
+						<li>{!! $error !!}</li>
+					@endforeach
+				</ul>
+			</div>
+		@endif
+		{{-- Show all warnings --}}
+		@if(sizeof($warnings) > 0)
+			<div class="alert alert-warning">
+				<ul>
+					@foreach($warnings as $warning)
+						<li>{!! $warning !!}</li>
+					@endforeach
+				</ul>
+			</div>
+		@endif
 		{{-- Show initial products or ads --}}
 		@if($metager->hasProducts())
 			@if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)

resources/views/parts/searchbar.blade.php

@@ -12,6 +12,12 @@
 						<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings ") }}">
 							<i class="fa fa-cog" aria-hidden="true"></i>
 						</a>
+						<div class="searchbar-tooltip">
+							<div class="searchbar-tooltip-arrow"></div>
+							<div class="searchbar-tooltip-content">
+								<p>{{{ trans('index.tooltips.settings') }}}</p>
+							</div>
+						</div>
 					</div>
 				</div>
 				<select id="focus-select" name="focus" style="font-family: FontAwesome, sans-serif;">