Commit 4e243132 authored by Aria Givi's avatar Aria Givi

Merge remote-tracking branch 'origin/development' into 554-uberarbeitete-spendenseite

parents 62220eab 2bf3274f
......@@ -12,6 +12,12 @@ class MetaGerSearch extends Controller
public function search(Request $request, MetaGer $metager)
{
$focus = $request->input("focus", "web");
if ($focus === "maps") {
$searchinput = $request->input('eingabe', '');
return redirect()->to('https://maps.metager.de/map/' . $searchinput . '/1240908.5493525574,6638783.2192695495,6');
}
if ($focus !== "angepasst" && $this->startsWith($focus, "focus_")) {
$metager->parseFormData($request);
if ($metager->doBotProtection($request->input('bot', ""))) {
......
......@@ -13,7 +13,7 @@ $(document).ready(function () {
function activateJSOnlyContent () {
$('#searchplugin').removeClass('hide');
$('.options').removeClass('hide');
$('.js-only').removeClass('js-only');
}
function tabs () {
......
......@@ -285,14 +285,16 @@ a {
.saver-options {
display: flex;
padding-bottom: 15px;
&>input{
&>input {
min-width: 35%;
max-width: 80%;
}
}
.ui-effects-transfer {
border: 1px dotted black;
}
.result {
margin-bottom: 10px;
width: 100%;
......@@ -310,13 +312,11 @@ a {
cursor: pointer;
}
}
&>.remover {
cursor:pointer;
cursor: pointer;
text-align: right;
color: #777;
}
.title {
color: @result-title-color;
text-decoration: none;
......@@ -350,10 +350,6 @@ a {
padding-left: 8px;
padding-right: 5px;
}
.options>a>i {
font-size: 16px;
color: #2A2ADE;
}
}
.link-link {
white-space: nowrap;
......@@ -368,6 +364,9 @@ a {
font-size: 14px;
line-height: 1.3;
clear: both;
.date {
font-weight: bold;
}
p {
margin: 0;
margin-bottom: 4px;
......@@ -399,6 +398,45 @@ a {
color: @result-hoster-a-color;
}
}
.options {
.option-opener-icon {
display: block;
padding-left: 8px;
padding-right: 5px;
font-size: 16px;
color: #2A2ADE;
}
.option-checkbox {
visibility: hidden;
}
.option-content {
display: none;
background-color: white;
z-index: 1000;
position: absolute;
border: grey solid 1px;
color: black;
font-size: 16px;
border-radius: 5px;
hr {
margin: 5px;
}
li {
padding: 5px
}
li:not(.option-title):hover {
background-color: #e0e0e0;
}
a, a:hover, a:focus, a:visited {
color: black;
display: block;
}
}
.option-opener:focus+.option-content, .option-content:hover {
display: initial;
animation-name: open-contents;
}
}
.proxy {
font-size: 13px;
margin-top: 0;
......@@ -453,6 +491,10 @@ a {
overflow: hidden;
}
.js-only {
display: none;
}
/* Hier der Style für die Bilder */
......
......@@ -106,16 +106,6 @@ ul.metager-dropdown-menu {
background-clip: padding-box;
max-height: 0px;
overflow: hidden;
-webkit-transition: max-height 1s ease, padding 1s ease;
-moz-transition: max-height 1s ease, padding 1s ease;
-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;
&>li>a {
display: block;
padding: 3px 20px;
......@@ -220,7 +210,6 @@ ul.metager-dropdown-menu {
width: 100%;
max-height: 40px;
overflow: hidden;
transition: max-height 1s ease;
}
#metager-static-nav-list:target {
max-height: 1000px;
......
<?php
return [
'options.headline' => 'Optionen',
'options.savetab' => 'Ergebnis in Tab speichern.',
'options.1' => 'Suche auf dieser Domain neu starten',
'options.2' => ':host ausblenden',
'options.3' => '*.:domain ausblenden',
......
......@@ -4,11 +4,12 @@ return [
"head.1" => "About us",
"head.2" => "What are the advantages of using MetaGer?",
"head.3" => "MetaGer - Characteristic qualities",
"head.4" => "How to support the SUMA-EV and MetaGer:",
"3.0" => "implementation of free access to knowledge and digital democracy with:",
"3.1" => "access to knowledge without control and dictation by states or trusts.",
"3.2" => "no storage of private data, highest demand of privacy.",
"3.3" => "and anonymous access also to the search results, therefore.",
"3.4" => "realized through: anony,ous proxy an the Hidden-Tor-Branch, ",
"3.4" => "realized through: anonymous proxy an the Hidden-Tor-Branch, ",
"3.5" => "as an Open-Source-Software which allows examining and checks.",
"3.6" => "these features are realized not only for search and find of informations but also for route-planning and geographical search (<a href=\"https://maps.metager.de\" target=\"_blank\">maps.metager.de</a>), WITHOUT tracking any locations.",
"3.7" => "embedded in a transparent organization (Nonprofit organization <a href=\"https://suma-ev.de\" target=\"_blank\">SUMA-EV</a>), each and every can become a member of it.",
......
......@@ -12,7 +12,7 @@ return [
"maps.playstore" => "Google Playstore",
"maps.1" => "This App provides a native integration of <a href=\"https://maps.metager.de\" target=\"_blank\">MetaGer Maps</a> (powered by <a href=\"https://www.openstreetmap.de/\" target=\"_blank\">Openstreetmap</a>) on your mobile Android device.",
"maps.2" => "Therefore, the route planner and the navigation service is running very fast on your smartphone. The app is faster compared against the use in a mobile web browser. And there are some more advantages- check it out!",
"maps.3" => "This Android App is not yet available in the Google Playstore (coming soon). After the first start you will be asked for the following permissions:",
"maps.3" => "After the first start you will be asked for the following permissions:",
"maps.list.1" => "Access to positioning data => With GPS activated we can provide better search results. With this you get access to the step-by-step navigation. <b> Of course, we don't store any of your data and we don't give any of your data to third persons.</b>",
"maps.list.2" => "Access to images, media and files on the device => This permit is necessary for the automated update of the App. If there is a newer version it can be stored in your download archive and will be installed automatically. Without this permission you have to do a manual installation every time there is an update.",
"head.4" => "Installation",
......
......@@ -35,6 +35,6 @@ return [
"anweisung.3" => "- send it by mail to: SUMA-EV, Roeselerstr. 3, D-30159 Hanover, Germany or",
"anweisung.4" => "- scan and email it to office@suma-ev.de. ",
"anweisung.5" => "When sending by mail or fax, please let us know this. Write a short mail to: office@suma-ev.de",
"anweisung.6" => "Member contributions to the SUMA-EV are tax deductible under German law, since the association by the tax office Hannover Nord is a non profit organization. A tax receipt will be automatically in January or February of the following year sent. ",
"anweisung.6" => "Member contributions to the SUMA-EV are tax deductible under German law, since the association by the tax office Hannover Nord is a non profit organization. A tax receipt will sent if desired. ",
"anweisung.7" => "Print"
];
\ No newline at end of file
......@@ -60,5 +60,6 @@ return [
"faq.19.b.2" => "Here: <a href=hilfe#custom-focus-help>Help</a>",
"faq.20.h" => "Where can I find the search engines settings?",
"faq.20.b" => "See here: <a href=\"#custom-focus-faq\">\"Is it possible to chose the requested search engines by myself?\"</a>",
"faq.21.h" => "Why is MetaGer presenting the umlauts in a wrong way?"
"faq.21.h" => "Why is MetaGer presenting the umlauts in a wrong way?",
"faq.21.b" => "A wrong presentation of umlauts is commonly caused by an outdated Plugin. If so: please deinstall the old one an then click \"Add MetaGer-Plugin\" on <a href=\"https://metager.de\" target=\"_blank\">MetaGer-Startpage</a>. Perhaps, there is another reason: you didn't use the correct startpage. Always use <a href=\"https://metager.de\" target=\"_blank\">MetaGer.de</a>.\r\nIf all this doesn't work, please contact us: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>"
];
\ No newline at end of file
This diff is collapsed.
......@@ -3,11 +3,11 @@
return [
'headline.1' => 'Contact',
'headline.2' => 'Forum',
'headline.3' => 'If you have a technical question, ask it at our <a href="http://forum.suma-ev.de/" target="_blank" rel="noopener">board</a> first, please',
'headline.4' => 'By this way others can benefit from an answer.',
'headline.3' => 'If you have a technical question, ask the community at our <a href="http://forum.suma-ev.de/" target="_blank" rel="noopener">board</a> first, please.',
'headline.4' => 'So others could benefit from an answer.',
'form.1' => 'Secure Contact Form',
'form.2' => 'Via this form you can contact us by encrypted <a href="mailto:office@suma-ev.de">email</a>.',
'form.2' => 'Via this form you can contact us by encrypted e-mail.',
'form.3' => 'Please note that due to a lot of requests we are personnel-wise not able to answer everything promptly.',
'form.4' => 'If you do not enter an email-adress, we can not answer you.',
......
<?php
return [
'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",
"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
......@@ -2,7 +2,7 @@
return [
"head.1" => "Settings",
"head.2" => "Here you can customize your MetaGer: After selecting your desired settings, you have to choose whether you want to save the settings permanently or just for once, <a href=\"#unten\">on the bottom of this page.</a>",
"head.2" => "Here you can customize your MetaGer: After selecting your desired settings, you have to choose whether you want to save the settings permanently or for one time use. Please confirm with one of the buttons on the bottom of this page.",
"allgemein.1" => "General",
"quotes.label" => "Sayings",
"quotes.on" => "show",
......
......@@ -2,7 +2,7 @@
return [
"headline.1" => "Your Donation for MetaGer to SUMA-EV",
"headline.2" => 'Please help to keep free and open search engines free and open on the Internet. The digital knowledge of the world must stay free from surveillance and control by governments or companies and must be publicly accessible to everyone. Please click <a href="https://metager.de/about" rel="noopener" target=_blank>here</a> for more information about us.',
"headline.2" => 'Please help to keep free and open search engines free and open on the Internet. The digital knowledge of the world must stay free from surveillance and control by governments or companies and must be publicly accessible to everyone. Click <a href="https://metager.de/en/about" rel="noopener" target=_blank>here</a> for more information about us.',
"bankinfo.1" => "By bank transfer",
"bankinfo.2" => "SUMA-EV\r\nIBAN: DE64 4306 0967 4075 0332 01\r\nBIC: GENODEM1GLS\r\n(Account-No.: 4075 0332 01, Bank Code: 43060967)\r\nGLS Gemeinschaftsbank, Bochum",
"bankinfo.3" => "If you wish to receive a donation receipt,\r\nplease specify your full adress and (if available)\r\nyour E-Mail adress on the money transfer form.",
......@@ -13,7 +13,7 @@ return [
"lastschrift.1" => "Donate by wire transfer",
"lastschrift.2" => "Enter your account data along with the desired amount. We will debit your bank account accordingly.",
"lastschrift.3" => "Please enter your name:",
"lastschrift.3.placeholder" => "name",
"lastschrift.3.placeholder" => "Name",
"lastschrift.4" => "Your E-Mail adress:",
"lastschrift.5" => "Your phone number to verify your donation by callback:",
"lastschrift.6" => "Your IBAN or bank account number:",
......@@ -21,11 +21,11 @@ return [
"lastschrift.8" => "Here you can informally tell us, what amount you want to donate monthly and perhaps send a message with it",
"lastschrift.8.placeholder" => "message",
"lastschrift.9" => "Donate",
"lastschrift.10" => "Your information is transmitted encrypted and is not read by a third party. The amount you enter will be debited from your account by us. SUMA-EV only uses your information for accounting; Your information is not passed on. Donations to the SUMA-EV are tax-deductible, because the association is recognized as charitable by the Finanzamt Hannover Nord (revenue board), listed in the register of associations, Amtsgericht Hannover under VR200033. A certificate for single donations above 200,-EUR is sent automatically. For donations below 200,-EUR an account current is enough for tax-deduction.",
"lastschrift.10" => "Your information is transmitted encrypted and is not read by a third party. The amount you enter will be debited from your account by us. SUMA-EV only uses your information for accounting; Your information is not passed on. Donations to the SUMA-EV are tax-deductible, because the association is recognized as charitable by the Finanzamt Hannover Nord (revenue board), listed in the register of associations, Amtsgericht Hannover under VR200033. A certificate for single donations above 200,-EUR is sent automatically (post address is required!). For donations below 200,-EUR an account current is enough for tax-deduction.",
"drucken" => "print",
"about.1" => "About us",
"about.2" => "The German search engine MetaGer is operated and permanently refined by SUMA-EV - Verein für freien Wissenszugang. We are a non-profit and charitable NGO and one of our goals is the development and operation of search engines. We do not receive any public funding and therefore are relying on your donations.\r\nPlease help to preserve and develope free and open search engines on the Internet. You can do this by donating on our website.\r\nOr if you want to help open search engines on the long run:\r\n <a href=\"https://metager.de/en/beitritt\" target=\"_blank\" rel=\"noopener\">Become a SUMA-EV member</a>",
"about.3" => 'You can use our <a href="https://metager.de/spende" rel="noopener" target="_blank">donation form</a> for single donations. If you donate more than 100,-EUR or become a member of <a href=\"http://suma-ev.de/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a> , you or your company can obtain one or more sponsoring links on our <a href=\"http://suma-ev.de/suma-links/index.html#sponsors\" target=\"_blank\" rel=\"noopener\">members and sponsors pages</a> linked to your homepage (if available). If you want that, please tell us within your donation message. <a href=\"https://metager.de/klassik/spenden1.html\" target=\"_blank\" rel=\"noopener\">Or become a SUMA-EV sponsor!</a>',
"about.3" => 'You can use our <a href="https://metager.de/en/spende" rel="noopener" target="_blank">donation form</a> for single donations. If you donate more than 100,-EUR or become a member of <a href=\"http://suma-ev.de/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a> , you or your company can obtain one or more sponsoring links on our <a href=\"http://suma-ev.de/suma-links/index.html#sponsors\" target=\"_blank\" rel=\"noopener\">members and sponsors pages</a> linked to your homepage (if available). If you want that, please tell us within your donation message. <a href=\"https://metager.de/klassik/spenden1.html\" target=\"_blank\" rel=\"noopener\">Or become a SUMA-EV sponsor!</a>',
"about.4" => "<a href=\"http://suma-ev.de/unterstuetzung/index.html\" target=\"_blank\" rel=\"noopener\">Every form of support</a> helps open search engines and open knowledge access to have a chance on the Internet. Open Knowledge access also includes that neither your information is monitored, nor your Internet adresses and connection data is collected. We anonymise your Internet adress during search, it is not stored and not passed on. Open Internet search without surveillance: <a href=\"/en/\" target=\"_blank\" rel=\"noopener\">MetaGer.de!</a>",
"about.5" => "Another possibility to help MetaGer is to make your next online purchase via a MetaGer support shop. We became part of the <a href=\"https://www.boost-project.com/de\" target=\"_blank\" rel=\"noopener\">www.boost-project.com</a> to be able to be supported this way. The project unites around 700 online shops (from Amazon to Zooplus), that all declared to donate around 6% of every sale. Instead of directly browsing the online shop, use this link next time: <a href=\"/en/\" target=\"_blank\" rel=\"noopener\">MetaGer.de!</a> and click below the search term box on <a href=\"https://www.boost-project.com/de/shops?charity_id=1129&tag=bl\" target=\"_blank\" rel=\"noopener\">\"Purchase at affiliate shop\" - click here!</a> This click brings you to the boost project shop selection. There you choose your shop and keep on shopping as usual. That is all. If enough people do this, we do not need ads anymore. Just two clicks for you - a chance for open knowledge access for the digital world.",
"danke.title" => "Thank you very much!! We received your donation message for MetaGer to SUMA-EV",
......
......@@ -213,13 +213,6 @@
<span class="content">{{ trans('index.foki.web') }}</span>
</label>
</div>
<div class="focus">
<input id="bilder" class="focus-radio hide" type="radio" name="focus" value="bilder" form="searchForm" @if ($focus === 'bilder') checked @endif required="">
<label id="bilder-label" class="focus-label" for="bilder">
<i class="fa fa-picture-o" aria-hidden="true"></i>
<span class="content">{{ trans('index.foki.bilder') }}</span>
</label>
</div>
<div class="focus">
<input id="nachrichten" class="focus-radio hide" type="radio" name="focus" value="nachrichten" form="searchForm" @if ($focus === 'nachrichten') checked @endif required="">
<label id="nachrichten-label" class="focus-label" for="nachrichten">
......@@ -241,6 +234,13 @@
<span class="content">{{ trans('index.foki.produkte') }}</span>
</label>
</div>
<div class="focus">
<input id="maps" class="focus-radio hide" type="radio" name="focus" value="maps" form="searchForm" @if ($focus === 'maps') checked @endif required="">
<label id="maps-label" class="focus-label" for="maps">
<i class="fa fa-map" aria-hidden="true"></i>
<span class="content">{{ trans('index.foki.maps') }}</span>
</label>
</div>
{{-- Fix for older Versions --}}
@if ($focus === 'angepasst')
<div class="focus">
......@@ -312,11 +312,11 @@
<a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin') }}</a></li>
@if (LaravelLocalization::getCurrentLocale() == "de")
<li>
<a href="https://suma-ev.de/presse/Werbefreie-Suche-mit-MetaGer.html" target="_blank" class="btn btn-default mutelink">
Werbefreie Suche mit MetaGer
</a>
</li>
@endif
<a href="https://suma-ev.de/presse/Werbefreie-Suche-mit-MetaGer.html" target="_blank" class="btn btn-default mutelink">
Werbefreie Suche mit MetaGer
</a>
</li>
@endif
</ul>
<script src="{{ elixir('js/scriptStartPage.js') }}"></script>
@endsection
......
......@@ -16,38 +16,42 @@
{{ $result->anzeigeLink }}
</a>
</div>
<div class="options hide">
<a tabindex="0" data-toggle="popover" data-trigger="focus" data-placement="auto bottom" data-container="body" data-html="true" data-title="<i class='fa fa-cog' aria-hidden='true'></i> Optionen">
@if(strlen($metager->getSite()) === 0)
<i class="fa fa-caret-down" aria-hidden="true"></i>
@endif
</a>
<div class="content hidden">
<ul class="options-list list-unstyled small">
<li>
<a href="javascript:resultSaver({{ $result->number }});" class="saver" data-counter="{{ $result->number }}">
<i class="glyphicon glyphicon-floppy-disk"></i> Ergebnis in Tab speichern.
</a>
</li>
<li>
<a href="{{ $metager->generateSiteSearchLink($result->strippedHost) }}">
{!! trans('result.options.1') !!}
</a>
</li>
<li>
<a href="{{ $metager->generateRemovedHostLink($result->strippedHost) }}">
{!! trans('result.options.2', ['host' => $result->strippedHost]) !!}
</a>
</li>
@if( $result->strippedHost !== $result->strippedDomain )
<div class="options">
<a class="option-opener" href="javascript:void(0);">
<i class="fa fa-caret-down option-opener-icon" aria-hidden="true"></i>
</a>
<div class="option-content">
<ul class="option-list list-unstyled small">
<li class="option-title">
<i class="fa fa-cog"></i> {!! trans('result.options.headline') !!}
</li>
<hr>
<li class="js-only">
<a href="javascript:resultSaver({{ $result->number }});" class="saver" data-counter="{{ $result->number }}">
<i class="fa fa-floppy-disk"></i> {!! trans('result.options.savetab') !!}
</a>
</li>
@if(strlen($metager->getSite()) === 0)
<li>
<a href="{{ $metager->generateSiteSearchLink($result->strippedHost) }}">
{!! trans('result.options.1') !!}
</a>
</li>
@endif
<li>
<a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
{!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
<a href="{{ $metager->generateRemovedHostLink($result->strippedHost) }}">
{!! trans('result.options.2', ['host' => $result->strippedHost]) !!}
</a>
</li>
@endif
</ul>
</div>
@if( $result->strippedHost !== $result->strippedDomain )
<li>
<a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
{!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
</a>
</li>
@endif
</ul>
</div>
</div>
</div>
<span class="hoster">
......@@ -81,7 +85,7 @@
</div>
@else
@if( $metager->getFokus() == "nachrichten" )
<div class="description">{{ isset($result->additionalInformation["date"])?date("Y-m-d H:i:s", $result->additionalInformation["date"]):"" }} {{ $result->descr }}</div>
<div class="description"><span class="date">{{ isset($result->additionalInformation["date"])?date("Y-m-d H:i:s", $result->additionalInformation["date"]):"" }}</span> {{ $result->descr }}</div>
@else
<div class="description">{{ $result->descr }}</div>
@endif
......
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