From 48f9c9e18013b01dc366bdfe83a76eb1ea4f3eb0 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 20 Jun 2017 10:56:42 +0200
Subject: [PATCH] Added Key input field for ad-free search
---
app/Http/Controllers/StartpageController.php | 3 ++-
public/js/settings.js | 7 +++++--
resources/lang/de/settings.php | 5 ++++-
resources/views/index.blade.php | 1 +
resources/views/settings.blade.php | 6 +++++-
5 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 87610daed..51d8dc601 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -51,7 +51,8 @@ class StartpageController extends Controller
->with('time', $request->input('param_time', '1500'))
->with('sprueche', $request->input('param_sprueche', 'on'))
->with('newtab', $request->input('param_newtab', 'on'))
- ->with('maps', $maps = $request->input('param_maps', 'off'));
+ ->with('maps', $maps = $request->input('param_maps', 'off'))
+ ->with('key', $request->input('param_key', ''));
}
public function loadPage($subpage)
diff --git a/public/js/settings.js b/public/js/settings.js
index 3fd07f376..8910eb9cd 100644
--- a/public/js/settings.js
+++ b/public/js/settings.js
@@ -5,10 +5,13 @@ $(document).ready(function () {
$('#save').removeClass('hidden');
$('#save').click(function () {
localStorage.setItem('pers', true);
- $('input[type=checkbox]:checked, input[type=hidden]').each(function (el) {
+ $('input[type=checkbox]:checked, input[type=hidden]').each(function () {
localStorage.setItem($(this).attr('name'), $(this).val());
});
- $('select').each(function (el) {
+ $('select').each(function () {
+ localStorage.setItem($(this).attr('name'), $(this).val());
+ });
+ $('input[type=text]').each(function () {
localStorage.setItem($(this).attr('name'), $(this).val());
});
document.location.href = $('#save').attr('data-href');
diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
index 1d58f3267..6bde86e90 100644
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@@ -36,10 +36,13 @@ return [
'request' => 'Abfragemethode',
- 'autocomplete' => 'Auto-Vervollständigung (Sucheingabe)',
+ 'autocomplete.label'=> 'Auto-Vervollständigung (Sucheingabe)',
'autocomplete.on' => 'ein',
'autocomplete.off' => 'aus',
+ 'key.label' => 'Schlüssel für Werbefreie Suche',
+ 'key.placeholder' => 'Schlüssel eingeben',
+
"foki.web" => "Web",
"foki.andere" => "Andere",
"foki.produktsuche" => "Produktsuche",
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 73f2263fa..685607852 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -291,6 +291,7 @@
<input type="hidden" name="sprueche" value={{ $sprueche }} >
<input type="hidden" name="newtab" value={{ $newtab }} >
<input type="hidden" name="maps" value={{ $maps }} >
+ <input type="hidden" name="key" value={{ $key }} >
@foreach ($focusPages as $fp)
<input type="hidden" name={{ $fp }} value="on">
@endforeach
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 790f0ed95..44287c8ab 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -46,12 +46,16 @@
</select>
</div>
<div class="col-sm-6 col-md-4 col-lg-3">
- <label class="select-label">@lang('settings.autocomplete'):</label>
+ <label class="select-label">@lang('settings.autocomplete.label'):</label>
<select class="form-control settings-form-control" name="param_autocomplete">
<option value="on" selected>@lang('settings.autocomplete.on')</option>
<option value="off">@lang('settings.autocomplete.off')</option>
</select>
</div>
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <label class="select-label">@lang('settings.key.label'):</label>
+ <input type="text" class="form-control settings-form-control" name="param_key" placeholder="@lang('settings.key.placeholder')">
+ </div>
</div>
</container>
<div id="settingsButtons">
--
GitLab