Merge branch '538-feedback-popup-in-der-suche' into 'development'

Resolve "Feedback-Popup in der Suche"

Closes #538

See merge request !952

resources/lang/de/metaGer.php

@@ -18,4 +18,5 @@ return [
 
     'sitesearch.failed'        => 'Sie wollten eine Sitesearch auf :site durchführen. Leider unterstützen die eingestellten Suchmaschinen diese nicht. Sie können <a href=":searchLink">hier</a> die Sitesearch im Web-Fokus durchführen. Es werden ihnen Ergebnisse ohne Sitesearch angezeigt.',
     'sitesearch.success'       => 'Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: <a href="http://:site" target="_blank" rel="noopener">":site"</a> angezeigt.',
+    'feedback'                 => 'Nichts passendes auf dabei? Geben Sie uns Feedback: ',
 ];

resources/lang/en/metaGer.php

@@ -12,5 +12,6 @@ return [
     "formdata.stopwords"	=>	"You have excluded results with the following words: \":stopwords\"",
     "formdata.phrase"	=>	"You are doing a string search: :phrase",
     "sitesearch.failed"	=>	"You intend to do a site search on :site. Unfortunately the chosen search engines do not support that. You can do a site search <a href=\":searchLink\">here</a> within the Web focus",
-    "sitesearch.success"	=>	"You are doing a site search. Only results of the website <a href=\"http://:site\" target=\"_blank\" rel=\"noopener\">\":site\"</a> will be shown."
+    "sitesearch.success"	=>	"You are doing a site search. Only results of the website <a href=\"http://:site\" target=\"_blank\" rel=\"noopener\">\":site\"</a> will be shown.",
+    "feedback"              => "Not what you were looking for? Give us feedback: ",
 ];
\ No newline at end of file

resources/views/kontakt/kontakt.blade.php

@@ -16,7 +16,7 @@
 		<div class="form-group kontakt-form-group">
 			<input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="text"></div>
 			<div class="form-group kontakt-form-group">
-				<textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}"></textarea>
+				<textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}">@if($url !== "")Die Suche unter "{{ base64_decode($url) }}" ist unvollständig.@endif</textarea>
 			</div>
 			<div class="form-group kontakt-form-group">
 			<p>{!! trans('kontakt.form.7') !!}</p>

resources/views/layouts/resultPage.blade.php

@@ -25,6 +25,12 @@
 				@yield('results')
 			</div>
 		@endif
+		<div id="feedback" style="width:50%;margin-left:25%;position: relative; top:10px;" class="alert alert-danger alert-dismissable">
+			<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+  				<strong> {!! trans('metaGer.feedback') !!}<a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/" target="_blank">
+  					{!! trans('kontakt.form.1') !!}</a>
+  				</strong>
+		</div>
 		<footer>
 			<div class="row">
 				<div @if(LaravelLocalization::getCurrentLocale() === "de") class="col-xs-4"@else class="col-xs-6"@endif>

routes/web.php

@@ -48,10 +48,11 @@ Route::group(
                 ->with('navbarFocus', 'kontakt');
         });
 
-        Route::get('kontakt', function () {
+        Route::get('kontakt/{url?}', function ($url = "") {
             return view('kontakt.kontakt')
                 ->with('title', trans('titles.kontakt'))
-                ->with('navbarFocus', 'kontakt');
+                ->with('navbarFocus', 'kontakt')
+                ->with('url', $url);
         });
 
         Route::post('kontakt', 'MailController@contactMail');