Merge branch '100-404-seite-funktioniert-nicht' into 'master'

404 Seiten funktionieren wieder

Placeholder auf der Startseite wieder gesetzt

See merge request !96

resources/lang/de/index.php

@@ -23,6 +23,8 @@ return [
 	'about.2.1'				=>	'Wir arbeiten nicht gewinnorientiert, wir sind ein ',
 	'about.2.2'				=>	'gemeinnütziger Verein. ',
 
+	'placeholder'			=>	'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
+
 	'plugin.head.1'			=>	'MetaGer zum Firefox hinzufügen',
 	'plugin.head.2'			=>	'MetaGer zum Chrome hinzufügen',
 	'plugin.head.3'			=>	'MetaGer zum Opera hinzufügen',

resources/views/layouts/staticPages.blade.php

@@ -37,9 +37,9 @@
 					</div>
 					<div class="collapse navbar-collapse" id="navbar-collapse">
 						<ul class="nav navbar-nav navbar-right">
-							<li @if ($navbarFocus === 'suche') class="active" @endif >
+							<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
 								<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}</a></li>
-							<li @if ($navbarFocus === 'foerdern') class="dropdown active" @else class="dropdown" @endif >
+							<li @if (isset($navbarFocus) && $navbarFocus === 'foerdern') class="dropdown active" @else class="dropdown" @endif >
 								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
 								<span class="caret"></span></a>
 								<ul class="dropdown-menu">
@@ -47,9 +47,9 @@
 									<li><a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl">{{ trans('staticPages.nav17') }}</a></li>
 								</ul>
 							</li>
-							<li @if ($navbarFocus === 'datenschutz') class="active" @endif >
+							<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
 								<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}</a></li>
-							<li @if ($navbarFocus === 'kontakt') class="dropdown active" @else class="dropdown" @endif >
+							<li @if (isset($navbarFocus) && $navbarFocus === 'kontakt') class="dropdown active" @else class="dropdown" @endif >
 								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
 								<span class="caret"></span></a>
 								<ul class="dropdown-menu">
@@ -60,7 +60,7 @@
 									<li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}</a></li>
 								</ul>
 							</li>
-							<li @if ($navbarFocus === 'dienste') class="dropdown active" @else class="dropdown" @endif >
+							<li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="dropdown active" @else class="dropdown" @endif >
 								<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
 								<span class="caret"></span></a>
 								<ul class="dropdown-menu">