Commit 8c159032 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch 'development' into 310-ergebnisseiten-styles-in-less-code-ubernehmen

parents e13c86fb 6dc154f2
......@@ -42,4 +42,15 @@ return [
'faq.15.b' => 'MetaGer gibt es seit 1996 ... die Einzelheiten der Entstehungsgeschichte kann man hier in einem Interview nachlesen: <a href="http://blog.suma-ev.de/node/207" target="_blank" rel="noopener">http://blog.suma-ev.de/node/207</a>.',
'faq.16.h' => 'Darf ich einen Link auf euch setzen? oder Darf ich auf euch verlinken ?',
'faq.16.b' => 'Ja! Sie dürfen 1000-sende von Links auf uns setzen!! Sie dürfen das selbst dann, wenn Sie über manche Dinge des Lebens eine andere Meinung haben als wir, selbst dann, wenn Sie nicht die gleiche Partei wählen oder eine andere Meinung über die einzig richtige Art der Rechtschreibung haben. Sie dürfen Links auf alles von uns setzen, was Sie wollen. Je mehr, je besser! Noch lieber wäre es uns natürlich, wenn Sie (vielleicht im Rahmen der Verbesserung Ihrer Webseiten) unser Widget nutzen würden. Bitte schauen Sie unter dem Punkt "Dienste" nach.',
'faq.17.h' => 'Wie kann ich MetaGer als Standardsuche mit Plugin installieren?',
'faq.17.b.1' => 'Eine kleine Einweisung, wie Sie MetaGer als voreingestellte Suche mit Plugin installieren (gegebenenfalls mit Deinstallation des alten Plugins):',
'faq.17.b.2' => '<b>Für Firefox:</b>',
'faq.17.b.3' => '1. Bitte klicken Sie im Firefox im Menü "Bearbeiten" auf "Einstellungen" (engl. Version: "Preferences") und',
'faq.17.b.4' => '2. wählen dort den Reiter "Suche" (engl. Version: "Search")',
'faq.17.b.5' => '3. wenn sich dort unten in der Liste ein MetaGer-Eintrag findet, dann',
'faq.17.b.6' => '4. selektieren Sie den bitte und',
'faq.17.b.7' => '5. klicken unten rechts unter der Liste auf "Entfernen" (engl. Version: "Remove").',
'faq.17.b.8' => '6. Dann gehen Sie auf die MetaGer-Startseite (https://metager.de/) und',
'faq.17.b.9' => '7. klicken auf den Button "MetaGer-Plugin hinzufügen" und folgen Sie bitte den Anweisungen dort.',
'faq.17.b.10' => 'Sie können MetaGer natürlich immer auch OHNE Plugin benutzen, indem Sie in die Adresszeile Ihres Browsers "metager.de" eintippen.',
];
<?php
return [
"achtung" => "Warning! For our website is in constant development there are continuous changes to the structure and functionality of our website. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
"achtung" => "Warning! Structure and functionality of our website are subject to constant development and changes. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
"title" => "MetaGer - FAQ",
......@@ -16,8 +16,8 @@ return [
"faq.5.h" => "One search engine does not answer anymore",
"faq.5.b" => "If you observe this it is probably a technical fault. Please email us in that case: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>",
"faq.6.h" => "Inappropriate Content",
"faq.6.b.1" => "> I found results with illegal content.",
"faq.6.b.2" => "If you found content through MetaGer, which you think is illegal, you can email us at <a href=\"mailto:jugendschutz@metager.de\" target=\"_blank\" rel=\"noopener\">jugendschutz@metager.de</a>.",
"faq.6.b.1" => "I found results with illegal content.",
"faq.6.b.2" => "If some content (found by MetaGer) seems to be illegal, please email us to <a href=\"mailto:jugendschutz@metager.de\" target=\"_blank\" rel=\"noopener\">jugendschutz@metager.de</a>.",
"faq.7.h" => "Is it possible to integrate MetaGer into my own website?",
"faq.7.b" => "No problem! We have a <a href=\"/en/widget\" target=_blank>widget</a> that you can use free of charge.",
"faq.8.h" => "How can I register my homepage on MetaGer?",
......@@ -25,5 +25,25 @@ return [
"faq.9.h" => "How does the MetaGer ranking work?",
"faq.9.b" => "You can check <a href=\"https://gitlab.metager3.de/open-source/MetaGer\" target=_blank>our source code</a> to find out.",
"faq.10.h" => "I can't use MetaGer with my browser X and operating system Y. I need help!",
"faq.15.h" => "How was MetaGer started, what is the story behind MetaGer?",
"faq.10.b" => "Please try first to install the newest available plugin. Just use the link below the searchfield, it has an automatic browserdetection. If it is still not working, please let us know: <a href=\"mailto:office@suma-ev.de\" target=\"_blank\" rel=\"noopener\">office@suma-ev.de</a>",
"faq.11.h" => "Where did you get all these nice sayings?",
"faq.11.b" => "We find some in the web but we've got the most of them from Alexander Hammer. We don't provide them in english....",
"faq.12.h" => "How can I delete the search suggestions?",
"faq.12.b" => "This is provided by your webbrowser. Try to customize the history settings.",
"faq.13.h" => "What is about the privacy and how long / what do you store?",
"faq.13.b.1" => "The protection of private data is our general principle. Everything we do is subordinated to this principle. Therefore we do not work with Cookies, Session IDs or anything else. More exact information: <a href=\"/datenschutz/\" target=\"_blank\" rel=\"noopener\">https://metager.de/datenschutz/</a>",
"faq.13.b.2" => "Besides: we do not store and we do not even know your IP-address. We use serversided anonymization for the communication with the prompted search services. We think that searchengines work well without storing IP-addresses. What do we do additionally?",
"faq.13.b.3" => "You may wish to hide your IP-address generally. We provide a free proxyservice. Click \"tools\" for more exact information: ",
"faq.15.h" => "How was MetaGer started, what is the story behind MetaGer?",
"faq.17.h" => "How to add MetaGer as a standard search engine (using the plugin)",
"faq.17.b.1" => "A short instruction how to add the metager plugin to your webbrowser (includes deinstallation if necessary):",
"faq.17.b.2" => "<b>For the Firefox webbrowser:</b>",
"faq.17.b.3" => "1. Please choose \"Edit/preferences\" from the menu and",
"faq.17.b.4" => "2. pick \"Search\".",
"faq.17.b.5" => "3. If there is an entry \"MetaGer\" in the below list then",
"faq.17.b.6" => "4. select this entry and",
"faq.17.b.7" => "5. click \"Remove\" on the right side below the list.",
"faq.17.b.8" => "6. Open the MetaGer startpage (https://metager.de/en) and",
"faq.17.b.9" => "7. click \"Add the MetaGer-Plugin\" below the searchfield. Please follow the given advices.",
"faq.17.b.10" => "Of course, you can use MetaGer without that plugin at any time. Just type \"metager.de\" into your browsers address bar.",
];
<?php
return [
"achtung" => "Warning! For our website is in constant development there are continuous changes to the structure and functionality of our website. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
"achtung" => "Warning! Structure and functionality of our website are subject to constant development and changes. We try to update our help pages as quickly as possible, but can not prevent temporary mistakes.",
"title" => "MetaGer Help",
"einstellungen" => "Preferences",
"dienste" => "Tools-free of charge",
......@@ -38,5 +38,5 @@ return [
"mehrwortsuche.2" => "Example: search for Shakespears <div class=\"well well-sm\">to be or not to be</div> will deliver many results, but the exact phrase will only be found using <div class=\"well well-sm\">\"to be or nor to be\"</div>",
"grossklein.title" => "Upper case vs. lower case",
"grossklein.1" => "Upper case will not be distinguished from lower case",
"grossklein.2" => "Searching for <div class=\"well well-sm\">Shakespeare</div> or <div class=\"well well-sm\">SHAKESPEARE</div> will deliver the same results that <div class=\"well well-sm\">shakespeare</div>",
"grossklein.2" => "Searching for <div class=\"well well-sm\">Shakespeare</div> or <div class=\"well well-sm\">SHAKESPEARE</div> will deliver the same results as <div class=\"well well-sm\">shakespeare</div>",
];
......@@ -138,4 +138,21 @@
<p>{!! trans('faq.faq.16.b') !!}</p>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('faq.faq.17.h') !!}</h3>
</div>
<div class="panel-body">
<p>{!! trans('faq.faq.17.b.1') !!}</p>
<p>{!! trans('faq.faq.17.b.2') !!}</p>
<p>{!! trans('faq.faq.17.b.3') !!}</p>
<p>{!! trans('faq.faq.17.b.4') !!}</p>
<p>{!! trans('faq.faq.17.b.5') !!}</p>
<p>{!! trans('faq.faq.17.b.6') !!}</p>
<p>{!! trans('faq.faq.17.b.7') !!}</p>
<p>{!! trans('faq.faq.17.b.8') !!}</p>
<p>{!! trans('faq.faq.17.b.9') !!}</p>
<p>{!! trans('faq.faq.17.b.10') !!}</p>
</div>
</div>
@endsection
......@@ -32,12 +32,6 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="https://maps.metager.de/?q={{ $metager->getQ() }}&controls=false&limit=3" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
......
......@@ -25,12 +25,6 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="https://maps.metager.de/?q={{ $metager->getQ() }}&controls=false&limit=3" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
......
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