diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index b466939083e6fa8e3fd9334b5c0bb06339da0608..9b89c79e7d8177fbd5d037033cbf4deb64ecf0b1 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -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', ""))) {
diff --git a/resources/assets/js/scriptResultPage.js b/resources/assets/js/scriptResultPage.js
index 4c935c8c89bcc771593f445d2fe3eced7e9f0384..b5e90c7f15ce030ba6cd7a12c2d862390196d0ac 100644
--- a/resources/assets/js/scriptResultPage.js
+++ b/resources/assets/js/scriptResultPage.js
@@ -13,7 +13,7 @@ $(document).ready(function () {
function activateJSOnlyContent () {
$('#searchplugin').removeClass('hide');
- $('.options').removeClass('hide');
+ $('.js-only').removeClass('js-only');
}
function tabs () {
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 54fea771557f0d454909bb904dbf9f9728850df3..8866a211f8a17395b8ad65ac42209cbf27a9b2d8 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -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 */
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index f07d24c463f94abde0d9ab903a72d8108f99cb27..51dd987b7239c31163dd158a81cdccf2c487b053 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -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;
diff --git a/resources/lang/de/result.php b/resources/lang/de/result.php
index 65ceae065ba98693682ec0fb47bb6260785caffd..a891febec1b253b0645dd2a6f17a11bd93b5cefa 100644
--- a/resources/lang/de/result.php
+++ b/resources/lang/de/result.php
@@ -1,6 +1,8 @@
<?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',
diff --git a/resources/lang/en/about.php b/resources/lang/en/about.php
index ea7a7f68412a3f730e4c6e1df60bc7811701037f..50a58b62ba1ade71a8d2a9906459924c67cd5d66 100644
--- a/resources/lang/en/about.php
+++ b/resources/lang/en/about.php
@@ -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.",
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index d38644e15e68eceb66ce3ff940a67d35f2265941..08a887df46db9caa5d38db9098a3e982cb2c237c 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -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",
diff --git a/resources/lang/en/beitritt.php b/resources/lang/en/beitritt.php
index 9baf2b23e14f24b156846f6c791abdad0ebb8cb6..c1a92501dd1a7622813f65ca655f3c0ce38e657d 100644
--- a/resources/lang/en/beitritt.php
+++ b/resources/lang/en/beitritt.php
@@ -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
diff --git a/resources/lang/en/faq.php b/resources/lang/en/faq.php
index 09fa6ee0b4a380b9a0c549995b2a0ed2131bf6e7..1cb8e2a5a4a8f7661782d3776d4d52caa35987a4 100644
--- a/resources/lang/en/faq.php
+++ b/resources/lang/en/faq.php
@@ -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
diff --git a/resources/lang/en/hilfe.php b/resources/lang/en/hilfe.php
index 1962bc5dbee8e4f4e25b7a4c9a61122fd01a3363..a7d90d9eb6c4bf75cb81c49aca6024bd000eab7d 100644
--- a/resources/lang/en/hilfe.php
+++ b/resources/lang/en/hilfe.php
@@ -1,78 +1,92 @@
<?php
return [
- "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",
- "allgemein.title" => "Common settings",
- "allgemein.2" => "The colour drop on the left side of the search field allows you to apply your favourite colour to MetaGer.",
- "allgemein.3" => "Add MetaGer to your browsers search engines by clicking the \"Add the MetaGer Plugin\" button just below the search field.",
- "suchfokus.title" => "Select a search focus / using the \"customize\" button",
- "sucheingabe.title" => "Search field",
- "sucheingabe.hint" => "The following <i>searches and web pages</i> are just examples. Replace them by your own in practice.",
- "stopworte.title" => "Stopwords",
- "stopworte.1" => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word",
- "stopworte.2" => "Example: You are looking for a new car, but no BMW. Then your search should be <div class=\"well well-sm\">new car -bmw</div>",
- "mehrwortsuche.title" => "Searching for more than one word",
- "mehrwortsuche.1" => "Without quotation you will get results containing one or some of the words of your search entry. Use quotes for the search for exact phrases, citations....",
- "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>",
- "mehrwortsuche.3" => "Please use quotes to make sure to get your search words in the results list.",
- "mehrwortsuche.4" => "Put words or phrases in quotation marks to search for exact combinations.",
- "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 as <div class=\"well well-sm\">shakespeare</div>",
- "domains.title" => "Restrict to specific domain(s) / exclude domain(s)",
- "domains.sitesearch.explanation" => "Type site:<i>your-domain-here.uk</i> to restrict the search to that domain.",
- "domains.sitesearch.example.1" => "Example: I want to restrict my search to en.wikipedia.org. Type:",
- "domains.sitesearch.example.2" => "<i>my search words</i> site:en.wikipedia.org",
- "domains.sitesearch.example.3" => "Example: Restriction to wikipedia but all languages:",
- "domains.sitesearch.example.4" => "Type: <i>my search words</i> site:wikipedia.org",
- "domains.blacklist.explanation" => "Exclude a specific domain: Either the exclusion of a subdomain or of a top level domain. Type <i>my search words</i> -site:<i>en.wikipedia.org</i> or <i>my search words</i> -site:*.<i>wikipedia.org</i>",
- "domains.blacklist.example.1" => "Example: You do not want to get results from Wikipedia. There are two possibilities:",
- "domains.blacklist.example.2" => "Exclude results from the english Wikipedia (domain) so <i>en.wikipedia.org</i>",
- "domains.blacklist.example.3" => "<i>my search words</i> -site:<i>en.wikipedia.org</i>",
- "domains.blacklist.example.4" => "You get results from e.g. de.wikipedia.org further on.",
- "domains.blacklist.example.5" => "Exclude all results of all wikipedia domains:",
- "domains.blacklist.example.6" => "<i>my search words</i> -site:*.<i>wikipedia.org</i>",
- "domains.showcase.explanation.1" => "Additionally there is the option to exclude hosts or domains on the result page: All of the results have the small triangle sign:",
- "domains.showcase.explanation.2" => "Click for the menu shown below:",
- "domains.showcase.menu.1" => "Decide here:",
- "domains.showcase.menu.2" => "To cache your search results in a separate tab (see <a href=\"#searchinsearch\"> here</a>)",
- "domains.showcase.menu.3" => "To start a new search with just the domain of the result (de.wikipedia.de)",
- "domains.showcase.menu.4" => "To start a search without the results of that subdomain (de.wikipedia.de)",
- "domains.showcase.menu.5" => "To start a search without results of the top level domain (wikipedia.de)",
- "domains.showcase.menu.6" => "Click \"Options\" to try it now.",
- "dienste" => "Tools-free of charge",
- "app.title" => "Android-App",
- "app.1" => "You can use MetaGer within an app, too. To do so just download the <a href=\"https://play.google.com/store/apps/details?id=de.metager.metagerapp\" target=\"_blank\" rel=\"noopener\">MetaGer App</a> on your Android smartphone.",
- "plugin.title" => "Browser-Plugin",
- "plugin.1" => "There is a MetaGer Plugin for most of the common web browsers. The plugin provides easy search from the web browsers search field. Find out more: <a href=\"/#plugin-modal\" target=\"_blank\" rel=\"noopener\">MetaGer Plugin</a>.",
- "suchwortassoziator.title" => "Finding connotations to searchwords",
- "suchwortassoziator.1" => "Ask the <a href=\"https://metager.de/klassik/asso/\" target=\"_blank\" rel=\"noopener\">MetaGer-Web-Assoziator</a> (Tools / Associator) to find connotations in a subject area. The service doesn't append upon any language because it uses webdocuments as a source. Therefore, you find any connotations to your used language and vice-versa.",
- "suchwortassoziator.2" => "Example: you want to know more about \"tick bites\" and its dangers but you forgot the technical terms around this issue. The \"Assoziator\" presents \"Borreliose\" and \"fsme\" among others.",
- "suchwortassoziator.3" => "Please let us know if something unsuitable appears. Please use our <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact form</a>.",
- "widget.title" => "MetaGer widget",
- "widget.1" => "Provide full MetaGer functionality to your own website! Just select Tools / widget on our startpage, decide whether you want a powerful websearch or a sitesearch -which may be useful on your own pages. Enter the domainname and let the script do the rest. Questions to: <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact form</a>",
- "urlshort.title" => "URL-shortener",
- "urlshort.1" => "Click: \"Tools / URL-shortener\": Imagine your nice website \"http://www.all-lawn-tennis-clubs-strawberry-sales-price-check.co.uk\". Just shorten it to \"metager.to/check-all\" or anything you like. MetaGer and Yourls then provide the redirection.",
- "dienste.kostenlos" => "All our services are cost free. You do not pay with your data.",
- "datenschutz.title" => "Privacy",
- "datenschutz.1" => "Cookies, Session-IDs, IP addresses",
- "datenschutz.2" => "We don't store or work with any personal information (For the purpose of securing our servers against Hacking- and Bot-Attacks, we need to store these information for a short period of time. It will be then automatically deleted afterwards). We provide further privacy security services as follows:",
- "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>',
- "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/",
- "proxy.title" => "MetaGer proxy server",
- "proxy.1" => "Looking at the MetaGer result page, you will find a link \"open anonymously\" marked by a small lock at the right of every single result. Use this link to hide behind the MetaGer proxy server. The provided protection is limited to the website you reached from our result page. Protection persists while you see https://proxy.suma-ev.de/?url=...in your webbrowser‘s address field.",
- "infobutton.title" => "I see a <i class=\"fa fa-info-circle info-details-available\" aria-hidden=\"true\"></i> in some spots. What is it?",
- "infobutton.1" => "You gain more information on the specific theme by clicking it (e.g. weather data or something).",
- "maps.title" => "MetaGer maps",
- "maps.1" => "MetaGer provides a map function: On a result page you see a new focus on the upper right, called \"maps.MetaGer.de\". You receive a map according to your search by click (only Germany for the moment). Use the \"customize\" page for toggling maps function \"show/hide\", you will get a durably embedded small map on the result page, then.",
- "maps.2" => "After loading the map shows POIs according to the MetaGer results. You see them in the right column too. Mouseover a POI highlights its counterpart. Click \"Details\" to get further information (Nominatim data base) to this POI.",
- "maps.3" => "The maps are rendered before (except for the last three ones) and fast available. Affect the zoom level by mouse-wheel or the \"+ / -\" buttons in the upper left corner of the map.",
- "sucheingabe" => "Enter search words",
-];
+ "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",
+ "allgemein.title" => "Common settings",
+ "allgemein.1" => "Click this button for search settings:",
+ "allgemein.2" => "The colour drop on the left side of the search field allows you to apply your favourite colour to MetaGer.",
+ "allgemein.3" => "Add MetaGer to your browsers search engines by clicking the \"Add the MetaGer Plugin\" button just below the search field.",
+ "suchfokus.title" => "Select a search focus / using the \"customize\" button",
+ "suchfokus.1" => "There are five predefined search settings (foci) above the search field. These should be enough for the most demands. ( \"Web\", \"Pictures\", \"News/Politics\", \"Science\", \"Shopping\").",
+ "suchfokus.2" => "Click this button to create an own search focus:",
+ "suchfokus.3" => "At first give a name to your new focus. Then choose your desired engines and click \"Save search focus\".",
+ "suchfokus.4" => "You may change / edit your own focus by clicking the pencil: (<i class=\"fa fa-pencil\" aria-hidden=\"true\"></i>)",
+ "sucheingabe.title" => "Search field",
+ "sucheingabe.hint" => "The following <i>searches and web pages</i> are just examples. Replace them by your own in practice.",
+ "stopworte.title" => "Stopwords",
+ "stopworte.1" => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word",
+ "stopworte.2" => "Example: You are looking for a new car, but no BMW. Then your search should be <div class=\"well well-sm\">new car -bmw</div>",
+ "mehrwortsuche.title" => "Searching for more than one word",
+ "mehrwortsuche.1" => "Without quotation you will get results containing one or some of the words of your search entry. Use quotes for the search for exact phrases, citations....",
+ "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>",
+ "mehrwortsuche.3" => "Please use quotes to make sure to get your search words in the results list.",
+ "mehrwortsuche.4" => "Put words or phrases in quotation marks to search for exact combinations.",
+ "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 as <div class=\"well well-sm\">shakespeare</div>",
+ "domains.title" => "Restrict to specific domain(s) / exclude domain(s)",
+ "domains.sitesearch.explanation" => "Type site:<i>your-domain-here.uk</i> to restrict the search to that domain.",
+ "domains.sitesearch.example.1" => "Example: I want to restrict my search to en.wikipedia.org. Type:",
+ "domains.sitesearch.example.2" => "<i>my search words</i> site:en.wikipedia.org",
+ "domains.sitesearch.example.3" => "Example: Restriction to wikipedia but all languages:",
+ "domains.sitesearch.example.4" => "Type: <i>my search words</i> site:wikipedia.org",
+ "domains.blacklist.explanation" => "Exclude a specific domain: Either the exclusion of a subdomain or of a top level domain. Type <i>my search words</i> -site:<i>en.wikipedia.org</i> or <i>my search words</i> -site:*.<i>wikipedia.org</i>",
+ "domains.blacklist.example.1" => "Example: You do not want to get results from Wikipedia. There are two possibilities:",
+ "domains.blacklist.example.2" => "Exclude results from the english Wikipedia (domain) so <i>en.wikipedia.org</i>",
+ "domains.blacklist.example.3" => "<i>my search words</i> -site:<i>en.wikipedia.org</i>",
+ "domains.blacklist.example.4" => "You get results from e.g. de.wikipedia.org further on.",
+ "domains.blacklist.example.5" => "Exclude all results of all wikipedia domains:",
+ "domains.blacklist.example.6" => "<i>my search words</i> -site:*.<i>wikipedia.org</i>",
+ "domains.showcase.explanation.1" => "Additionally there is the option to exclude hosts or domains on the result page: All of the results have the small triangle sign:",
+ "domains.showcase.explanation.2" => "Click on the menu shown below:",
+ "domains.showcase.menu.1" => "Decide here:",
+ "domains.showcase.menu.2" => "To cache your search results in a separate tab (see <a href=\"#searchinsearch\"> here</a>)",
+ "domains.showcase.menu.3" => "To start a new search with just the domain of the result (de.wikipedia.de)",
+ "domains.showcase.menu.4" => "To start a search without the results of that subdomain (de.wikipedia.de)",
+ "domains.showcase.menu.5" => "To start a search without results of the top level domain (wikipedia.de)",
+ "domains.showcase.menu.6" => "Click \"Options\" to try it now.",
+ "urls.title" => "Exclude URLs",
+ "urls.explanation" => "Use \"-url:\" to exclude search results containing specified words.",
+ "urls.example.1" => "Example: You don' t want the word \"dog\" in the results:",
+ "urls.example.2" => "Type <i>my search words</i> -url:dog",
+ "dienste" => "Tools-free of charge",
+ "app.title" => "Android-App",
+ "app.1" => "You can use MetaGer within an app, too. To do so just download the <a href=\"https://play.google.com/store/apps/details?id=de.metager.metagerapp\" target=\"_blank\" rel=\"noopener\">MetaGer App</a> on your Android smartphone.",
+ "plugin.title" => "Browser-Plugin",
+ "plugin.1" => "There is a MetaGer Plugin for most of the common web browsers. The plugin provides easy search from the web browsers search field. Find out more: <a href=\"/#plugin-modal\" target=\"_blank\" rel=\"noopener\">MetaGer Plugin</a>.",
+ "suchwortassoziator.title" => "Finding connotations to searchwords",
+ "suchwortassoziator.1" => "Ask the <a href=\"https://metager.de/klassik/asso/\" target=\"_blank\" rel=\"noopener\">MetaGer-Web-Assoziator</a> (Tools / Associator) to find connotations in a subject area. The service doesn't append upon any language because it uses webdocuments as a source. Therefore, you find any connotations to your used language and vice-versa.",
+ "suchwortassoziator.2" => "Example: you want to know more about \"tick bites\" and its dangers but you forgot the technical terms around this issue. The \"Assoziator\" presents \"Borreliose\" and \"fsme\" among others.",
+ "suchwortassoziator.3" => "Please let us know if something unsuitable appears. Please use our <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact form</a>.",
+ "widget.title" => "MetaGer widget",
+ "widget.1" => "Provide full MetaGer functionality to your own website! Just select Tools / widget on our startpage, decide whether you want a powerful websearch or a sitesearch -which may be useful on your own pages. Enter the domainname and let the script do the rest. Questions to: <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact form</a>",
+ "urlshort.title" => "URL-shortener",
+ "urlshort.1" => "Click: \"Tools / URL-shortener\": Imagine your nice website \"http://www.all-lawn-tennis-clubs-strawberry-sales-price-check.co.uk\". Just shorten it to \"metager.to/check-all\" or anything you like. MetaGer and Yourls then provide the redirection.",
+ "dienste.kostenlos" => "All our services are cost free. You do not pay with your data.",
+ "datenschutz.title" => "Privacy",
+ "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.1" => "Cookies, Session-IDs, IP addresses",
+ "datenschutz.2" => "We don't store or work with any personal information (For the purpose of securing our servers against Hacking- and Bot-Attacks, we need to store these information for a short period of time. It will be then automatically deleted afterwards). We provide further privacy security services as follows:",
+ "datenschutz.3" => "For more details see \"Tools\" above.",
+ "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/",
+ "proxy.title" => "MetaGer proxy server",
+ "proxy.1" => "Looking at the MetaGer result page, you will find a link \"open anonymously\" marked by a small lock at the right of every single result. Use this link to hide behind the MetaGer proxy server. The provided protection is limited to the website you reached from our result page. Protection persists while you see https://proxy.suma-ev.de/?url=...in your webbrowser‘s address field.",
+ "infobutton.title" => "I see a <i class=\"fa fa-info-circle info-details-available\" aria-hidden=\"true\"></i> in some spots. What is it?",
+ "infobutton.1" => "You gain more information on the specific theme by clicking it (e.g. weather data or something).",
+ "maps.title" => "MetaGer maps",
+ "maps.1" => "MetaGer provides a map function: On a result page you see a new focus on the upper right, called \"maps.MetaGer.de\". You receive a map according to your search by click (only Germany for the moment). Use the \"customize\" page for toggling maps function \"show/hide\", you will get a durably embedded small map on the result page, then.",
+ "maps.2" => "After loading the map shows POIs according to the MetaGer results. You see them in the right column too. Mouseover a POI highlights its counterpart. Click \"Details\" to get further information (Nominatim data base) to this POI.",
+ "maps.3" => "The maps are rendered before (except for the last three ones) and fast available. Affect the zoom level by mouse-wheel or the \"+ / -\" buttons in the upper left corner of the map.",
+ "maps.4" => "All maps are prerendered and quickly useable (but the 3 highest levels). Please regulate the zoom level with the mousewheel or the \"+ / -\" buttons in the upper left corner of the map.",
+ "sucheingabe" => "Enter search words",
+ "bang.title" => "!bangs",
+ "bang.1" => "MetaGer uses a little a special spelling called \"!bang syntax\". A !bang starts with the \"!\" and doesn' t contain blanks (\"!twitter\", \"!facebook\" for example). If you use a !bang supported by MetaGer you will see a new entry in the \"Quicktips\". We direct then to the specified service (click the button). Read more about our method departing from others: <a href=\"/faq/#bangs\" target=\"_blank\" rel=\"noopener\">unseren FAQ</a>",
+ "searchinsearch.title" => "Search in search",
+ "searchinsearch.1" => "To use \"Search in search\" click the small blue triangle <a href=\"#exampleimg\"> at the right of the results URL. Then click \"Save result in TAB\" in the context menu. The result will then be stored in a new TAB appearing at the right of the other TABs (\"Web\", \"Shopping\" etc.). It is called \"Saved results\". You can store here single results from several searches. The TAB persists. Entering this TAB you get your personal result list with tools to filter and sort the results. Click another TAB to go back for further searches. More info (only german so far): <a href=\"http://blog.suma-ev.de/node/225\" target=\"_blank\" rel=\"noopener\"> http://blog.suma-ev.de/node/225</a>."
+];
\ No newline at end of file
diff --git a/resources/lang/en/kontakt.php b/resources/lang/en/kontakt.php
index 7c8261e050631269785d964d6dfff02bb0b3d15f..1d70cd7777cab5a055543d093f4be502a8f9a2eb 100644
--- a/resources/lang/en/kontakt.php
+++ b/resources/lang/en/kontakt.php
@@ -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.',
diff --git a/resources/lang/en/result.php b/resources/lang/en/result.php
index c75352a7146da9f670b3cc76939c3fd89243e05c..7f9b4ee0d19f9ca2b2e9bce61666c087f9f2a108 100644
--- a/resources/lang/en/result.php
+++ b/resources/lang/en/result.php
@@ -1,10 +1,12 @@
<?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
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 097faaeace248a3620e174a529e1f1618079dfe8..6383b8f32d5dd7985efd5138a7fce8a091d2ba91 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -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",
diff --git a/resources/lang/en/spende.php b/resources/lang/en/spende.php
index 3c4aa43a3eb1615c01e8734cdded6915624e66b6..3ed11f81080f1d93e8b620e25dd2cb464637dd91 100644
--- a/resources/lang/en/spende.php
+++ b/resources/lang/en/spende.php
@@ -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",
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 1b1e743941aacbbbf4eb70fb070f3e101afa0bd5..b2937fa18d6b1f4f52fc1ffa98febacf5a5e5de3 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -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
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index b75fa046638c8886d50d16bea2f2d8eba67a7a59..5a8f828b1982cef73c28c904e5e5d5a34ffe82ce 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -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