Commit 57311cd3 authored by Phil Höfer's avatar Phil Höfer

Merge branch '688' into 'development'

688

Closes #688

See merge request !1193
parents 5a16b41b 9e991119
This diff is collapsed.
......@@ -21,7 +21,9 @@ var translations = {
'result-saver.deleteAll': '<span class="hidden-xs">Ergebnisse</span> löschen</button>',
'result-saver.save.this': 'ÖFFNEN',
'result-saver.save.newtab': 'IN NEUEM TAB',
'result-saver.save.anonymous': 'ANONYM ÖFFNEN'
'result-saver.save.anonymous': 'ANONYM ÖFFNEN',
'close-dropdowns' : 'Alle zuklappen',
'open-dropdowns' : 'Alle aufklappen'
},
'en': {
......@@ -39,7 +41,9 @@ var translations = {
'result-saver.deleteAll': 'delete <span class="hidden-xs">results</span>',
'result-saver.save.this': 'OPEN',
'result-saver.save.newtab': 'IN NEW TAB',
'result-saver.save.anonymous': 'OPEN ANONYMOUSLY'
'result-saver.save.anonymous': 'OPEN ANONYMOUSLY',
'close-dropdowns' : 'Collapse all',
'open-dropdowns' : 'Expand all'
},
'es': {
......@@ -64,7 +68,7 @@ var translations = {
function t (key, lang) {
if (arguments.length == 1) {
var lang = $('html').attr('lang');
return translations[lang][key];
return t(key, lang);
} else if (arguments.length == 2 && translations[lang] && translations[lang][key]) {
return translations[lang][key];
} else {
......
......@@ -12,8 +12,8 @@
display: none;
position: fixed;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
-ms-flex-pack: center;
justify-content: center;
min-height: 100%;
width: 100%;
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .7)), to(rgba(0, 0, 0, .7)));
......@@ -39,6 +39,13 @@
}
}
}
#toggle-dropdowns-label {
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.focus-dropdown-toggle {
display: none;
&:not(:checked) {
......@@ -49,15 +56,17 @@
}
&:checked {
&~.focus-dropdown-label::after {
content: "🡡";
content: "";
}
}
}
.focus-dropdown-label {
cursor: pointer;
&::after {
font-size: 16px;
content: "🡣";
content: "";
margin-left: 3px;
vertical-align: middle;
}
&~.row {
-webkit-transition: max-height 0.4s ease;
......
......@@ -7,6 +7,8 @@ return [
'options.2' => ':host ausblenden',
'options.3' => '*.:domain ausblenden',
'options.4' => 'Partnershop',
'options.5' => 'anonym öffnen',
'options.5' => 'ANONYM ÖFFNEN',
'options.6' => 'IN NEUEM TAB ÖFFNEN',
'options.7' => 'ÖFFNEN',
'proxytext' => 'Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übertragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt.',
];
<?php
return [
"options.headline" => "Options",
"options.savetab" => "Save result in TAB",
"options.1" => "start a new search on this domain",
"options.2" => "hide :host",
"options.3" => "hide *.:domain",
"options.4" => "partnershop",
"options.5" => "open anonymously",
"proxytext" => "Result link is opened anonymously. Your data will not be transfered to destination servers. Eventually some links will not work as usual."
'options.headline' => 'Options',
'options.savetab' => 'Save result in TAB',
'options.1' => 'start a new search on this domain',
'options.2' => 'hide :host',
'options.3' => 'hide *.:domain',
'options.4' => 'partnershop',
'options.5' => 'OPEN ANONYMOUSLY',
'options.6' => 'OPEN IN NEW TAB',
'options.7' => 'OPEN',
'proxytext' => 'Result link is opened anonymously. Your data will not be transfered to destination servers. Eventually some links will not work as usual.'
];
\ No newline at end of file
<?php
return [
"options.headline" => "Opciónes",
"options.savetab" => "Grabar resultado",
"options.1" => "Nueva búsqueda en este dominio",
"options.2" => "ocultar :host",
"options.3" => "ocultar *.:domain",
"options.4" => "Tienda asociada",
"options.5" => "abrir anónimo",
"proxytext" => "Abrirá el link anonimizado."
'options.headline' => 'Opciónes',
'options.savetab' => 'Grabar resultado',
'options.1' => 'Nueva búsqueda en este dominio',
'options.2' => 'ocultar :host',
'options.3' => 'ocultar *.:domain',
'options.4' => 'Tienda asociada',
'options.5' => 'ABRIR ANÓNIMO',
'options.6' => 'ABRIR NUEVA PESTAÑA',
'options.7' => 'ABRIR',
'proxytext' => 'Abrirá el link anonimizado.'
];
......@@ -50,13 +50,13 @@
</div>
<div class="result-footer">
<a class="result-open" href="{{ $result->link }}" target="_self" rel="noopener">
ÖFFNEN
{!! trans('result.options.7') !!}
</a>
<a class="result-open-newtab" href="{{ $result->link }}" target="_blank" rel="noopener">
IN NEUEM TAB
{!! trans('result.options.6') !!}
</a>
<a class="result-open-proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
ANONYM ÖFFNEN
{!! trans('result.options.5') !!}
</a>
<label class="open-result-options" for="result-toggle-{{$result->number}}" role="button">
MEHR
......
......@@ -17,6 +17,8 @@
</div>
</div>
<div class="modal-body">
<input type="checkbox" class="hidden" id="toggle-dropdowns" checked>
<label id="toggle-dropdowns-label" for="toggle-dropdowns" class="js-only"></label>
<form id="customSearchForm" method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<input type="hidden" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif">
<input type="hidden" name="encoding" value="utf8">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment