diff --git a/resources/assets/js/scriptStartPage.js b/resources/assets/js/scriptStartPage.js
index 77130f495497108d4efc76656ed7186954e9660b..5fadd6e2bb3c46ae9926203e17993c176f63a39f 100644
--- a/resources/assets/js/scriptStartPage.js
+++ b/resources/assets/js/scriptStartPage.js
@@ -80,8 +80,15 @@ function setActionListeners () {
function setSettings () {
for (var key in localStorage) {
var value = localStorage.getItem(key);
- if (key.startsWith('param_') && !key.endsWith('lang') && !key.endsWith('autocomplete')) {
- key = key.substring(key.indexOf('param_') + 6);
+ var acceptedParams = ['autocomplete', 'key', 'lang', 'maps', 'newtab', 'sprueche', 'autocomplete'];
+ var accepted = false;
+ for (var i in acceptedParams) {
+ if (key === 'param_' + acceptedParams[i]) {
+ accepted = true;
+ }
+ }
+ if (accepted) {
+ key = key.substring(6);
$('#searchForm').append('<input type="hidden" name="' + key + '" value="' + value + '">');
}
$('#foki input[type=radio]#angepasst').attr('checked', true);
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index 14f7a8ee7641fcba9bf9f435737c1ca75195d374..caf482d6924d3b56416301b3b835570426f7ee3c 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -111,11 +111,11 @@ ul.metager-dropdown-menu {
-ms-transition: max-height 1s ease, padding 1s ease;
-o-transition: max-height 1s ease, padding 1s ease;
transition: max-height 1s ease, padding 1s ease;
- -webkit-transition-delay:.2s;
- -moz-transition-delay:.2s;
- -ms-transition-delay:.2s;
- -o-transition-delay:.2s;
- transition-delay:.2s;
+ -webkit-transition-delay: .2s;
+ -moz-transition-delay: .2s;
+ -ms-transition-delay: .2s;
+ -o-transition-delay: .2s;
+ transition-delay: .2s;
&>li>a {
display: block;
padding: 3px 20px;
@@ -168,13 +168,32 @@ ul.metager-dropdown-menu {
}
}
-a.metager-dropdown-toggle:hover+ul.metager-dropdown-menu,
-a.metager-dropdown-toggle:focus+ul.metager-dropdown-menu,
-ul.metager-dropdown-menu:hover,
-#gutscheine>a:first-child:hover+a+ul.metager-dropdown-menu {
- max-height: 1000px;
- padding: 5px 0;
- border: 1px solid @metager-dropdown-toggle-hover-or-focus-color;
+@keyframes dropdown-animation {
+ 0% {
+ max-height: 0px;
+ padding: 0px 0;
+ border: none
+ }
+ 1% {
+ padding: 5px 0;
+ border: 1px solid @metager-dropdown-toggle-hover-or-focus-color;
+ }
+ 100% {
+ max-height: 1000px;
+ padding: 5px 0;
+ border: 1px solid @metager-dropdown-toggle-hover-or-focus-color;
+ }
+}
+
+.metager-dropdown:hover {
+ background-color: @metager-navbar-toggle-hover-background-color;
+ &>.metager-dropdown-menu {
+ animation-name: dropdown-animation;
+ animation-duration: 0.7s;
+ animation-timing-function: ease-out;
+ animation-fill-mode: forwards;
+ animation-delay: 0.1s;
+ }
}
.metager-navbar-toggle {
@@ -190,9 +209,6 @@ ul.metager-dropdown-menu:hover,
&:visited {
color: @metager-navbar-toggle-visited-color;
}
- &:hover {
- background-color: @metager-navbar-toggle-hover-background-color;
- }
}
#toggle-nav-hide .metager-navbar-toggle {
diff --git a/resources/lang/de/staticPages.php b/resources/lang/de/staticPages.php
index 680d5418f27ffc1046a150a01f0822064767530f..88a1d9328a099b485d8d1cbb2f1692250b5a8f7d 100644
--- a/resources/lang/de/staticPages.php
+++ b/resources/lang/de/staticPages.php
@@ -28,7 +28,7 @@ return [
'nav23' => 'Beitrittsformular SUMA-EV',
'nav24' => 'MetaGer Quellcode',
'nav25' => 'MetaGer App',
- 'gutscheineToggle' => '<a href="https://metager.de/gutscheine/">Gutscheine</a>',
+ 'gutscheineToggle' => 'Gutscheine',
'gutscheine.1' => 'Gutscheine',
'gutscheine.2' => 'Congstar Gutschein',
'gutscheine.3' => 'Check24 Gutschein',
diff --git a/resources/lang/de/titles.php b/resources/lang/de/titles.php
index d7a92320bb510baf40bac69132486df5e952e353..7403e7acdd5d7c27b7c5af90f7530ed864f96299 100644
--- a/resources/lang/de/titles.php
+++ b/resources/lang/de/titles.php
@@ -1,7 +1,7 @@
<?php
return [
- 'index' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
+ 'index' => 'MetaGer, mehr als eine Suchmaschine: unabhängig, transparent, demokratisch, quellcode-offen, datensicher, privatsphären-geschützt ',
'impressum' => 'Impressum - MetaGer',
'about' => 'Ãœber Uns - MetaGer',
'team' => 'Team - MetaGer',
diff --git a/resources/lang/en/hilfe.php b/resources/lang/en/hilfe.php
index 9dda04ba82832af3e8d12fb65f95a2569e5a4b69..1962bc5dbee8e4f4e25b7a4c9a61122fd01a3363 100644
--- a/resources/lang/en/hilfe.php
+++ b/resources/lang/en/hilfe.php
@@ -62,7 +62,7 @@ return [
"datenschutz.3" => "For more details see \"Tools\" above.",
"datenschutz.faktencheck.heading"=> "Fact-Check versus fake news:",
"datenschutz.faktencheck.body.1" => '<a href="http://www.password-online.de/?wysija-page=1&controller=email&action=view&email_id=280" target="_blanK" rel="noopener">Ausführliche Anleitung und Beschreibung</a> von <a href="http://www.ude.de/" target="_blanK" rel="noopener">Albrecht Ude</a>',
- "datenschutz.faktencheck.body.2" => '<a href="en/hilfe/faktencheck">Checklist</a>'
+ "datenschutz.faktencheck.body.2" => '<a href="en/hilfe/faktencheck">Checklist</a>',
"tor.title" => "Tor Hidden Service",
"tor.1" => "MetaGer provides the highest reachable security level for your privacy (anonymised IP addresses, servers under german privacy protection law). For further security needs or fear of compromised servers you may use the MetaGer-Tor branch. Please download the specialized webbrowser from <a href=\"https://www.torproject.org/\" target=\"_blank\" rel=\"noopener\">https://www.torproject.org/</a>. You will find help there, too.",
"tor.2" => "MetaGer Tor address: http://b7cxf4dkdsko6ah2.onion/tor/",
diff --git a/resources/lang/en/staticPages.php b/resources/lang/en/staticPages.php
index 6b10a5e5298ba3a279582b8d9707782e40341591..ce67256ceb4de1fa41ef3f5b68bf17b665e373e1 100644
--- a/resources/lang/en/staticPages.php
+++ b/resources/lang/en/staticPages.php
@@ -27,7 +27,7 @@ return [
"nav23" => "Admitting formular SUMA-EV",
"nav24" => "MetaGer source code",
"nav25" => "MetaGer App",
- "gutscheineToggle" => " \t<a href=\"https://metager.de/gutscheine/\">Coupons</a>",
+ "gutscheineToggle" => "Coupons",
"gutscheine.1" => "Coupons",
"gutscheine.2" => "Congstar Coupons",
"gutscheine.3" => "Check 24 Coupons",
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index ca680b0cfad5f7fe68248a5d2fb4664dbde4ae6a..8fdc47747e5cd7e0493c62024cf2bbc1d24de999 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -69,7 +69,7 @@
</li>
@if(LaravelLocalization::getCurrentLocale() === "de")
<li id="gutscheine"@if (isset($navbarFocus) && $navbarFocus === 'gutscheine') class="metager-dropdown active" @else class="metager-dropdown" @endif >
- {!! trans('staticPages.gutscheineToggle') !!}
+ <a href="https://metager.de/gutscheine/">{!! trans('staticPages.gutscheineToggle') !!}</a>
<a class="metager-dropdown-toggle" data-role="button" aria-expanded="false" tabindex="205"><span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>