From d58abed9df21e91ccde44fd41d7f164062e26de8 Mon Sep 17 00:00:00 2001
From: Aria <aria@suma-ev.de>
Date: Mon, 3 Jul 2017 10:15:38 +0200
Subject: [PATCH] =?UTF-8?q?Feedback-Notification=20mit=20Link=20aufs=20Kon?=
=?UTF-8?q?taktformular=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/kontakt/kontakt.blade.php | 3 ++-
resources/views/layouts/resultPage.blade.php | 12 ++++++++----
routes/web.php | 6 ++++--
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php
index 7cf317c9a..54e382e0e 100644
--- a/resources/views/kontakt/kontakt.blade.php
+++ b/resources/views/kontakt/kontakt.blade.php
@@ -16,7 +16,8 @@
<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) }}" mit dem Suchbegriff "{{base64_decode($query)}}" war unvollständig.@endif
+ </textarea>
</div>
<div class="form-group kontakt-form-group">
<p>{!! trans('kontakt.form.7') !!}</p>
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index f9b55afe7..8b2e2f690 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -9,13 +9,13 @@
<meta content="{{ $eingabe }}" name="q" />
<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" />
+ <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="{{ elixir('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="/css/lightslider.css" />
- <link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" />
- <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
+ <link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" /
+> <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
</head>
<body id="resultBody">
@if( !isset($suspendheader) )
@@ -43,5 +43,9 @@
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
<script type="text/javascript" src="{{ elixir('js/scriptResultPage.js') }}"></script>
+ <div id="feedback" style="width:50%;margin-left:25%;position: relative; bottom:10px;" class="alert alert-danger alert-dismissable">
+ <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
+ <strong> Nichts passendes auf dabei? Geben Sie uns Feedback über das <a href="localhost:8000/kontakt/{{base64_encode(Request::fullUrl())}}/{{base64_encode($eingabe)}}" target="_blank">Kontaktformular</a>!</strong>
+ </div>
</body>
</html>
diff --git a/routes/web.php b/routes/web.php
index bb0da00dc..99f3a487c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -48,10 +48,12 @@ Route::group(
->with('navbarFocus', 'kontakt');
});
- Route::get('kontakt', function () {
+ Route::get('kontakt/{url?}/{query?}', function ($url = "", $query = "") {
return view('kontakt.kontakt')
->with('title', trans('titles.kontakt'))
- ->with('navbarFocus', 'kontakt');
+ ->with('navbarFocus', 'kontakt')
+ ->with('url', $url)
+ ->with('query', $query);
});
Route::post('kontakt', 'MailController@contactMail');
--
GitLab