Skip to content
Snippets Groups Projects
Commit 1ed31010 authored by Davide Aprea's avatar Davide Aprea
Browse files

minor changes

parent b30fa935
Branches
No related tags found
3 merge requests!1739Development,!1717Resolve "Major Startpage Redesign",!1713Resolve "Add setting to enable darkmode"
......@@ -56,7 +56,7 @@ class SettingsController extends Controller
$cookies = Cookie::get();
$settingActive = false;
foreach ($cookies as $key => $value) {
if (\starts_with($key, [$fokus . "_engine_", $fokus . "_setting_"]) || strpos($key, $fokus . '_blpage') === 0) {
if (\starts_with($key, [$fokus . "_engine_", $fokus . "_setting_"]) || strpos($key, $fokus . '_blpage') === 0 || $key === 'dark_mode') {
$settingActive = true;
}
}
......@@ -244,6 +244,10 @@ class SettingsController extends Controller
$cookiePath = "/" . substr($path, 0, strpos($path, "meta/") + 5);
Cookie::queue($key, "", 0, $cookiePath, null, false, false);
}
if($key === 'dark_mode'){
Cookie::queue($key, "", 0, '/', null, false, false);
}
}
$this->clearBlacklist($request);
......@@ -266,8 +270,11 @@ class SettingsController extends Controller
$key = $request->input('key', '');
$path = \Request::path();
$cookiePath = "/" . substr($path, 0, strpos($path, "meta/") + 5);
Cookie::queue($key, "", 0, $cookiePath, null, false, false);
if($key === 'dark_mode'){
Cookie::queue($key, "", 0, '/', null, false, false);
}else{
Cookie::queue($key, "", 0, $cookiePath, null, false, false);
}
return redirect($request->input('url', 'https://metager.de'));
}
......@@ -278,7 +285,11 @@ class SettingsController extends Controller
$cookiePath = "/" . substr($path, 0, strpos($path, "meta/") + 5);
foreach (Cookie::get() as $key => $value) {
Cookie::queue($key, "", 0, $cookiePath, null, false, false);
if($key === 'dark_mode'){
Cookie::queue($key, "", 0, '/', null, false, false);
}else{
Cookie::queue($key, "", 0, $cookiePath, null, false, false);
}
}
return redirect($request->input('url', 'https://metager.de'));
}
......
......@@ -40,4 +40,5 @@ return [
'key' => 'Ihr Schlüssel für die werbefreie Suche',
'blentry' => 'Blacklisteintrag',
'removeCookie' => 'Diesen Cookie entfernen',
'dm' => 'Dunkler Modus',
];
......@@ -40,4 +40,5 @@ return [
'key' => "Your key to the ad-free search",
'blentry' => 'Black list entry',
'removeCookie' => "Remove this cookie",
'dm' => 'Dark mode',
];
......@@ -16,9 +16,9 @@
@endif
<div id="plugin-btn-div">
@if($agent->isMobile() && ($agent->browser() === "Chrome" || $agent->browser() === "Edge"))
<button type="submit" id="plugin-btn" form="searchForm" title="{{ trans('index.plugin-title') }}" name="chrome-plugin" value="true"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a>
<button type="submit" id="plugin-btn" form="searchForm" title="{{ trans('index.plugin-title') }}" name="chrome-plugin" value="true"><img src="public/img" alt="+"> {{ trans('index.plugin') }}</a>
@else
<a id="plugin-btn" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin") }}" title="{{ trans('index.plugin-title') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a>
<a id="plugin-btn" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/plugin") }}" title="{{ trans('index.plugin-title') }}"><img src="/img/plug-in.svg" alt="+"> {{ trans('index.plugin') }}</a>
@endif
</div>
</div>
......
......@@ -34,6 +34,8 @@
@lang('settings.key')
@elseif(strpos($key, "_blpage"))
@lang('settings.blentry')
@elseif($key === 'dark_mode')
@lang('settings.dm')
@endif
</td>
<td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment