diff --git a/resources/lang/de/about.php b/resources/lang/de/about.php
index 51ac526f8500bef505647576fd24baa7127c7b1d..aff24b560c660da9c954ce0756631eb884c262f2 100644
--- a/resources/lang/de/about.php
+++ b/resources/lang/de/about.php
@@ -1,14 +1,14 @@
<?php
return [
- 'head.1' => 'Ãœber uns',
- 'head.2' => 'Welche Vorteile bietet die Nutzung von MetaGer?',
+ 'head.1' => 'Ãœber uns',
+ 'head.2' => 'Welche Vorteile bietet die Nutzung von MetaGer?',
- 'list.1' => 'Datenschutz und Privatsphäre sind bei uns einfach und selbstverständlich: Fertig eingebaut und automatisch bei jeder Suche angewandt. <a href="/datenschutz/">Mehr dazu…</a>',
- 'list.2' => 'Wir arbeiten nicht gewinnorientiert, wir sind ein <a href="/spende/">gemeinnütziger Verein</a>: Wir haben nicht das Ziel, uns durch Ihre Klicks und schon gar nicht durch Ihre Daten zu bereichern.',
- 'list.3' => '<a href="https://de.wikipedia.org/wiki/MetaGer" target="_blank" rel="noopener">MetaGer</a> ist primär eine <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank" rel="noopener"><em>Meta</em>-Suchmaschine:</a> Wir fragen bis zu 50 Suchmaschinen ab. Damit können wir echte Vielfalt in den Ergebnissen liefern.',
- 'list.4' => 'Wir bevorzugen in unseren Suchergebnissen nicht das, <a href="https://de.wikipedia.org/wiki/Filterblase" target="_blank" rel="noopener">was viel angeklickt wird</a>: Auch dadurch erhalten Sie nicht nur den Mainstream, sondern Vielfältigkeit.',
- 'list.5' => '<a href="https://blog.suma-ev.de/node/207" target="_blank" rel="noopener">MetaGer ist seit 20 Jahren am Netz</a>, entstanden in der Uni-Hannover am <a href="http://noack-grasdorf.de" target="_blank" rel="noopener">RRZN</a>: Unsere Erfahrung ist Ihr Vorteil - wir wissen was wir tun.',
- 'list.5.1' => 'Unsere Server werden ausschließlich mit Ökostrom betrieben.',
- 'list.6' => 'Aber auch wir sind nicht fehlerfrei: Wenn Ihnen bei uns Merkwürdiges begegnet: Bitte <a href="/kontakt/" target="_blank" rel="noopener">kontaktieren Sie uns</a>! Wir nehmen Ihre Hinweise ernst: <em>Sie</em> sind uns das Wichtigste.',
+ 'list.1' => 'Datenschutz und Privatsphäre sind bei uns einfach und selbstverständlich: Fertig eingebaut und automatisch bei jeder Suche angewandt. <a href="/datenschutz/">Mehr dazu…</a>',
+ 'list.2' => 'Wir arbeiten nicht gewinnorientiert, wir sind ein <a href="/spende/">gemeinnütziger Verein</a>: Wir haben nicht das Ziel, uns durch Ihre Klicks und schon gar nicht durch Ihre Daten zu bereichern.',
+ 'list.3' => '<a href="https://de.wikipedia.org/wiki/MetaGer" target="_blank" rel="noopener">MetaGer</a> ist primär eine <a href="https://de.wikipedia.org/wiki/Metasuchmaschine" target="_blank" rel="noopener"><em>Meta</em>-Suchmaschine:</a> Wir fragen bis zu 50 Suchmaschinen ab. Damit können wir echte Vielfalt in den Ergebnissen liefern.',
+ 'list.4' => 'Wir bevorzugen in unseren Suchergebnissen nicht das, <a href="https://de.wikipedia.org/wiki/Filterblase" target="_blank" rel="noopener">was viel angeklickt wird</a>: Auch dadurch erhalten Sie nicht nur den Mainstream, sondern Vielfältigkeit.',
+ 'list.5' => '<a href="https://blog.suma-ev.de/node/207" target="_blank" rel="noopener">MetaGer ist seit 20 Jahren am Netz</a>, entstanden in der Uni-Hannover am <a href="http://noack-grasdorf.de" target="_blank" rel="noopener">RRZN</a>: Unsere Erfahrung ist Ihr Vorteil - wir wissen was wir tun.',
+ 'list.6' => 'Unsere Server werden ausschließlich mit Ökostrom betrieben.',
+ 'list.7' => 'Aber auch wir sind nicht fehlerfrei: Wenn Ihnen bei uns Merkwürdiges begegnet: Bitte <a href="/kontakt/" target="_blank" rel="noopener">kontaktieren Sie uns</a>! Wir nehmen Ihre Hinweise ernst: <em>Sie</em> sind uns das Wichtigste.',
];
diff --git a/resources/lang/de/datenschutz.php b/resources/lang/de/datenschutz.php
index 2b3647fc8dd8e468e59d00ef318f901fde7f3066..656e2b2919cbcc7fb051b4ff2c7c1292037dcda4 100644
--- a/resources/lang/de/datenschutz.php
+++ b/resources/lang/de/datenschutz.php
@@ -1,28 +1,28 @@
<?php
return [
- 'head' => 'Datenschutz und Privatsphäre',
+ 'head' => 'Datenschutz und Privatsphäre',
- 'general.1' => 'Datenschutz und Privatsphäre gehören für uns zu den wichtigsten Gütern im Internet. Sie sind absolut schützenswert und dürfen keinesfalls kommerziell genutzt werden. Im Folgenden eine kurze Auflistung unserer Vorgehensweise. Eine ausführliche Darstellung mit Hintergrund-Informationen, warum wir die einzige wirklich sichere Suchmaschine betreiben, finden Sie <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">in unserem Blog</a>.',
+ 'general.1' => 'Datenschutz und Privatsphäre gehören für uns zu den wichtigsten Gütern im Internet. Sie sind absolut schützenswert und dürfen keinesfalls kommerziell genutzt werden. Im Folgenden eine kurze Auflistung unserer Vorgehensweise. Eine ausführliche Darstellung mit Hintergrund-Informationen, warum wir die einzige wirklich sichere Suchmaschine betreiben, finden Sie <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">in unserem Blog</a>.',
- 'general.3' => 'Nur Software, dessen Quellcode öffentlich zugänglich ist, kann von jedem überprüft werden. In allen anderen Fällen müssen User <em>glauben</em>, was Betreiber oder "Gütesiegel"-Verkäufer behaupten. MetaGer ist Freie Software unter der GNU-AGPLv3-Lizenz (siehe dazu die <a href="http://heise.de/-3295586" target="_blank" rel="noopener"> Nachricht im Heise-Ticker</a>). Der MetaGer-Quellcode steht Ihnen unter folgendem Link zur Verfügung: <a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank" rel="noopener">https://gitlab.metager3.de/open-source/MetaGer</a><br />Sie müssen uns nichts glauben: Sie können es selber kontrollieren!',
+ 'general.3' => 'Nur Software, dessen Quellcode öffentlich zugänglich ist, kann von jedem überprüft werden. In allen anderen Fällen müssen User <em>glauben</em>, was Betreiber oder "Gütesiegel"-Verkäufer behaupten. MetaGer ist Freie Software unter der GNU-AGPLv3-Lizenz (siehe dazu die <a href="http://heise.de/-3295586" target="_blank" rel="noopener"> Nachricht im Heise-Ticker</a>). Der MetaGer-Quellcode steht Ihnen unter folgendem Link zur Verfügung: <a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank" rel="noopener">https://gitlab.metager3.de/open-source/MetaGer</a><br />Sie müssen uns nichts glauben: Sie können es selber kontrollieren!',
- 'policy.1' => 'Unsere Vorgehensweise/Policy:',
- 'policy.2' => 'Wir speichern weder Ihre IP-Adresse, noch den
+ 'policy.1' => 'Unsere Vorgehensweise/Policy:',
+ 'policy.2' => 'Wir speichern weder Ihre IP-Adresse, noch den
<a href="http://www.heise.de/security/meldung/Fingerprinting-Viele-Browser-sind-ohne-Cookies-identifizierbar-1982976.html" target="_blank" rel="noopener">"Fingerabdruck" Ihres Browsers</a> (der Sie mit hoher Wahrscheinlichkeit ebenfalls eindeutig identifizieren könnte).',
- 'policy.5' => 'Wir setzen keine Cookies oder benutzen Tracking-Pixel oder ähnliche Technologien, um unsere Nutzer zu "tracken" (tracken = Verfolgen der Bewegungen im Internet).',
- 'policy.6' => 'Die Datenübertragung von MetaGer erfolgt ausschließlich automatisch verschlüsselt über das https-Protokoll.',
- 'policy.7' => 'Wir bieten einen Zugang über das anonyme TOR-Netzwerk, den <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e" target="_blank" rel="noopener">MetaGer-TOR-hidden Service.</a>',
+ 'policy.5' => 'Wir setzen keine Cookies oder benutzen Tracking-Pixel oder ähnliche Technologien, um unsere Nutzer zu "tracken" (tracken = Verfolgen der Bewegungen im Internet).',
+ 'policy.6' => 'Die Datenübertragung von MetaGer erfolgt ausschließlich automatisch verschlüsselt über das https-Protokoll.',
+ 'policy.7' => 'Wir bieten einen Zugang über das anonyme TOR-Netzwerk, den <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e" target="_blank" rel="noopener">MetaGer-TOR-hidden Service.</a>',
- 'policy.9' => 'Da der Zugang über das TOR-Netzwerk vielen Nutzern kompliziert erscheint, manchmal auch langsam ist, haben wir einen weiteren Weg implementiert, die Ergebnis-Webseiten ebenfalls anonym erreichen zu können: durch Anklicken des Links "anonym öffnen". Dadurch sind Ihre persönlichen Daten beim Klick auf MetaGer-Ergebnisse und sogar bei allen Folge-Klicks danach geschützt.',
- 'policy.10' => 'Wir machen möglichst wenig Werbung, kennzeichnen diese klar und eindeutig, und vertrauen für unsere Finanzierung auf unsere Nutzer, Ihre <a href="/spende/">Spenden</a> und Mitgliedsbeträge zum <a href="http://suma-ev.de/" target="_blank" rel="noopener">SUMA-EV</a>.',
+ 'policy.9' => 'Da der Zugang über das TOR-Netzwerk vielen Nutzern kompliziert erscheint, manchmal auch langsam ist, haben wir einen weiteren Weg implementiert, die Ergebnis-Webseiten ebenfalls anonym erreichen zu können: durch Anklicken des Links "anonym öffnen". Dadurch sind Ihre persönlichen Daten beim Klick auf MetaGer-Ergebnisse und sogar bei allen Folge-Klicks danach geschützt.',
+ 'policy.10' => 'Wir machen möglichst wenig Werbung, kennzeichnen diese klar und eindeutig, und vertrauen für unsere Finanzierung auf unsere Nutzer, Ihre <a href="/spende/">Spenden</a> und Mitgliedsbeträge zum <a href="http://suma-ev.de/" target="_blank" rel="noopener">SUMA-EV</a>.',
- 'policy.13' => 'MetaGer wird von der deutschen gemeinnützigen Organisation <a href="http://suma-ev.de/" target="_blank" rel="noopener">SUMA-EV</a> in Zusammenarbeit mit der <a href="http://www.uni-hannover.de/" target="_blank" rel="noopener">Leibniz Universität Hannover</a> betrieben und weiterentwickelt.',
+ 'policy.13' => 'MetaGer wird von der deutschen gemeinnützigen Organisation <a href="http://suma-ev.de/" target="_blank" rel="noopener">SUMA-EV</a> in Zusammenarbeit mit der <a href="http://www.uni-hannover.de/" target="_blank" rel="noopener">Leibniz Universität Hannover</a> betrieben und weiterentwickelt.',
- 'policy.17' => 'Unsere Server stehen ausschließlich in Deutschland. Sie unterliegen damit vollständig deutschem Datenschutzrecht, welches als das härteste der Welt gilt.',
- 'policy.17.1' => 'Wir schützen nicht nur Ihre Daten, sondern auch die Umwelt: Unsere Server werden ausschließlich mit Ökostrom betrieben.',
- 'policy.18' => 'Nach den <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank" rel="noopener">Enthüllungen von Edward Snowden im Juni 2013</a> positionierten sich etliche Suchmaschinen mit der Selbstbeschreibung, dass Suchen bei ihnen sicher sei, weil die IP-Adressen der Nutzer nicht gespeichert würden. So ehrenwert und auch ehrlich gemeint diese Selbstbeschreibungen sein mögen - Fakt ist, dass viele dieser Suchmaschinen zumindest einen Teil ihrer Server in den USA hosten. Das gilt auch für diejenigen, die von manchen Datenschützern immer noch als "besonders empfehlenswert" gelobt und als Empfehlung verbreitet werden. Denn diese Suchmaschinen <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank" rel="noopener">unterliegen nach dem Patriot Act und US-Recht dem vollen Zugriff der dortigen Behörden.</a> Sie können also gar keine geschützte Privatsphäre bieten (selbst dann nicht, wenn sie selber sich noch so sehr darum bemühen).',
+ 'policy.17' => 'Unsere Server stehen ausschließlich in Deutschland. Sie unterliegen damit vollständig deutschem Datenschutzrecht, welches als das härteste der Welt gilt.',
+ 'policy.18' => 'Wir schützen nicht nur Ihre Daten, sondern auch die Umwelt: Unsere Server werden ausschließlich mit Ökostrom betrieben.',
+ 'policy.19' => 'Nach den <a href="http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html" target="_blank" rel="noopener">Enthüllungen von Edward Snowden im Juni 2013</a> positionierten sich etliche Suchmaschinen mit der Selbstbeschreibung, dass Suchen bei ihnen sicher sei, weil die IP-Adressen der Nutzer nicht gespeichert würden. So ehrenwert und auch ehrlich gemeint diese Selbstbeschreibungen sein mögen - Fakt ist, dass viele dieser Suchmaschinen zumindest einen Teil ihrer Server in den USA hosten. Das gilt auch für diejenigen, die von manchen Datenschützern immer noch als "besonders empfehlenswert" gelobt und als Empfehlung verbreitet werden. Denn diese Suchmaschinen <a href="http://de.wikipedia.org/wiki/USA_PATRIOT_Act" target="_blank" rel="noopener">unterliegen nach dem Patriot Act und US-Recht dem vollen Zugriff der dortigen Behörden.</a> Sie können also gar keine geschützte Privatsphäre bieten (selbst dann nicht, wenn sie selber sich noch so sehr darum bemühen).',
- 'twitter' => 'Was andere über unser Privacy-Konzept auf Twitter sagen:',
+ 'twitter' => 'Was andere über unser Privacy-Konzept auf Twitter sagen:',
];
diff --git a/resources/lang/de/kontakt.php b/resources/lang/de/kontakt.php
index 63caa353ede2dd190cc93c161b352c49b3ae2d35..f57a29906a09377dd39a9c67055bde5d3df9bd79 100644
--- a/resources/lang/de/kontakt.php
+++ b/resources/lang/de/kontakt.php
@@ -9,16 +9,12 @@ return [
'form.1' => 'Sicheres Kontakformular',
'form.2' => 'Über dieses Formular können Sie uns verschlüsselt kontaktieren.
Alternativ können Sie uns natürlich auch per <a href="mailto:office@suma-ev.de">email</a> erreichen.',
-
'form.3' => 'Beachten Sie: Aufgrund der Vielzahl der Anfragen sind wir personell nicht immer in der Lage, alles zeitnah zu beantworten.',
'form.4' => 'Wenn Sie keine email-Adresse angeben, können wir Ihnen nicht antworten.',
'form.5' => 'Ihre e-mail-Adresse (optional)',
'form.6' => 'Ihre Nachricht',
- 'form.7' => 'Ihre Nachricht wird vor dem Absenden mit',
- 'form.8' => 'verschlüsselt.
-Dafür wird Javascript benötigt.',
- 'form.9' => 'Falls Sie Javascript deaktiviert haben, wird Ihre Eingabe unverschlüsselt gesendet.',
- 'form.10' => 'Verschlüsseln und senden',
+ 'form.7' => '<strong>Ihre Nachricht wird vor dem Absenden mit <a href="http://openpgpjs.org/.">OpenPGP.js</a> verschlüsselt. Dafür wird Javascript benötigt.</strong> Falls Sie Javascript deaktiviert haben, wird Ihre Eingabe unverschlüsselt gesendet.',
+ 'form.8' => 'Verschlüsseln und senden',
'mail.1' => 'Per Email',
'mail.2' => 'Sie können uns auch direkt eine email an die folgende Adresse schicken: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a>',
diff --git a/resources/lang/en/about.php b/resources/lang/en/about.php
index ef57f4b00226957e9b7ba8d0aa2a323c044c6da4..8723624f8d6f0419305f9acb3965fa5321eb1221 100644
--- a/resources/lang/en/about.php
+++ b/resources/lang/en/about.php
@@ -1,13 +1,13 @@
<?php
return [
- "head.1" => "About us",
- "head.2" => "What are the advantages of using MetaGer?",
- "list.1" => "Privacy is quite natural for us: Completely built in and automatically applied to every search. <a href=\"/en/datenschutz/\">More about privacy...</a>",
- "list.2" => "We do not work profit-oriented, we are a <a href=\"/en/spende/\">charitable association</a>: Our goal is not to enrich ourselves with your clicks or even your data.",
- "list.3" => "<a href=\"https://en.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> is primarily a <a href=\"https://de.wikipedia.org/wiki/Metasuchmaschine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>: We query up to 50 search engines. Thus we can offer real variety in results.",
- "list.4" => "For our results, we do not prefer results <a href=\"https://en.wikipedia.org/wiki/Filter_bubble\" target=\"_blank\" rel=\"noopener\">that are clicked more often</a>: This also gives you variety, instead of mainstream.",
- "list.5" => "MetaGer is online since about 20 years: Our experience is your advantage - we know what we do.",
- "list.5.1" => "We only use green electricity for our servers.",
- "list.6" => "But we are not perfect as well: If you encounter something weird: Please <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact us</a>! We take your hints seriously: <em>You</em> are most important for us."
+ "head.1" => "About us",
+ "head.2" => "What are the advantages of using MetaGer?",
+ "list.1" => "Privacy is quite natural for us: Completely built in and automatically applied to every search. <a href=\"/en/datenschutz/\">More about privacy...</a>",
+ "list.2" => "We do not work profit-oriented, we are a <a href=\"/en/spende/\">charitable association</a>: Our goal is not to enrich ourselves with your clicks or even your data.",
+ "list.3" => "<a href=\"https://en.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> is primarily a <a href=\"https://de.wikipedia.org/wiki/Metasuchmaschine\" target=\"_blank\" rel=\"noopener\">meta search engine</a>: We query up to 50 search engines. Thus we can offer real variety in results.",
+ "list.4" => "For our results, we do not prefer results <a href=\"https://en.wikipedia.org/wiki/Filter_bubble\" target=\"_blank\" rel=\"noopener\">that are clicked more often</a>: This also gives you variety, instead of mainstream.",
+ "list.5" => "MetaGer is online since about 20 years: Our experience is your advantage - we know what we do.",
+ "list.6" => "We only use green electricity for our servers.",
+ "list.7" => "But we are not perfect as well: If you encounter something weird: Please <a href=\"/en/kontakt/\" target=\"_blank\" rel=\"noopener\">contact us</a>! We take your hints seriously: <em>You</em> are most important for us.",
];
diff --git a/resources/lang/en/datenschutz.php b/resources/lang/en/datenschutz.php
index c03a38c628429b805d48bc9dcb520f7ad3076f53..e7ded153b7a9d50e761956879375ab29c900baa8 100644
--- a/resources/lang/en/datenschutz.php
+++ b/resources/lang/en/datenschutz.php
@@ -1,19 +1,19 @@
<?php
return [
- "head" => "Privacy",
- "general.1" => "For us, privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small summary of our approach.",
- "general.3" => "Only free software with open source code is under control of any user. In\r\nall other cases the users have to <em>believe</em> what the maintainers tell about\r\nwhat is going on inside. If maintainers claim that they have strictly\r\nimplemented privacy and data protecion, users have to believe them.\r\nMetaGer is free software under GNU-AGPLv3 Licence. It is available to\r\nanyone at <a href=\"https://gitlab.metager3.de/open-source/MetaGer\">https://gitlab.metager3.de/open-source/MetaGer</a>.",
- "policy.1" => "Our Approach/Policy:",
- "policy.2" => "Neither do we save your IP, nor the\r\n<a href=\"https://en.wikipedia.org/wiki/Canvas_fingerprinting\" target=\"_blank\" rel=\"noopener\">\"fingerprint\" of your Browser</a> (which most likely could identify you as well).",
- "policy.5" => "We do not set cookies or use tracking-pixels or similar technology, to \"track\" our users (tracking = following a users digital movement on the internet).",
- "policy.6" => "Data transmission is only done encrypted via the https protocol.",
- "policy.7" => "We offer access via the anonymous TOR network, the <a href=\"http://forum.suma-ev.de/viewtopic.php?f=3&t=1029&sid=eae857f3102365f76636508ca030dc56\" target=\"_blank\" rel=\"noopener\">MetaGer hidden service</a>.",
- "policy.9" => "Since access via the TOR-network seems complicated to many users and often slow, we offer a proxy server, to visit the result pages anonymously: By clicking on the link \"open anonymously\" your personal information will be protected on this click and even on all following clicks.",
- "policy.10" => "We show as few advertisements as possible, clearly marking them, and financially rely on our users, their <a href=\"/en/spende/\">Donations</a> and membership fees for <a href=\"http://suma-ev.de/en/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a>.",
- "policy.13" => "Metager is operated and developed by the charitable german organisation <a href=\"http://suma-ev.de/en/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a> in cooperation with the <a href=\"http://www.uni-hannover.de/\" target=\"_blank\" rel=\"noopener\">Leibniz University Hanover</a>.",
- "policy.17" => "Our Servers are located exclusively in germany. Therefore they are governed by the german privacy law, which is among the strictest world wide.",
- "policy.17.1" => "We don't even protect data but also the environment: we only use green electricity for our servers.",
- "policy.18" => "Since the <a href=\"http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html\" target=\"_blank\" rel=\"noopener\">revealments of Edward Snowden in June 2013</a> numerous search engines claim that they protect their users' privacy, because the users' IP adresses are not saved. No matter how honorable these descriptions are - many search engines at least partially host their servers in the USA. Because these search engines are, <a href=\"http://de.wikipedia.org/wiki/USA_PATRIOT_Act\" target=\"_blank\" rel=\"noopener\">as per the Patriot Act and US law</a>, unprotected against the access of local authorities. Thus they cannot provide protection of personal data (even if they really try to).",
- "twitter" => "What others say about our privacy-concept on twitter:"
-];
\ No newline at end of file
+ "head" => "Privacy",
+ "general.1" => "For us, privacy is one of the most important goods on the internet. It needs to be preserved and is not to be used for profit. The following is a small summary of our approach.",
+ "general.3" => "Only free software with open source code is under control of any user. In\r\nall other cases the users have to <em>believe</em> what the maintainers tell about\r\nwhat is going on inside. If maintainers claim that they have strictly\r\nimplemented privacy and data protecion, users have to believe them.\r\nMetaGer is free software under GNU-AGPLv3 Licence. It is available to\r\nanyone at <a href=\"https://gitlab.metager3.de/open-source/MetaGer\">https://gitlab.metager3.de/open-source/MetaGer</a>.",
+ "policy.1" => "Our Approach/Policy:",
+ "policy.2" => "Neither do we save your IP, nor the\r\n<a href=\"https://en.wikipedia.org/wiki/Canvas_fingerprinting\" target=\"_blank\" rel=\"noopener\">\"fingerprint\" of your Browser</a> (which most likely could identify you as well).",
+ "policy.5" => "We do not set cookies or use tracking-pixels or similar technology, to \"track\" our users (tracking = following a users digital movement on the internet).",
+ "policy.6" => "Data transmission is only done encrypted via the https protocol.",
+ "policy.7" => "We offer access via the anonymous TOR network, the <a href=\"http://forum.suma-ev.de/viewtopic.php?f=3&t=1029&sid=eae857f3102365f76636508ca030dc56\" target=\"_blank\" rel=\"noopener\">MetaGer hidden service</a>.",
+ "policy.9" => "Since access via the TOR-network seems complicated to many users and often slow, we offer a proxy server, to visit the result pages anonymously: By clicking on the link \"open anonymously\" your personal information will be protected on this click and even on all following clicks.",
+ "policy.10" => "We show as few advertisements as possible, clearly marking them, and financially rely on our users, their <a href=\"/en/spende/\">Donations</a> and membership fees for <a href=\"http://suma-ev.de/en/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a>.",
+ "policy.13" => "Metager is operated and developed by the charitable german organisation <a href=\"http://suma-ev.de/en/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a> in cooperation with the <a href=\"http://www.uni-hannover.de/\" target=\"_blank\" rel=\"noopener\">Leibniz University Hanover</a>.",
+ "policy.17" => "Our Servers are located exclusively in germany. Therefore they are governed by the german privacy law, which is among the strictest world wide.",
+ "policy.18" => "We don't even protect data but also the environment: we only use green electricity for our servers.",
+ "policy.19" => "Since the <a href=\"http://www.heise.de/newsticker/meldung/Bericht-US-Regierung-zapft-Kundendaten-von-Internet-Firmen-an-1884264.html\" target=\"_blank\" rel=\"noopener\">revealments of Edward Snowden in June 2013</a> numerous search engines claim that they protect their users' privacy, because the users' IP adresses are not saved. No matter how honorable these descriptions are - many search engines at least partially host their servers in the USA. Because these search engines are, <a href=\"http://de.wikipedia.org/wiki/USA_PATRIOT_Act\" target=\"_blank\" rel=\"noopener\">as per the Patriot Act and US law</a>, unprotected against the access of local authorities. Thus they cannot provide protection of personal data (even if they really try to).",
+ "twitter" => "What others say about our privacy-concept on twitter:",
+];
diff --git a/resources/lang/en/kontakt.php b/resources/lang/en/kontakt.php
index 20afeb419da9d4033528548e7249e7c051234fd5..7c8261e050631269785d964d6dfff02bb0b3d15f 100644
--- a/resources/lang/en/kontakt.php
+++ b/resources/lang/en/kontakt.php
@@ -13,11 +13,8 @@ return [
'form.4' => 'If you do not enter an email-adress, we can not answer you.',
'form.5' => 'Your e-mail-adress (optional)',
'form.6' => 'Your message',
- 'form.7' => 'Before dispatch, your messgae is encrypted with',
- 'form.8' => '.
-We use Javascript for this.',
- 'form.9' => 'If you have Javascript disabled, your message will be send unencrypted.',
- 'form.10' => 'Encrypt and send',
+ 'form.7' => '<strong>Before dispatch, your messgae is encrypted with <a href="http://openpgpjs.org/.">OpenPGP.js</a>. We use Javascript for this.</strong> If you have Javascript disabled, your message will be send unencrypted.',
+ 'form.8' => 'Encrypt and send',
'mail.1' => 'By Email',
'mail.2' => 'You can also email us directly at: <a href="mailto:office@suma-ev.de">office@suma-ev.de</a>',
diff --git a/resources/lang/es/about.php b/resources/lang/es/about.php
index f8e1f469eb0427d9f32e7d351c402287f0e74912..b0d521ab136d8d3b3eabfa57ac9a08c835f27faa 100644
--- a/resources/lang/es/about.php
+++ b/resources/lang/es/about.php
@@ -2,13 +2,13 @@
<?php
return [
- "head.1" => "Sobre nosotros",
- "head.2" => "¿Cuales ventajas ofrece el uso MetaGer?",
- "list.1" => "Protección de datos y privacidad son natural en nuestro buscador. Implementados y listo para el uso en cada búsqueda. <a href=\"/datenschutz/\">Más info...</a>",
- "list.2" => "Somos una <a href=\"/spende/\"> asociación sin fines de lucro:</a> No tenemos la meta de enriquecernos con sus clicks o con sus datos.",
- "list.3" => " <a href=\"https://de.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> en primer plano es un <a href=\"https://de.wikipedia.org/wiki/Metasuchmaschine\" target=\"_blank\" rel=\"noopener\">META-buscador:</a> Consultamos hasta 50 buscadores, podemos ofrecer diversidad en los resultados de búsquedas.",
- "list.4" => "No preferimos en nuestros resultados <a href=\"https://de.wikipedia.org/wiki/Filterblase\" target=\"_blank\" rel=\"noopener\"> lo mas clickeado:</a> wird:Nuestros resultados no tienen mainstream, sino diversidad.",
- "list.5" => "<a href=\"http://blog.suma-ev.de/node/207\" target=\"_blank\" rel=\"noopener\">MetaGer esta desde hace 20 años en el internet:</a> Nuestra experiencia es su ventaja - nosotros sabemos que estamos haciendo.",
- "list.5.1" => "Llevamos nuestros servidores con electricidad verde.",
- "list.6" => "Pero tampoco estamos sin errores: Si encuentra algo raro: ¡Por favor <a href=\"/kontakt/\" target=\"_blank\" rel=\"noopener\">contáctenos!</a>. Tomamos serios todos sus observaciones: Ustedes son lo más importante para nosotros."
+ "head.1" => "Sobre nosotros",
+ "head.2" => "¿Cuales ventajas ofrece el uso MetaGer?",
+ "list.1" => "Protección de datos y privacidad son natural en nuestro buscador. Implementados y listo para el uso en cada búsqueda. <a href=\"/datenschutz/\">Más info...</a>",
+ "list.2" => "Somos una <a href=\"/spende/\"> asociación sin fines de lucro:</a> No tenemos la meta de enriquecernos con sus clicks o con sus datos.",
+ "list.3" => " <a href=\"https://de.wikipedia.org/wiki/MetaGer\" target=\"_blank\" rel=\"noopener\">MetaGer</a> en primer plano es un <a href=\"https://de.wikipedia.org/wiki/Metasuchmaschine\" target=\"_blank\" rel=\"noopener\">META-buscador:</a> Consultamos hasta 50 buscadores, podemos ofrecer diversidad en los resultados de búsquedas.",
+ "list.4" => "No preferimos en nuestros resultados <a href=\"https://de.wikipedia.org/wiki/Filterblase\" target=\"_blank\" rel=\"noopener\"> lo mas clickeado:</a> wird:Nuestros resultados no tienen mainstream, sino diversidad.",
+ "list.5" => "<a href=\"http://blog.suma-ev.de/node/207\" target=\"_blank\" rel=\"noopener\">MetaGer esta desde hace 20 años en el internet:</a> Nuestra experiencia es su ventaja - nosotros sabemos que estamos haciendo.",
+ "list.6" => "Llevamos nuestros servidores con electricidad verde.",
+ "list.7" => "Pero tampoco estamos sin errores: Si encuentra algo raro: ¡Por favor <a href=\"/kontakt/\" target=\"_blank\" rel=\"noopener\">contáctenos!</a>. Tomamos serios todos sus observaciones: Ustedes son lo más importante para nosotros.",
];
\ No newline at end of file
diff --git a/resources/lang/es/datenschutz.php b/resources/lang/es/datenschutz.php
index 6f5d60c2a3ffb893fc9b69a7237d18cd79e003c3..7c45d89d51a3f119ca80213d797f04cd0449dff3 100644
--- a/resources/lang/es/datenschutz.php
+++ b/resources/lang/es/datenschutz.php
@@ -2,19 +2,19 @@
<?php
return [
- "head" => "Protección de datos y privacidad",
- "general.1" => "Protección de datos y privacidad son para nosotros los bienes más importantes del internet. Son dignos de ser protegidos y no se deberÃa usarlos comercialmente. Aquà una corta lista de nuestro modo de proceder. Una extensa presentación con información trasfondo, porque nosotros mantenemos el único buscador realmente seguro, encuentra en <a href=\"https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html\">aquÃ.</a> ",
- "general.3" => "Solo software que esta libre y el código fuente disponible, puede ser revisado por cualquier persona. En los demás casos el usuario tiene que CREER, lo que dice la compañÃa operadora o el vendedor del sello de calidad. MetaGer es software libre bajo licencia GNU-AGPLv3 (vea la noticia relacionada en alemán en el Heise Ticker <a href=\"http://heise.de/-3295586\" target=\"_blank\" rel=\"noopener\">http://heise.de/-3295586</a>). Usted puede descargar el código fuente de MetaGer aquÃ: <a href=\"https://gitlab.metager3.de/open-source/MetaGer\" target=\"_blank\" rel=\"noopener\">https://gitlab.metager3.de/open-source/MetaGer</a><br /> No necesita creernos nada: USTED mismo lo puede controlar!",
- "policy.1" => "Nuestro procedimiento / polÃtica:",
- "policy.2" => "No guardamos su numero IP, ni <a href=\"https://amiunique.org/\" target=\"_blank\" rel=\"noopener\">la huella digital de su navegador</a> (con lo cual usted muy probablemente esta identificable).",
- "policy.5" => "No usamos Cookies o un Tracking-Pixel o tecnologÃas similares, para perseguir a nuestros usuarios (Tracking = Seguir los movimientos en el internet).",
- "policy.6" => "La transmisión de datos en MetaGer se hace únicamente cifrado con el protocolo https.",
- "policy.7" => "Ofrecemos un acceso sobre la red anónimo TOR, el <a href=\"http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e\" target=\"_blank\" rel=\"noopener\">MetaGer-TOR-hidden Service.</a>",
- "policy.9" => "Porque el acceso sobre la red TOR les parece a muchos usuarios complicado, aveces esta lento, nosotros hemos implementado un camino alterno, con lo cual puede llegar hasta las páginas de destino guardando su anonimato : Haciendo click en el link \"abrir anónimo\". Mediante esto sus datos personales están protegidos al hacer click sobre resultados en MetaGer y incluso en todos los clicks que siguen.",
- "policy.10" => "Hacemos muy poca publicidad, la marcamos claramente, y confiamos para nuestra financiación en nuestros usuarios, sus <a href=\"/spende/\">donaciones</a> y membresÃas para el <a href=\"http://suma-ev.de/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a>. ",
- "policy.13" => "La organización sin fines de lucro <a href=\"http://suma-ev.de/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a> en cooperación con la <a href=\"http://www.uni-hannover.de/\" target=\"_blank\" rel=\"noopener\">Leibniz Universität Hannover</a> mantienen y desarrollan MetaGer. ",
- "policy.17" => "Nuestros servidores están exclusivamente en Alemania. Estan bajo de la ley de protección de datos alemán, lo cual es considerado uno de los más estrictos del mundo.",
- "policy.17.1" => "No solamente protegemeos suyos datos, pero el ambiente. Llevamos nuestros servidores con electricidad verde.",
- "policy.18" => "Después de las revelaciones de Edward Snowden en Junio 2013 se han posicionado varios buscadores con la autoproclamación que sus búsquedas estuvieron seguras porque no guardan los IP de los usuarios. Suponiendo honestos intensiones en estos autodescripciones, es un hecho que muchos de estos buscadores hostean al menos una parte de sus servidores en EEUU. Esto incluye algunos que aun están recomendados por protectores de datos. Estos buscadores están<a href=\"http://de.wikipedia.org/wiki/USA_PATRIOT_Act\" target=\"_blank\" rel=\"noopener\"> bajo de la ley Patriot Act y bajo derecho de EEUU y las autoridades tienen acceso completo a la data</a> y por ende no puede garantizar la privacidad de sus usuarios (a pesar de los esfuerzos de ellos mismos).",
- "twitter" => "Lo que otros dicen sobre nuestro concepto de privacidad en Twitter:"
+ "head" => "Protección de datos y privacidad",
+ "general.1" => "Protección de datos y privacidad son para nosotros los bienes más importantes del internet. Son dignos de ser protegidos y no se deberÃa usarlos comercialmente. Aquà una corta lista de nuestro modo de proceder. Una extensa presentación con información trasfondo, porque nosotros mantenemos el único buscador realmente seguro, encuentra en <a href=\"https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html\">aquÃ.</a> ",
+ "general.3" => "Solo software que esta libre y el código fuente disponible, puede ser revisado por cualquier persona. En los demás casos el usuario tiene que CREER, lo que dice la compañÃa operadora o el vendedor del sello de calidad. MetaGer es software libre bajo licencia GNU-AGPLv3 (vea la noticia relacionada en alemán en el Heise Ticker <a href=\"http://heise.de/-3295586\" target=\"_blank\" rel=\"noopener\">http://heise.de/-3295586</a>). Usted puede descargar el código fuente de MetaGer aquÃ: <a href=\"https://gitlab.metager3.de/open-source/MetaGer\" target=\"_blank\" rel=\"noopener\">https://gitlab.metager3.de/open-source/MetaGer</a><br /> No necesita creernos nada: USTED mismo lo puede controlar!",
+ "policy.1" => "Nuestro procedimiento / polÃtica:",
+ "policy.2" => "No guardamos su numero IP, ni <a href=\"https://amiunique.org/\" target=\"_blank\" rel=\"noopener\">la huella digital de su navegador</a> (con lo cual usted muy probablemente esta identificable).",
+ "policy.5" => "No usamos Cookies o un Tracking-Pixel o tecnologÃas similares, para perseguir a nuestros usuarios (Tracking = Seguir los movimientos en el internet).",
+ "policy.6" => "La transmisión de datos en MetaGer se hace únicamente cifrado con el protocolo https.",
+ "policy.7" => "Ofrecemos un acceso sobre la red anónimo TOR, el <a href=\"http://forum.suma-ev.de/viewtopic.php?f=3&t=43&sid=c994b628153235dfef098ba6fea3d60e\" target=\"_blank\" rel=\"noopener\">MetaGer-TOR-hidden Service.</a>",
+ "policy.9" => "Porque el acceso sobre la red TOR les parece a muchos usuarios complicado, aveces esta lento, nosotros hemos implementado un camino alterno, con lo cual puede llegar hasta las páginas de destino guardando su anonimato : Haciendo click en el link \"abrir anónimo\". Mediante esto sus datos personales están protegidos al hacer click sobre resultados en MetaGer y incluso en todos los clicks que siguen.",
+ "policy.10" => "Hacemos muy poca publicidad, la marcamos claramente, y confiamos para nuestra financiación en nuestros usuarios, sus <a href=\"/spende/\">donaciones</a> y membresÃas para el <a href=\"http://suma-ev.de/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a>. ",
+ "policy.13" => "La organización sin fines de lucro <a href=\"http://suma-ev.de/\" target=\"_blank\" rel=\"noopener\">SUMA-EV</a> en cooperación con la <a href=\"http://www.uni-hannover.de/\" target=\"_blank\" rel=\"noopener\">Leibniz Universität Hannover</a> mantienen y desarrollan MetaGer. ",
+ "policy.17" => "Nuestros servidores están exclusivamente en Alemania. Estan bajo de la ley de protección de datos alemán, lo cual es considerado uno de los más estrictos del mundo.",
+ "policy.18" => "No solamente protegemeos suyos datos, pero el ambiente. Llevamos nuestros servidores con electricidad verde.",
+ "policy.19" => "Después de las revelaciones de Edward Snowden en Junio 2013 se han posicionado varios buscadores con la autoproclamación que sus búsquedas estuvieron seguras porque no guardan los IP de los usuarios. Suponiendo honestos intensiones en estos autodescripciones, es un hecho que muchos de estos buscadores hostean al menos una parte de sus servidores en EEUU. Esto incluye algunos que aun están recomendados por protectores de datos. Estos buscadores están<a href=\"http://de.wikipedia.org/wiki/USA_PATRIOT_Act\" target=\"_blank\" rel=\"noopener\"> bajo de la ley Patriot Act y bajo derecho de EEUU y las autoridades tienen acceso completo a la data</a> y por ende no puede garantizar la privacidad de sus usuarios (a pesar de los esfuerzos de ellos mismos).",
+ "twitter" => "Lo que otros dicen sobre nuestro concepto de privacidad en Twitter:",
];
\ No newline at end of file
diff --git a/resources/lang/es/kontakt.php b/resources/lang/es/kontakt.php
index 4bab9b2fc6f725a16e30022cab0a006bbb8db33e..0a2c646dae6c74f4abbbe94db6b730cd314773e7 100644
--- a/resources/lang/es/kontakt.php
+++ b/resources/lang/es/kontakt.php
@@ -1,24 +1,25 @@
<?php
return [
- "headline.1" => "Contacto",
- "headline.2" => "Forum",
- "headline.3" => "Por favor haga las preguntas técnica primero en nuestro <a href=\"http://forum.suma-ev.de/\" target=\"_blank\" rel=\"noopener\">Forum</a>",
- "headline.4" => "Asà también pueden aprovechar otros de las respuestas.",
- "form.1" => "Formulario de contacto seguro",
- "form.2" => "Con este formulario nos puede contactar encryptado. Por supuesto como vÃa alterna nos puede mandar un <a href=\"mailto:office@suma-ev.de\">email</a>.",
- "form.3" => "Por la cantidad de consultas que recibimos no estamos siempre contestando a tiempo.",
- "form.4" => "Si no nos da su correo electrónico, no podemos contestarle.",
- "form.5" => "Su dirección de correo electrónico (opcional)",
- "form.6" => "Su mensaje",
- "form.7" => "Su mensaje será encryptada antes de mandarla",
- "form.8" => "para esto necesitamos Javascript.",
- "form.9" => "Sino tiene activado Javascript su mensaje será enviada sin encryptación.",
- "form.10" => "Encriptar y enviar",
- "mail.1" => "Por email",
- "mail.2" => "Nos puede mandar un email directamente a la siguiente direccion: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>",
- "mail.3" => "Si la quiere encriptar, puede ver nuestra llave pública de OpenPGP aquÃ:",
- "letter.1" => "Por carta",
- "letter.2" => "Preferimos que nos contacte por medios digitales. Si lo ve indispensable contactarnos vÃa correo fisico, nos puede escribir a la siguiente dirección:",
- "letter.3" => "SUMA-EV Röselerstr. 3 30159 Hannover Germany"
+ "headline.1" => "Contacto",
+ "headline.2" => "Forum",
+ "headline.3" => "Por favor haga las preguntas técnica primero en nuestro <a href=\"http://forum.suma-ev.de/\" target=\"_blank\" rel=\"noopener\">Forum</a>",
+ "headline.4" => "Asà también pueden aprovechar otros de las respuestas.",
+
+ "form.1" => "Formulario de contacto seguro",
+ "form.2" => "Con este formulario nos puede contactar encryptado. Por supuesto como vÃa alterna nos puede mandar un <a href=\"mailto:office@suma-ev.de\">email</a>.",
+ "form.3" => "Por la cantidad de consultas que recibimos no estamos siempre contestando a tiempo.",
+ "form.4" => "Si no nos da su correo electrónico, no podemos contestarle.",
+ "form.5" => "Su dirección de correo electrónico (opcional)",
+ "form.6" => "Su mensaje",
+ 'form.7' => '<strong>Su mensaje será encryptada antes de mandarla <a href="http://openpgpjs.org/.">OpenPGP.js</a> para esto necesitamos Javascript.</strong> Sino tiene activado Javascript su mensaje será enviada sin encryptación.',
+ "form.8" => "Encriptar y enviar",
+
+ "mail.1" => "Por email",
+ "mail.2" => "Nos puede mandar un email directamente a la siguiente direccion: <a href=\"mailto:office@suma-ev.de\">office@suma-ev.de</a>",
+ "mail.3" => "Si la quiere encriptar, puede ver nuestra llave pública de OpenPGP aquÃ:",
+
+ "letter.1" => "Por carta",
+ "letter.2" => "Preferimos que nos contacte por medios digitales. Si lo ve indispensable contactarnos vÃa correo fisico, nos puede escribir a la siguiente dirección:",
+ "letter.3" => "SUMA-EV Röselerstr. 3 30159 Hannover Germany",
];
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
index d8a565bb9016d2d853841cf1f3fd68a124589c6e..e3ecb5d5f44b87ee6b0fab844d5c7dd1f9a8834b 100644
--- a/resources/views/about.blade.php
+++ b/resources/views/about.blade.php
@@ -3,15 +3,15 @@
@section('title', $title )
@section('content')
-<h1>{{ trans('about.head.1') }}</h1>
-<h2>{{ trans('about.head.2') }}</h2>
-<ul class="dotlist">
- <li>{!! trans('about.list.1') !!}</li>
- <li>{!! trans('about.list.2') !!}</li>
- <li>{!! trans('about.list.3') !!}</li>
- <li>{!! trans('about.list.4') !!}</li>
- <li>{!! trans('about.list.5') !!}</li>
- <li>{!! trans('about.list.5.1') !!}</li>
- <li>{!! trans('about.list.6') !!}</li>
-</ul>
+ <h1>{{ trans('about.head.1') }}</h1>
+ <h2>{{ trans('about.head.2') }}</h2>
+ <ul class="dotlist">
+ <li>{!! trans('about.list.1') !!}</li>
+ <li>{!! trans('about.list.2') !!}</li>
+ <li>{!! trans('about.list.3') !!}</li>
+ <li>{!! trans('about.list.4') !!}</li>
+ <li>{!! trans('about.list.5') !!}</li>
+ <li>{!! trans('about.list.6') !!}</li>
+ <li>{!! trans('about.list.7') !!}</li>
+ </ul>
@endsection
diff --git a/resources/views/admin/admin.blade.php b/resources/views/admin/admin.blade.php
index 924962c9ce5fc546385e5a6243308c29c82829bf..e14f888116bfe383d790b1defbec8e56be23a4ff 100644
--- a/resources/views/admin/admin.blade.php
+++ b/resources/views/admin/admin.blade.php
@@ -3,78 +3,71 @@
@section('title', $title )
@section('content')
+ @foreach( $data as $serverName => $dataPoints )
+ <div>
+ <h1>{{ $serverName }}</h1>
+ <svg width="100%" height="500px">
+ <!-- Zunächst die Achsen: -->
+ <!-- Y-Achse -->
+ <line x1="1%" y1="0" x2="1%" y2="95%" style="stroke:rgb(0,0,0);stroke-width:3" />
+ <line x1="1%" y1="0" x2="0" y2="3%" style="stroke:rgb(0,0,0);stroke-width:3" />
+ <line x1="1%" y1="0" x2="2%" y2="3%" style="stroke:rgb(0,0,0);stroke-width:3" />
-@foreach( $data as $serverName => $dataPoints )
-<div>
-<h1>{{ $serverName }}</h1>
-<svg width="100%" height="500px">
- <!-- Zunächst die Achsen: -->
- <!-- Y-Achse -->
- <line x1="1%" y1="0" x2="1%" y2="95%" style="stroke:rgb(0,0,0);stroke-width:3" />
- <line x1="1%" y1="0" x2="0" y2="3%" style="stroke:rgb(0,0,0);stroke-width:3" />
- <line x1="1%" y1="0" x2="2%" y2="3%" style="stroke:rgb(0,0,0);stroke-width:3" />
+ <!-- Beschriftungen der Y-Achse -->
+ @for( $y = ((95-0) / 10); $y < ((95-0) / 10) * 10; $y = $y + ((95-0) / 10) )
+ <line x1="0.5%" y1="{{ $y }}%" x2="1.5%" y2="{{ $y }}%" style="stroke:rgb(0,0,0);stroke-width:1" />
+ <text x="1.8%" y="{{ $y }}%" fill="black" style="font-size:10px;">{{ 100 - (($y / 95)*100) }}</text>
+ @endfor
+ <text x="3%" y="2%" fill="red">Anzahl Worker: x</text>
- <!-- Beschriftungen der Y-Achse -->
- @for( $y = ((95-0) / 10); $y < ((95-0) / 10) * 10; $y = $y + ((95-0) / 10) )
- <line x1="0.5%" y1="{{ $y }}%" x2="1.5%" y2="{{ $y }}%" style="stroke:rgb(0,0,0);stroke-width:1" />
- <text x="1.8%" y="{{ $y }}%" fill="black" style="font-size:10px;">{{ 100 - (($y / 95)*100) }}</text>
- @endfor
- <text x="3%" y="2%" fill="red">Anzahl Worker: x</text>
+ <!-- X-Achse -->
+ <line x1="1%" y1="95%" x2="99%" y2="95%" style="stroke:rgb(0,0,0);stroke-width:3" />
+ <line x1="99%" y1="95%" x2="98%" y2="92%" style="stroke:rgb(0,0,0);stroke-width:3" />
+ <line x1="99%" y1="95%" x2="98%" y2="98%" style="stroke:rgb(0,0,0);stroke-width:3" />
- <!-- X-Achse -->
- <line x1="1%" y1="95%" x2="99%" y2="95%" style="stroke:rgb(0,0,0);stroke-width:3" />
- <line x1="99%" y1="95%" x2="98%" y2="92%" style="stroke:rgb(0,0,0);stroke-width:3" />
- <line x1="99%" y1="95%" x2="98%" y2="98%" style="stroke:rgb(0,0,0);stroke-width:3" />
+ <!-- Beschriftungen der X-Achse -->
+ <?php
+$last = 0;
+for ($x = (((99 - 1) / $time) + 1); $x < 98.9; $x = ($x + ((99 - 1) / $time))) {
+ echo '<line x1="' . $x . '%" y1="93%" x2="' . $x . '%" y2="97%" style="stroke:rgb(0,0,0);stroke-width:1" />';
+ if (($x - $last) >= 3) {
+ echo '<text x="' . ($x - 1) . '%" y="99%" fill="black" style="font-size:8px;">' . date("H:i", mktime(date("H"), date("i") - ($time - (($x - 1) / 98) * $time), date("s"), date("m"), date("d"), date("Y"))) . '</text>';
+ $last = $x;
+ }
+}
+?>
+ <text x="95%" y="90%" fill="red">Zeit (h): y</text>
- <!-- Beschriftungen der X-Achse -->
- <?php
- $last = 0;
- for( $x = (((99-1) / $time) + 1); $x < 98.9; $x = ($x + ((99-1) / $time)) )
- {
- echo '<line x1="'.$x.'%" y1="93%" x2="'.$x.'%" y2="97%" style="stroke:rgb(0,0,0);stroke-width:1" />';
- if( ($x - $last) >= 3)
- {
- echo '<text x="'.($x-1).'%" y="99%" fill="black" style="font-size:8px;">'.date("H:i", mktime(date("H"),date("i")-($time -(($x-1) / 98)*$time), date("s"), date("m"), date("d"), date("Y"))).'</text>';
- $last = $x;
- }
- }
- ?>
- <text x="95%" y="90%" fill="red">Zeit (h): y</text>
+ <!-- Nun die Datenpunkte: -->
+ <?php
+$count = 0;
+$maximum = 0;
+$maximumY = 0;
+foreach ($dataPoints as $key => $value) {
+ if ($count > 0) {
+ $start = strtotime(date(DATE_RFC822, mktime(date("H"), date("i") - $time, date("s"), date("m"), date("d"), date("Y")))) - strtotime(date(DATE_RFC822, mktime(0, 0, 0, date("m"), date("d"), date("Y"))));
+ $lastkey = $oldKey - $start;
+ $newkey = $key - $start;
- <!-- Nun die Datenpunkte: -->
- <?php
- $count = 0;
- $maximum = 0;
- $maximumY = 0;
- foreach($dataPoints as $key => $value)
- {
- if($count > 0)
- {
- $start = strtotime(date(DATE_RFC822, mktime(date("H"),date("i")-$time, date("s"), date("m"), date("d"), date("Y")))) - strtotime(date(DATE_RFC822, mktime(0,0,0, date("m"), date("d"), date("Y"))));
- $lastkey = $oldKey - $start;
- $newkey = $key - $start ;
-
- $x1 = (($lastkey / ($time*60)) * 98) + 1;
- $x2 = (($newkey / ($time*60)) * 98) + 1;
-
- $y1 = 95 - (($oldVal / 100) * 95);
- $y2 = 95 - (($value / 100) * 95);
- if($value > $maximum)
- {
- $maximum = $value;
- $maximumY = $y2;
- }
- echo '<line x1="'.$x1.'%" y1="'.$y1.'%" x2="'.$x2.'%" y2="'.$y2.'%" style="stroke:rgb(0,0,0);stroke-width:1" />';
- }
- $oldKey = $key;
- $oldVal = $value;
- $count++;
- }
- ?>
- <!-- Und noch eine Linie für das Maximum: -->
- <line x1="1%" y1="{{ $maximumY }}%" x2="99%" y2="{{ $maximumY }}%" style="stroke:rgb(255,0,0);stroke-width:1" stroke-dasharray="5,5" d="M5 20 l215 0"/>
-</svg>
-</div>
-@endforeach
+ $x1 = (($lastkey / ($time * 60)) * 98) + 1;
+ $x2 = (($newkey / ($time * 60)) * 98) + 1;
+ $y1 = 95 - (($oldVal / 100) * 95);
+ $y2 = 95 - (($value / 100) * 95);
+ if ($value > $maximum) {
+ $maximum = $value;
+ $maximumY = $y2;
+ }
+ echo '<line x1="' . $x1 . '%" y1="' . $y1 . '%" x2="' . $x2 . '%" y2="' . $y2 . '%" style="stroke:rgb(0,0,0);stroke-width:1" />';
+ }
+ $oldKey = $key;
+ $oldVal = $value;
+ $count++;
+}
+?>
+ <!-- Und noch eine Linie für das Maximum: -->
+ <line x1="1%" y1="{{ $maximumY }}%" x2="99%" y2="{{ $maximumY }}%" style="stroke:rgb(255,0,0);stroke-width:1" stroke-dasharray="5,5" d="M5 20 l215 0"/>
+ </svg>
+ </div>
+ @endforeach
@endsection
\ No newline at end of file
diff --git a/resources/views/admin/count.blade.php b/resources/views/admin/count.blade.php
index 3867b35be918129e2c889754be3436dba1670c02..491e0253bc5e252150bab37bd7016a661bb44800 100644
--- a/resources/views/admin/count.blade.php
+++ b/resources/views/admin/count.blade.php
@@ -3,34 +3,33 @@
@section('title', $title )
@section('content')
-<h2>{{ exec("uptime") }}</h2>
-<table class="table table-striped">
- <caption>Daten der letzten Tage</caption>
- <tr>
- <th>Datum</th>
- <th>Suchanfragen zur gleichen Zeit</th>
- <th>Suchanfragen insgesamt</th>
- <th>Mittelwert (bis zum jeweiligen Tag zurück)</th>
- </tr>
- @if( isset($today) )
- <tr>
- <td>{{ date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d"), date("Y"))) }}</td>
- <td>{{ $today }}</td>
- <td>???</td>
- <td>???</td>
- </tr>
+ <h2>{{ exec("uptime") }}</h2>
+ <table class="table table-striped">
+ <caption>Daten der letzten Tage</caption>
+ <tr>
+ <th>Datum</th>
+ <th>Suchanfragen zur gleichen Zeit</th>
+ <th>Suchanfragen insgesamt</th>
+ <th>Mittelwert (bis zum jeweiligen Tag zurück)</th>
+ </tr>
+ @if( isset($today) )
+ <tr>
+ <td>{{ date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d"), date("Y"))) }}</td>
+ <td>{{ $today }}</td>
+ <td>???</td>
+ <td>???</td>
+ </tr>
+ @endif
+ @foreach($oldLogs as $key => $value)
+ <tr>
+ <td>{{ date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$key, date("Y"))) }}</td>
+ <td>{{ $value['sameTime'] }}</td>
+ <td>{{ $value['insgesamt'] }}</td>
+ <td>{{ $value['median'] }}</td>
+ </tr>
+ @endforeach
+ </table>
+ @if( isset($rekordDate) && isset($rekordTagSameTime) && isset($rekordCount) )
+ <h3>Rekord am {{ $rekordDate }} zur gleichen Zeit <span class="text-info">{{ $rekordTagSameTime }}</span> - insgesamt <span class="text-danger">{{ $rekordCount }}</span></h3>
@endif
- @foreach($oldLogs as $key => $value)
- <tr>
- <td>{{ date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$key, date("Y"))) }}</td>
- <td>{{ $value['sameTime'] }}</td>
- <td>{{ $value['insgesamt'] }}</td>
- <td>{{ $value['median'] }}</td>
- </tr>
- @endforeach
-</table>
-
-@if( isset($rekordDate) && isset($rekordTagSameTime) && isset($rekordCount) )
-<h3>Rekord am {{ $rekordDate }} zur gleichen Zeit <span class="text-info">{{ $rekordTagSameTime }}</span> - insgesamt <span class="text-danger">{{ $rekordCount }}</span></h3>
-@endif
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/admin/engines.blade.php b/resources/views/admin/engines.blade.php
index 43ad731e9ff502a9952ea24e7fef7f5326c793f7..6687cbbbdf8d48c6e0bb4aed624604d3692bdcc0 100644
--- a/resources/views/admin/engines.blade.php
+++ b/resources/views/admin/engines.blade.php
@@ -3,52 +3,52 @@
@section('title', $title )
@section('content')
-<h1>Suchmaschinenübersicht</h1>
-<p>Diese Übersicht gibt Aufschluss darüber, welche Suchmaschinen wie oft abgefragt wurden und zusätzlich wie oft diese innerhalb unseres Timeouts geantwortet haben</p>
-<table class="table table-bordered">
- <caption>Daten der letzten 10 Minuten</caption>
- <thead>
- <tr>
- <th>Name</th>
- <th>Anzahl der gesamten Abfragen</th>
- <th>Davon tatsächlich beantwortet</th>
- <th>Prozent</th>
- </tr>
- </thead>
- <tbody>
- @foreach($engineStats["recent"] as $name => $values)
- @if($values["requests"] > 0)
- <tr @if($values["requests"] === $values["answered"]) class="success" @else class="danger" @endif>
- <td>{{$name}}</td>
- <td>{{$values["requests"]}}</td>
- <td>{{$values["answered"]}}</td>
- <td>{{ floor(($values["answered"] / $values["requests"]) * 100) }}%</td>
- </tr>
- @endif
- @endforeach
- </tbody>
-</table>
-<table class="table table-bordered">
- <caption>Daten insgesamt</caption>
- <thead>
- <tr>
- <th>Name</th>
- <th>Anzahl der gesamten Abfragen</th>
- <th>Davon tatsächlich beantwortet</th>
- <th>Prozent</th>
- </tr>
- </thead>
- <tbody>
- @foreach($engineStats["overall"] as $name => $values)
- @if($values["requests"] > 0)
- <tr @if($values["requests"] === $values["answered"]) class="success" @else class="danger" @endif>
- <td>{{$name}}</td>
- <td>{{$values["requests"]}}</td>
- <td>{{$values["answered"]}}</td>
- <td>{{ floor(($values["answered"] / $values["requests"]) * 100) }}%</td>
- </tr>
- @endif
- @endforeach
- </tbody>
-</table>
+ <h1>Suchmaschinenübersicht</h1>
+ <p>Diese Übersicht gibt Aufschluss darüber, welche Suchmaschinen wie oft abgefragt wurden und zusätzlich wie oft diese innerhalb unseres Timeouts geantwortet haben</p>
+ <table class="table table-bordered">
+ <caption>Daten der letzten 10 Minuten</caption>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Anzahl der gesamten Abfragen</th>
+ <th>Davon tatsächlich beantwortet</th>
+ <th>Prozent</th>
+ </tr>
+ </thead>
+ <tbody>
+ @foreach($engineStats["recent"] as $name => $values)
+ @if($values["requests"] > 0)
+ <tr @if($values["requests"] === $values["answered"]) class="success" @else class="danger" @endif>
+ <td>{{$name}}</td>
+ <td>{{$values["requests"]}}</td>
+ <td>{{$values["answered"]}}</td>
+ <td>{{ floor(($values["answered"] / $values["requests"]) * 100) }}%</td>
+ </tr>
+ @endif
+ @endforeach
+ </tbody>
+ </table>
+ <table class="table table-bordered">
+ <caption>Daten insgesamt</caption>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Anzahl der gesamten Abfragen</th>
+ <th>Davon tatsächlich beantwortet</th>
+ <th>Prozent</th>
+ </tr>
+ </thead>
+ <tbody>
+ @foreach($engineStats["overall"] as $name => $values)
+ @if($values["requests"] > 0)
+ <tr @if($values["requests"] === $values["answered"]) class="success" @else class="danger" @endif>
+ <td>{{$name}}</td>
+ <td>{{$values["requests"]}}</td>
+ <td>{{$values["answered"]}}</td>
+ <td>{{ floor(($values["answered"] / $values["requests"]) * 100) }}%</td>
+ </tr>
+ @endif
+ @endforeach
+ </tbody>
+ </table>
@endsection
diff --git a/resources/views/berlin.blade.php b/resources/views/berlin.blade.php
index 9d53e5e4688f1fc87532ef1d26c551a41b5dc4b1..64bf762d8dbc3154cec3884cd0973c599fe8e9d2 100644
--- a/resources/views/berlin.blade.php
+++ b/resources/views/berlin.blade.php
@@ -8,69 +8,69 @@
<p>Ãœber die Suchmaske auf dieser Webseite kann eine angepasste MetaGer-Suche gestartet werden, welche auf der Domain "fu-berlin.de" inklusive Subdomains sucht. Ausgeschlossen von der Suche werden hierbei Ergebnisse der Subdomain "userpage.fu-berlin.de".</p>
<form class="metager-searchform" action="" method="get" accept-charset="UTF-8" >
- <style type="text/css">
- .aufruf-winter {
- display: none!important;
- }
- </style>
- <style type="text/css" scoped>
+ <style type="text/css">
+ .aufruf-winter {
+ display: none!important;
+ }
+ </style>
+ <style type="text/css" scoped>
- .metager-searchinput {
- height: 30px;
- padding: 6px 12px;
- font-size: 14px;
- line-height: 1.42857;
- color: #555;
- background-color: #FFF;
- background-image: none;
- border: 1px solid #CCC;
- border-right: 0px none;
- border-radius: 4px;
- border-top-right-radius: 0px;
- border-bottom-right-radius: 0px;
- margin:0px;
- }
- .metager-searchbutton {
- height: 30px;
- border-left: 0px none;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
- border: 1px solid #CCC;
- padding: 6px 12px;
- margin:0px;
- font-size: 14px;
- font-weight: normal;
- line-height: 1;
- white-space: nowrap;
- color: #555;
- text-align: center;
- background-color: #EEE;
- }
- .metager-logo {
- height: 30px;
- float: left;
- top:-2px;
- margin-right: 3px;
- }
- </style>
- <a href="https://metager3.de"><img class="metager-logo" title="Sicher suchen & finden mit MetaGer" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="Suche mit MetaGer..." required value="{{ Request::input('eingabe', '') }}"></input><button class="metager-searchbutton" type="submit">Suchen</button></form>
+ .metager-searchinput {
+ height: 30px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin:0px;
+ }
+ .metager-searchbutton {
+ height: 30px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+ }
+ .metager-logo {
+ height: 30px;
+ float: left;
+ top:-2px;
+ margin-right: 3px;
+ }
+ </style>
+ <a href="https://metager3.de"><img class="metager-logo" title="Sicher suchen & finden mit MetaGer" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="Suche mit MetaGer..." required value="{{ Request::input('eingabe', '') }}"></input><button class="metager-searchbutton" type="submit">Suchen</button></form>
- @if($link !== "")
- <br />
- <p>Der generierte Link lautet wie folgt:</p>
- <code>https://metager.de{!! $link !!}</code>
- <p>Wird dieser z.B. in einem IFrame aufgerufen, erhält man eine Ergebnisseite wie am Ende dieser Seite sichtbar.</p>
- <p>Die wichtigsten Parameter in der Url sind hierbei folgende</p>
- <ul>
- <li><code>eingabe={{Request::input('eingabe')}} -host:userpage.fu-berlin.de</code> - Dies ist das Suchwort in Kombination mit der Anweisung alle Links von "userpage.fu-berlin.de" zu entfernen.</li>
- <li><code>password={{$password}}</code> - Dies ist das generierte Passwort. Es ist abhängig von der Sucheingabe. Ein korrektes Passwort sorgt dafür, dass auf der Ergebnisseite keine Werbung angezeigt wird.</li>
- <li><code>site=fu-berlin.de</code> - Dies ist die Anweisung, dass die Suche nur für die Seiten der FU-Berlin durchgeführt werden soll.</li>
- <li><code>quicktips=off</code> - Dies ist die Anweisung, dass die Quicktips, welche in der normalen MetaGer-Suche bei großen Bildschirmen am rechten Rand erscheint, entfernt werden sollen.</li>
- <li><code>encoding=utf8</code> - Dieser Parameter darf nicht fehlen, falls die Sucheingaben in UTF-8 übertragen werden. Ansonsten kann es passieren, dass z.B. Umlaute nicht korrekt übertragen und verarbeitet werden. Fehlt dieser Parameter, so wird eine Encoding in "ISO-8859-1" vermutet.
- </ul>
- <iframe src="{!!$link!!}" style="width: 100%; border: 0; margin-top: 25px;height: 200vh; overflow:scroll;"></iframe>
- @endif
+ @if($link !== "")
+ <br />
+ <p>Der generierte Link lautet wie folgt:</p>
+ <code>https://metager.de{!! $link !!}</code>
+ <p>Wird dieser z.B. in einem IFrame aufgerufen, erhält man eine Ergebnisseite wie am Ende dieser Seite sichtbar.</p>
+ <p>Die wichtigsten Parameter in der Url sind hierbei folgende</p>
+ <ul>
+ <li><code>eingabe={{Request::input('eingabe')}} -host:userpage.fu-berlin.de</code> - Dies ist das Suchwort in Kombination mit der Anweisung alle Links von "userpage.fu-berlin.de" zu entfernen.</li>
+ <li><code>password={{$password}}</code> - Dies ist das generierte Passwort. Es ist abhängig von der Sucheingabe. Ein korrektes Passwort sorgt dafür, dass auf der Ergebnisseite keine Werbung angezeigt wird.</li>
+ <li><code>site=fu-berlin.de</code> - Dies ist die Anweisung, dass die Suche nur für die Seiten der FU-Berlin durchgeführt werden soll.</li>
+ <li><code>quicktips=off</code> - Dies ist die Anweisung, dass die Quicktips, welche in der normalen MetaGer-Suche bei großen Bildschirmen am rechten Rand erscheint, entfernt werden sollen.</li>
+ <li><code>encoding=utf8</code> - Dieser Parameter darf nicht fehlen, falls die Sucheingaben in UTF-8 übertragen werden. Ansonsten kann es passieren, dass z.B. Umlaute nicht korrekt übertragen und verarbeitet werden. Fehlt dieser Parameter, so wird eine Encoding in "ISO-8859-1" vermutet.
+ </ul>
+ <iframe src="{!!$link!!}" style="width: 100%; border: 0; margin-top: 25px;height: 200vh; overflow:scroll;"></iframe>
+ @endif
@endsection
diff --git a/resources/views/botProtection.blade.php b/resources/views/botProtection.blade.php
index a36d9aa1538bf1ea584022b36cc7ab1dd82ac1ae..dd4ecf952128cf07a2e5867deed3dc8ecc189842 100644
--- a/resources/views/botProtection.blade.php
+++ b/resources/views/botProtection.blade.php
@@ -1,19 +1,19 @@
<!DOCTYPE html>
<html>
-<head>
- <title>Access Denied</title>
- <link href="/favicon.ico" rel="icon" type="image/x-icon" />
- <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
- <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
- <meta content="{{ getmypid() }}" name="p" />
- <meta content="#wknekjnbweignipwep==" name="q" />
- <meta content="{{ $hash }}" name="pq" />
- <meta content="{{ $r }}" name="pqr" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
-</head>
-<body>
- <h1 class="hidden">Your Access to this site has been denied. Please contact <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> if this is not correct</h1>
-<script type="text/javascript" src="/js/all.js"></script>
-</body>
+ <head>
+ <title>Access Denied</title>
+ <link href="/favicon.ico" rel="icon" type="image/x-icon" />
+ <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
+ <meta content="{{ getmypid() }}" name="p" />
+ <meta content="#wknekjnbweignipwep==" name="q" />
+ <meta content="{{ $hash }}" name="pq" />
+ <meta content="{{ $r }}" name="pqr" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
+ </head>
+ <body>
+ <h1 class="hidden">Your Access to this site has been denied. Please contact <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> if this is not correct</h1>
+ <script type="text/javascript" src="/js/all.js"></script>
+ </body>
</html>
diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php
index bc6425e7ce61d381d4fa73934a1959bf647921a4..cd99f66fae67d6449b182776f8e92d38a0dbe084 100644
--- a/resources/views/datenschutz.blade.php
+++ b/resources/views/datenschutz.blade.php
@@ -5,36 +5,36 @@
@section('navbarFocus.datenschutz', 'class="active"')
@section('content')
-<h1>{!! trans('datenschutz.head') !!}</h1>
-<p>{!! trans('datenschutz.general.1') !!}</a></p>
-<p>{!! trans('datenschutz.general.3') !!}</p>
-<h2>{!! trans('datenschutz.policy.1') !!}</h2>
-<ul class="dotlist">
- <li>{!! trans('datenschutz.policy.2') !!}</li>
- <li>{!! trans('datenschutz.policy.5') !!}</li>
- <li>{!! trans('datenschutz.policy.6') !!}</li>
- <li>{!! trans('datenschutz.policy.7') !!}</li>
- <li>{!! trans('datenschutz.policy.9') !!}</li>
- <li>{!! trans('datenschutz.policy.10') !!}</li>
- <li>{!! trans('datenschutz.policy.13') !!}</li>
- <li>{!! trans('datenschutz.policy.17') !!}</li>
- <li>{!! trans('datenschutz.policy.17.1') !!}</li>
- <li>{!! trans('datenschutz.policy.18') !!}</li>
-</ul>
-<h2>{!! trans('datenschutz.twitter') !!}</h2>
-<pre><p>> 7.4.2014 C. Schulzki-Haddouti @kooptech
-> MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p>
-<p>> 8.4.2014 Stiftung Datenschutz @DS_Stiftung
-> Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
-> Suchmaschine aus #Hannover</p>
-<p>> 8.4.2014 Markus Käkenmeister @markus2009
-> Suchmaschine ohne Tracking</p>
-<p>> 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics Nice; anonymous Search and find
-> with MetaGer</p>
-<p>> 7.4.2014 Anfahrer @anfahrer
-> Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und
-> Ergebnisse via Proxy</p>
-<p>> 8.4.2014 stupidité pue @dummheitstinkt
-> wow, is this the MetaGer I used in the end 90s in internet cafes???
-> "Anonymes Suchen und Finden mit MetaGer | heise"</p></pre>
+ <h1>{!! trans('datenschutz.head') !!}</h1>
+ <p>{!! trans('datenschutz.general.1') !!}</a></p>
+ <p>{!! trans('datenschutz.general.3') !!}</p>
+ <h2>{!! trans('datenschutz.policy.1') !!}</h2>
+ <ul class="dotlist">
+ <li>{!! trans('datenschutz.policy.2') !!}</li>
+ <li>{!! trans('datenschutz.policy.5') !!}</li>
+ <li>{!! trans('datenschutz.policy.6') !!}</li>
+ <li>{!! trans('datenschutz.policy.7') !!}</li>
+ <li>{!! trans('datenschutz.policy.9') !!}</li>
+ <li>{!! trans('datenschutz.policy.10') !!}</li>
+ <li>{!! trans('datenschutz.policy.13') !!}</li>
+ <li>{!! trans('datenschutz.policy.17') !!}</li>
+ <li>{!! trans('datenschutz.policy.18') !!}</li>
+ <li>{!! trans('datenschutz.policy.19') !!}</li>
+ </ul>
+ <h2>{!! trans('datenschutz.twitter') !!}</h2>
+ <pre><p>> 7.4.2014 C. Schulzki-Haddouti @kooptech
+ > MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p>
+ <p>> 8.4.2014 Stiftung Datenschutz @DS_Stiftung
+ > Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
+ > Suchmaschine aus #Hannover</p>
+ <p>> 8.4.2014 Markus Käkenmeister @markus2009
+ > Suchmaschine ohne Tracking</p>
+ <p>> 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics Nice; anonymous Search and find
+ > with MetaGer</p>
+ <p>> 7.4.2014 Anfahrer @anfahrer
+ > Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und
+ > Ergebnisse via Proxy</p>
+ <p>> 8.4.2014 stupidité pue @dummheitstinkt
+ > wow, is this the MetaGer I used in the end 90s in internet cafes???
+ > "Anonymes Suchen und Finden mit MetaGer | heise"</p></pre>
@endsection
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 69f97ef1cf00ecc6a40f35faf3a251bd03f116ae..f4f87a3057bccc53b632151c4679f545cbdab650 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -3,6 +3,6 @@
@section('title', 'Fehler 404 - Seite nicht gefunden')
@section('content')
-<h1>{{ trans('404.title') }}</h1>
-<p>{{ trans('404.text') }}</p>
+ <h1>{{ trans('404.title') }}</h1>
+ <p>{{ trans('404.text') }}</p>
@endsection
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 68d6816612de0fcc5a018b877735949e8aeff251..2efa6590f67cd00aece30144f9e5b4a0852bb11a 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -3,9 +3,9 @@
@section('title', 'Fehler 500 - Interner Serverfehler')
@section('content')
-<h1>{{ trans('500.title') }}</h1>
-<p>{{ trans('500.text') }}</p>
-@if( config('app.debug') )
-<pre>{{ $exception }}</pre>
-@endif
+ <h1>{{ trans('500.title') }}</h1>
+ <p>{{ trans('500.text') }}</p>
+ @if( config('app.debug') )
+ <pre>{{ $exception }}</pre>
+ @endif
@endsection
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index ff23ed8829e9744e419f5094a45b6faced44725a..0aab00f2850536b75a7bc32856a1a1cb67fb292e 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -3,9 +3,9 @@
@section('title', 'Fehler 500 - Service nicht verfügbar')
@section('content')
-<h1>{{ trans('503.title') }}</h1>
-<p>{{ trans('503.text') }}</p>
-@if( config('app.debug') )
-<pre>{{ $exception }}</pre>
-@endif
+ <h1>{{ trans('503.title') }}</h1>
+ <p>{{ trans('503.text') }}</p>
+ @if( config('app.debug') )
+ <pre>{{ $exception }}</pre>
+ @endif
@endsection
diff --git a/resources/views/faq.blade.php b/resources/views/faq.blade.php
index 1496e0747fbe56a44888e4d0c26811a1f61c4039..bf386c20363b687e47bdab7abb07217cac7a7a02 100644
--- a/resources/views/faq.blade.php
+++ b/resources/views/faq.blade.php
@@ -3,162 +3,162 @@
@section('title', $title )
@section('content')
-<div class="alert alert-warning" role="alert">{!! trans('faq.achtung') !!}</div>
-<h1>{!! trans('faq.title') !!}</h1>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.1.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.1.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.2.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.2.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.3.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.3.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.4.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.4.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.5.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.5.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.6.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.6.b.1') !!}</p>
- <p>{!! trans('faq.faq.6.b.2') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.7.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.7.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.8.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.8.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.9.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.9.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.10.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.10.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.11.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.11.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.12.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.12.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.13.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.13.b.1') !!}</p>
- <p>{!! trans('faq.faq.13.b.2') !!}</p>
- <p>{!! trans('faq.faq.13.b.3') !!}</p>
- <p>{!! trans('faq.faq.13.b.4') !!}</p>
- <p>{!! trans('faq.faq.13.b.5') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.14.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.14.b.1') !!}</p>
- <p>{!! trans('faq.faq.14.b.2') !!}</p>
- <p>{!! trans('faq.faq.14.b.3') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.15.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.15.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('faq.faq.16.h') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('faq.faq.16.b') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div id="mg-plugin" style="margin-top: -100px"></div>
- <div style="margin-top: 100px"></div>
- <div class="panel-heading">
- <div id="mg-plugin" style="margin-top: -50"></div>
- <div style="margin-top: 50"></div>
- <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>
+ <div class="alert alert-warning" role="alert">{!! trans('faq.achtung') !!}</div>
+ <h1>{!! trans('faq.title') !!}</h1>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.1.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.1.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.2.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.2.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.3.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.3.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.4.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.4.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.5.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.5.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.6.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.6.b.1') !!}</p>
+ <p>{!! trans('faq.faq.6.b.2') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.7.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.7.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.8.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.8.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.9.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.9.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.10.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.10.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.11.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.11.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.12.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.12.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.13.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.13.b.1') !!}</p>
+ <p>{!! trans('faq.faq.13.b.2') !!}</p>
+ <p>{!! trans('faq.faq.13.b.3') !!}</p>
+ <p>{!! trans('faq.faq.13.b.4') !!}</p>
+ <p>{!! trans('faq.faq.13.b.5') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.14.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.14.b.1') !!}</p>
+ <p>{!! trans('faq.faq.14.b.2') !!}</p>
+ <p>{!! trans('faq.faq.14.b.3') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.15.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.15.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('faq.faq.16.h') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('faq.faq.16.b') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div id="mg-plugin" style="margin-top: -100px"></div>
+ <div style="margin-top: 100px"></div>
+ <div class="panel-heading">
+ <div id="mg-plugin" style="margin-top: -50"></div>
+ <div style="margin-top: 50"></div>
+ <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
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index 7519143b417443154f2a1f374ea1495c393bcdf8..97ea3078a96c70071c53a250df720ab6fd3e7581 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -3,228 +3,227 @@
@section('title', $title )
@section('content')
-<div class="alert alert-warning" role="alert">{!! trans('hilfe.achtung') !!}</div>
-<h1>{!! trans('hilfe.title') !!}</h1>
-<h2>{!! trans('hilfe.einstellungen') !!}</h2>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.allgemein.title') !!}</h3>
- </div>
- <div class="panel-body">
- <ul class="dotlist">
- <li>{!! trans('hilfe.allgemein.1') !!}</li>
- <li>{!! trans('hilfe.allgemein.2') !!}</li>
- <li>{!! trans('hilfe.allgemein.3') !!}</li>
- </ul>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.suchfokus.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.suchfokus.1') !!}</p>
- </div>
-</div>
-<h2>{!! trans('hilfe.sucheingabe.title') !!}</h2>
-<p>{!! trans('hilfe.sucheingabe.hint') !!}</p>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.stopworte.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.stopworte.1') !!}</p>
- <ul class="dotlist">
- <li>{!! trans('hilfe.stopworte.2') !!}</li>
- </ul>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.mehrwortsuche.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.mehrwortsuche.1') !!}</p>
- <div class = "well well-sm">der runde tisch</div>
- <p>{!! trans('hilfe.mehrwortsuche.2') !!}</p>
- <ul class="dotlist">
- <li>{!! trans('hilfe.mehrwortsuche.3') !!}</li>
- <div class = "well well-sm">"der" "runde" "tisch"</div>
- <li>{!! trans('hilfe.mehrwortsuche.4') !!}</li>
- <div class = "well well-sm">"der runde tisch"</div>
- </ul>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.grossklein.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.grossklein.1') !!}</p>
- <ul class="dotlist">
- <li>{!! trans('hilfe.grossklein.2') !!}</li>
- </ul>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.domains.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.domains.sitesearch.explanation') !!}</p>
- <ul class="dotlist">
- <li>{!! trans('hilfe.domains.sitesearch.example.1') !!}
- <div class="well well-sm">{!! trans('hilfe.domains.sitesearch.example.2') !!}</div></li>
- <li>{!! trans('hilfe.domains.sitesearch.example.3') !!}
- <div class="well well-sm">{!! trans('hilfe.domains.sitesearch.example.4') !!}</div></li>
- </ul>
- <p>{!! trans('hilfe.domains.blacklist.explanation') !!}</p>
- <ul class="dotlist">
- <li>{!! trans('hilfe.domains.blacklist.example.1') !!}</li>
- <li>{!! trans('hilfe.domains.blacklist.example.2') !!}
- <div class="well well-sm">{!! trans('hilfe.domains.blacklist.example.3') !!}</div>
- {!! trans('hilfe.domains.blacklist.example.4') !!}</li>
- <li>{!! trans('hilfe.domains.blacklist.example.5') !!}
- <div class="well well-sm">{!! trans('hilfe.domains.blacklist.example.6') !!}</div></li>
- </ul>
- <p>{!! trans('hilfe.domains.showcase.explanation.1') !!}</p>
- <img src="/img/blacklist-tutorial-searchexample.png">
- <p>{!! trans('hilfe.domains.showcase.explanation.2') !!}<p>
- <div id="result_option_showcase" style="margin-top: -300px"></div>
- <div style="margin-top: 315px; margin-bottom: 10px;">
- <div class="popover fade bottom in" role="tooltip" style="top: auto; left: auto; display: block; position: relative">
- <div class="arrow" style="left: 50%;"></div>
- <h3 class="popover-title"><span class="glyphicon glyphicon-cog"></span> Optionen</h3>
- <div class="popover-content">
- <ul class="options-list list-unstyled small">
- <li>
- <a href="javascript:setDummySearch('wikipedia site:de.wikipedia.org')">
- Suche auf dieser Domain neu starten
- </a>
- </li>
- <li>
- <a href="javascript:setDummySearch('wikipedia -site:de.wikipedia.org')">
- de.wikipedia.org ausblenden
- </a>
- </li>
- <li>
- <a href="javascript:setDummySearch('wikipedia -site:*.wikipedia.org')">
- *.wikipedia.org ausblenden
- </a>
- </li>
- </ul>
- </div>
- </div>
+ <div class="alert alert-warning" role="alert">{!! trans('hilfe.achtung') !!}</div>
+ <h1>{!! trans('hilfe.title') !!}</h1>
+ <h2>{!! trans('hilfe.einstellungen') !!}</h2>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.allgemein.title') !!}</h3>
</div>
- <script type="text/javascript">
- function setDummySearch(value) {
- document.getElementById("dummy_search").innerHTML = value
- }
- </script>
- <div>
- <p>{!! trans('hilfe.domains.showcase.menu.1') !!}</p>
+ <div class="panel-body">
<ul class="dotlist">
- <li>{!! trans('hilfe.domains.showcase.menu.2') !!}</li>
- <li>{!! trans('hilfe.domains.showcase.menu.3') !!}</li>
- <li>{!! trans('hilfe.domains.showcase.menu.4') !!}</li>
+ <li>{!! trans('hilfe.allgemein.1') !!}</li>
+ <li>{!! trans('hilfe.allgemein.2') !!}</li>
+ <li>{!! trans('hilfe.allgemein.3') !!}</li>
</ul>
- <p>{!! trans('hilfe.domains.showcase.menu.5') !!}</p>
</div>
- <div>
- <div class="well well-sm"><i>meine suche</i> <span id="dummy_search"></span></div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.suchfokus.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.suchfokus.1') !!}</p>
+ </div>
+ </div>
+ <h2>{!! trans('hilfe.sucheingabe.title') !!}</h2>
+ <p>{!! trans('hilfe.sucheingabe.hint') !!}</p>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.stopworte.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.stopworte.1') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('hilfe.stopworte.2') !!}</li>
+ </ul>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.mehrwortsuche.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.mehrwortsuche.1') !!}</p>
+ <div class = "well well-sm">der runde tisch</div>
+ <p>{!! trans('hilfe.mehrwortsuche.2') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('hilfe.mehrwortsuche.3') !!}</li>
+ <div class = "well well-sm">"der" "runde" "tisch"</div>
+ <li>{!! trans('hilfe.mehrwortsuche.4') !!}</li>
+ <div class = "well well-sm">"der runde tisch"</div>
+ </ul>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.grossklein.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.grossklein.1') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('hilfe.grossklein.2') !!}</li>
+ </ul>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.domains.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.domains.sitesearch.explanation') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('hilfe.domains.sitesearch.example.1') !!}
+ <div class="well well-sm">{!! trans('hilfe.domains.sitesearch.example.2') !!}</div></li>
+ <li>{!! trans('hilfe.domains.sitesearch.example.3') !!}
+ <div class="well well-sm">{!! trans('hilfe.domains.sitesearch.example.4') !!}</div></li>
+ </ul>
+ <p>{!! trans('hilfe.domains.blacklist.explanation') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('hilfe.domains.blacklist.example.1') !!}</li>
+ <li>{!! trans('hilfe.domains.blacklist.example.2') !!}
+ <div class="well well-sm">{!! trans('hilfe.domains.blacklist.example.3') !!}</div>
+ {!! trans('hilfe.domains.blacklist.example.4') !!}</li>
+ <li>{!! trans('hilfe.domains.blacklist.example.5') !!}
+ <div class="well well-sm">{!! trans('hilfe.domains.blacklist.example.6') !!}</div></li>
+ </ul>
+ <p>{!! trans('hilfe.domains.showcase.explanation.1') !!}</p>
+ <img src="/img/blacklist-tutorial-searchexample.png">
+ <p>{!! trans('hilfe.domains.showcase.explanation.2') !!}<p>
+ <div id="result_option_showcase" style="margin-top: -300px"></div>
+ <div style="margin-top: 315px; margin-bottom: 10px;">
+ <div class="popover fade bottom in" role="tooltip" style="top: auto; left: auto; display: block; position: relative">
+ <div class="arrow" style="left: 50%;"></div>
+ <h3 class="popover-title"><span class="glyphicon glyphicon-cog"></span> Optionen</h3>
+ <div class="popover-content">
+ <ul class="options-list list-unstyled small">
+ <li>
+ <a href="javascript:setDummySearch('wikipedia site:de.wikipedia.org')">
+ Suche auf dieser Domain neu starten
+ </a>
+ </li>
+ <li>
+ <a href="javascript:setDummySearch('wikipedia -site:de.wikipedia.org')">
+ de.wikipedia.org ausblenden
+ </a>
+ </li>
+ <li>
+ <a href="javascript:setDummySearch('wikipedia -site:*.wikipedia.org')">
+ *.wikipedia.org ausblenden
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <script type="text/javascript">
+ function setDummySearch(value) {
+ document.getElementById("dummy_search").innerHTML = value
+ }
+ </script>
+ <div>
+ <p>{!! trans('hilfe.domains.showcase.menu.1') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('hilfe.domains.showcase.menu.2') !!}</li>
+ <li>{!! trans('hilfe.domains.showcase.menu.3') !!}</li>
+ <li>{!! trans('hilfe.domains.showcase.menu.4') !!}</li>
+ </ul>
+ <p>{!! trans('hilfe.domains.showcase.menu.5') !!}</p>
+ </div>
+ <div>
+ <div class="well well-sm"><i>meine suche</i> <span id="dummy_search"></span></div>
+ </div>
+ </div>
+ </div>
+ <h2 id="dienste">{!! trans('hilfe.dienste') !!}</h2>
+ <div class="panel panel-default">
+ <div id="mg-app" style="margin-top: -100px"></div>
+ <div style="margin-top: 100px"></div>
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.app.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.app.1') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.plugin.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.plugin.1') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.suchwortassoziator.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.suchwortassoziator.1') !!}</p>
+ <p>{!! trans('hilfe.suchwortassoziator.2') !!}</p>
+ <p>{!! trans('hilfe.suchwortassoziator.3') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.widget.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.widget.1') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.urlshort.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.urlshort.1') !!}</p>
+ </div>
+ </div>
+ <h3>=> {!! trans('hilfe.dienste.kostenlos') !!}</h3>
+ <h2>{!! trans('hilfe.datenschutz.title') !!}</h2>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.datenschutz.1') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.datenschutz.2') !!}</p>
+ <p>{!! trans('hilfe.datenschutz.3') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.tor.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.tor.1') !!}</p>
+ <p>{!! trans('hilfe.tor.2') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.proxy.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.proxy.1') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.infobutton.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.infobutton.1') !!}</p>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">{!! trans('hilfe.maps.title') !!}</h3>
+ </div>
+ <div class="panel-body">
+ <p>{!! trans('hilfe.maps.1') !!}</p>
+ <p>{!! trans('hilfe.maps.2') !!}</p>
+ <p>{!! trans('hilfe.maps.3') !!}</p>
</div>
</div>
-</div>
-
-<h2 id="dienste">{!! trans('hilfe.dienste') !!}</h2>
-<div class="panel panel-default">
- <div id="mg-app" style="margin-top: -100px"></div>
- <div style="margin-top: 100px"></div>
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.app.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.app.1') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.plugin.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.plugin.1') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.suchwortassoziator.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.suchwortassoziator.1') !!}</p>
- <p>{!! trans('hilfe.suchwortassoziator.2') !!}</p>
- <p>{!! trans('hilfe.suchwortassoziator.3') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.widget.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.widget.1') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.urlshort.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.urlshort.1') !!}</p>
- </div>
-</div>
-<h3>=> {!! trans('hilfe.dienste.kostenlos') !!}</h3>
-<h2>{!! trans('hilfe.datenschutz.title') !!}</h2>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.datenschutz.1') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.datenschutz.2') !!}</p>
- <p>{!! trans('hilfe.datenschutz.3') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.tor.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.tor.1') !!}</p>
- <p>{!! trans('hilfe.tor.2') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.proxy.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.proxy.1') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.infobutton.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.infobutton.1') !!}</p>
- </div>
-</div>
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{!! trans('hilfe.maps.title') !!}</h3>
- </div>
- <div class="panel-body">
- <p>{!! trans('hilfe.maps.1') !!}</p>
- <p>{!! trans('hilfe.maps.2') !!}</p>
- <p>{!! trans('hilfe.maps.3') !!}</p>
- </div>
-</div>
@endsection
diff --git a/resources/views/impressum.blade.php b/resources/views/impressum.blade.php
index b3dbb4ea38d82829cabedba8ac33950919b4d7ca..7096e589e37f7cbbb9ec5d97070a3b9032516168 100644
--- a/resources/views/impressum.blade.php
+++ b/resources/views/impressum.blade.php
@@ -3,17 +3,17 @@
@section('title', $title )
@section('content')
-<h1>{!! trans('impressum.title') !!}</h1>
-<h2 class="subheading">{!! trans('impressum.headline.1') !!}
-</h2>
-<p>{!! trans('impressum.info.1') !!}</p>
-<address>{!! trans('impressum.info.2') !!}</address>
-<address>{!! trans('impressum.info.3') !!}</address>
-<p>{!! trans('impressum.info.4') !!}</p>
-<p>{!! trans('impressum.info.5') !!}</p>
-<p>{!! trans('impressum.info.6') !!}</p>
-<p>{!! trans('impressum.info.7') !!}</p>
-<p>{!! trans('impressum.info.8') !!}</p>
-<h2>{!! trans('impressum.info.9') !!}</h2>
-<p>{!! trans('impressum.info.10') !!}</p>
+ <h1>{!! trans('impressum.title') !!}</h1>
+ <h2 class="subheading">{!! trans('impressum.headline.1') !!}
+ </h2>
+ <p>{!! trans('impressum.info.1') !!}</p>
+ <address>{!! trans('impressum.info.2') !!}</address>
+ <address>{!! trans('impressum.info.3') !!}</address>
+ <p>{!! trans('impressum.info.4') !!}</p>
+ <p>{!! trans('impressum.info.5') !!}</p>
+ <p>{!! trans('impressum.info.6') !!}</p>
+ <p>{!! trans('impressum.info.7') !!}</p>
+ <p>{!! trans('impressum.info.8') !!}</p>
+ <h2>{!! trans('impressum.info.9') !!}</h2>
+ <p>{!! trans('impressum.info.10') !!}</p>
@endsection
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 68bfd62b8f98d8f23def9f5297d051497a5c70d0..cfad846450955db5b86abb8b7610a51f9f9feea1 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -3,280 +3,261 @@
@section('title', $title )
@section('content')
- <div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
- <div class="modal-dialog ">
- <div class="content modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span aria-hidden="true">×</span>
- </button>
- <h4>
- @if ($browser === 'Firefox' || $browser === 'Mozilla')
- {{ trans('index.plugin.head.1') }}
- @elseif ($browser === 'Chrome')
- {{ trans('index.plugin.head.2') }}
- @elseif ($browser === 'Opera')
- {{ trans('index.plugin.head.3') }}
- @elseif ($browser === 'IE')
- {{ trans('index.plugin.head.4') }}
- @elseif ($browser === 'Edge')
- {{ trans('index.plugin.head.5') }}
- @elseif ($browser === 'Safari')
- {{ trans('index.plugin.head.6') }}
- @elseif ($browser === 'Vivaldi')
- {{ trans('index.plugin.head.6') }}
- @else
- $(".seperator").addClass("hidden");
- @endif
- </h4>
- <p class="text-muted">{{ trans('index.plugin.head.info') }}</p>
- </div>
- <div class="modal-body">
- @if ($browser === 'Firefox' || $browser === 'Mozilla')
- <ol>
- <li>{{ trans('index.plugin.firefox.1') }}<img src="/img/Firefox.png" width="100%" /></li>
- <li>{{ trans('index.plugin.firefox.2') }}<img src="/img/Firefox_Standard.png" width="100%" /></li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.firefox.3', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.firefox.4') !!}</li>
- <li>{!! trans('index.plugin.firefox.5') !!}</li>
- </ol>
- @elseif ($browser === 'Chrome')
- <ol>
- <li>{!! trans('index.plugin.chrome.1') !!}</li>
- <li>{!! trans('index.plugin.chrome.2') !!}</li>
- <li>{{ trans('index.plugin.chrome.3') }}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.chrome.4', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.chrome.5') !!}</li>
- <li>{!! trans('index.plugin.chrome.6') !!}</li>
- <li>{!! trans('index.plugin.chrome.7') !!}</li>
- <li>{!! trans('index.plugin.chrome.8') !!}</li>
- </ol>
- @elseif ($browser === 'Opera')
- <ol>
- <li>{!! trans('index.plugin.opera.1') !!}</li>
- <li>{!! trans('index.plugin.opera.2') !!}</li>
- <li>{!! trans('index.plugin.opera.3') !!}</li>
- <li>{!! trans('index.plugin.opera.4') !!}</li>
- <li><small>{!! trans('index.plugin.opera.5') !!}</small>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.opera.6', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.opera.7') !!}</li>
- <li>{!! trans('index.plugin.opera.8') !!}</li>
- <li>{!! trans('index.plugin.opera.9') !!}</li>
- <li>{!! trans('index.plugin.opera.10') !!}</li>
- </ol>
- @elseif ($browser === 'IE')
- <ol>
- <li>{!! trans('index.plugin.IE.1') !!}</li>
- <li>{!! trans('index.plugin.IE.4') !!} (<span class="glyphicon glyphicon-cog"></span>)</li>
- <li>{!! trans('index.plugin.IE.5') !!}</li>
- <li>{!! trans('index.plugin.IE.6') !!}</li>
- <li>{!! trans('index.plugin.IE.7') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.IE.8', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.IE.9') !!}</li>
- <li>{!! trans('index.plugin.IE.10') !!}</li>
- <li>{!! trans('index.plugin.IE.11') !!}</li>
- </ol>
- @elseif ($browser === 'Edge')
- <ol>
- <li>{!! trans('index.plugin.edge.1') !!}<span class="glyphicon glyphicon-option-horizontal"></span>{!! trans('index.plugin.edge.2') !!}</li>
- <li>{!! trans('index.plugin.edge.3') !!}</li>
- <li>{!! trans('index.plugin.edge.4') !!}</li>
- <li>{!! trans('index.plugin.edge.5') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.edge.6', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.edge.7') !!}</li>
- <li>{!! trans('index.plugin.edge.8') !!}</li>
- <li>{!! trans('index.plugin.edge.9') !!}</li>
- <li>{!! trans('index.plugin.edge.10') !!}</li>
- <li>{!! trans('index.plugin.edge.11') !!}</li>
- </ol>
- @elseif ($browser === 'Safari')
- <ol>
- <li>{!! trans('index.plugin.safari.1') !!}</li>
- <li>{!! trans('index.plugin.safari.2') !!}</li>
- <li>{!! trans('index.plugin.safari.3') !!}</li>
- <li>{!! trans('index.plugin.safari.4') !!}</li>
- </ol>
- @elseif ($browser === 'Vivaldi')
- <ol>
- <li>{!! trans('index.plugin.vivaldi.1') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.2') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.3') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.4') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.5') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.6') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.7') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.vivaldi.8', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.vivaldi.9') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.10') !!}</li>
- </ol>
- @endif
- <hr>
- <p>@lang('index.plugin.faq.1')<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq#mg-plugin") }}">@lang('index.plugin.faq.2')</a></p>
- </div>
- </div>
- </div>
- </div>
- <h1 id="mglogo">
- <a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer
- </a>
- </h1>
- <figure>
- <fieldset id="foki">
- <input id="web" type="radio" name="focus" value="web" form="searchForm" @if ($focus === 'web') checked @endif required="">
- <label id="web-label" for="web">
- <span class="glyphicon glyphicon-globe"></span>
- <span class="content">{{ trans('index.foki.web') }}</span>
- </label>
- <input id="bilder" type="radio" name="focus" value="bilder" form="searchForm" @if ($focus === 'bilder') checked @endif required="">
- <label id="bilder-label" for="bilder">
- <span class="glyphicon glyphicon-picture"></span>
- <span class="content">{{ trans('index.foki.bilder') }}</span>
- </label>
- <input id="nachrichten" type="radio" name="focus" value="nachrichten" form="searchForm" @if ($focus === 'nachrichten') checked @endif required="">
- <label id="nachrichten-label" for="nachrichten">
- <span class="glyphicon glyphicon-bullhorn"></span>
- <span class="content">{{ trans('index.foki.nachrichten') }}</span>
- </label>
- <input id="wissenschaft" type="radio" name="focus" value="wissenschaft" form="searchForm" @if ($focus === 'wissenschaft') checked @endif required="">
- <label id="wissenschaft-label" for="wissenschaft">
- <span class="glyphicon glyphicon-file"></span>
- <span class="content">{{ trans('index.foki.wissenschaft') }}</span>
- </label>
- <input id="produkte" type="radio" name="focus" value="produktsuche" form="searchForm" @if ($focus === 'produkte') checked @endif required="">
- <label id="produkte-label" for="produkte">
- <span class="glyphicon glyphicon-shopping-cart"></span>
- <span class="content">{{ trans('index.foki.produkte') }}</span>
- </label>
- <input id="angepasst" type="radio" name="focus" value="angepasst" form="searchForm" @if ($focus === 'angepasst') checked @endif required="">
- <label id="anpassen-label" for="angepasst">
- <span class="glyphicon glyphicon-cog"></span>
- <span class="content">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
- @if ($focus === 'angepasst')
- {{ trans('index.foki.angepasst') }}
- @else
- {{ trans('index.foki.anpassen') }}
- @endif
- </a>
- </span>
- </label>
- </fieldset>
- <fieldset>
- <form id="searchForm" @if(Request::has('request') && Request::input('request') === "POST") method="POST" @elseif(Request::has('request') && Request::input('request') === "GET") method="GET" @else method="GET" @endif action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
- <div class="input-group">
- <div class="input-group-addon">
- <button type="button" data-toggle="popover" data-html="true" data-container="body" title="{{ trans('index.design') }}" data-content='<ul id="color-chooser" class="list-inline list-unstyled">
-<li ><a id="standard" data-rgba="255,194,107,1" href="#"></a></li>
-<li ><a id="standardHard" data-rgba="255,128,0,1" href="#"></a></li>
-<li ><a id="blue" data-rgba="164,192,230,1" href="#"></a></li>
-<li ><a id="blueHard" data-rgba="2,93,140,1" href="#"></a></li>
-<li ><a id="green" data-rgba="177,226,163,1" href="#"></a></li>
-<li ><a id="greenHard" data-rgba="127,175,27,1" href="#"></a></li>
-<li ><a id="red" data-rgba="255,92,92,1" href="#"></a></li>
-<li ><a id="redHard" data-rgba="255,0,0,1" href="#"></a></li>
-<li ><a id="pink" data-rgba="255,196,246,1" href="#"></a></li>
-<li ><a id="pinkHard" data-rgba="254,67,101,1" href="#"></a></li>
-<li ><a id="black" data-rgba="238,238,238,1" href="#"></a></li>
-<li ><a id="blackHard" data-rgba="50,50,50,1" href="#"></a></li>
-</ul>'>
- <span class="glyphicon glyphicon-tint">
- </span>
- </button>
- </div>
- <input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
- <input type="hidden" name="encoding" value="utf8">
- @if ($focus === 'angepasst') <input type="hidden" name="lang" value={{ $lang }} >
- <input type="hidden" name="resultCount" value={{ $resultCount }} >
- <input type="hidden" name="time" value={{ $time }} >
- <input type="hidden" name="sprueche" value={{ $sprueche }} >
- <input type="hidden" name="tab" value={{ $tab }} >
- <input type="hidden" name="maps" value={{ $maps }} >
- @foreach ($focusPages as $fp)
- <input type="hidden" name={{ $fp }} value="on">
- @endforeach
- <input type="hidden" name="theme" value={{ $theme }}>
- @elseif( !App::isLocale('de') )
- <input type="hidden" name="lang" value="{{ App::getLocale() }}">
- @else
- <input type="hidden" name="lang" value="all">
- @endif
- <div class="input-group-addon">
- <button type="submit">
- <span class="glyphicon glyphicon-search">
- </span>
- </button>
- </div>
- </div>
- </form>
- </fieldset>
- <ul class="list-inline searchform-bonus">
- <li>
- <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" target="_blank" rel="noopener" id="foerdershops" class="btn btn-default mutelink" title="{{ trans('index.partnertitle') }}">{{ trans('index.conveyor') }}
- </a>
- </li>
- <li class="hidden-xs seperator">|
- </li>
- <li id="plug" @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
- class="hidden" @endunless >
- <a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}">{{ trans('index.plugin') }}</a>
- </li>
- </ul>
- </figure>
-
+ <div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
+ <div class="modal-dialog ">
+ <div class="content modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ <h4>
+ @if ($browser === 'Firefox' || $browser === 'Mozilla')
+ {{ trans('index.plugin.head.1') }}
+ @elseif ($browser === 'Chrome')
+ {{ trans('index.plugin.head.2') }}
+ @elseif ($browser === 'Opera')
+ {{ trans('index.plugin.head.3') }}
+ @elseif ($browser === 'IE')
+ {{ trans('index.plugin.head.4') }}
+ @elseif ($browser === 'Edge')
+ {{ trans('index.plugin.head.5') }}
+ @elseif ($browser === 'Safari')
+ {{ trans('index.plugin.head.6') }}
+ @elseif ($browser === 'Vivaldi')
+ {{ trans('index.plugin.head.6') }}
+ @else
+ $(".seperator").addClass("hidden");
+ @endif
+ </h4>
+ <p class="text-muted">{{ trans('index.plugin.head.info') }}</p>
+ </div>
+ <div class="modal-body">
+ @if ($browser === 'Firefox' || $browser === 'Mozilla')
+ <ol>
+ <li>{{ trans('index.plugin.firefox.1') }}<img src="/img/Firefox.png" width="100%" /></li>
+ <li>{{ trans('index.plugin.firefox.2') }}<img src="/img/Firefox_Standard.png" width="100%" /></li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.firefox.3', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.firefox.4') !!}</li>
+ <li>{!! trans('index.plugin.firefox.5') !!}</li>
+ </ol>
+ @elseif ($browser === 'Chrome')
+ <ol>
+ <li>{!! trans('index.plugin.chrome.1') !!}</li>
+ <li>{!! trans('index.plugin.chrome.2') !!}</li>
+ <li>{{ trans('index.plugin.chrome.3') }}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.chrome.4', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.chrome.5') !!}</li>
+ <li>{!! trans('index.plugin.chrome.6') !!}</li>
+ <li>{!! trans('index.plugin.chrome.7') !!}</li>
+ <li>{!! trans('index.plugin.chrome.8') !!}</li>
+ </ol>
+ @elseif ($browser === 'Opera')
+ <ol>
+ <li>{!! trans('index.plugin.opera.1') !!}</li>
+ <li>{!! trans('index.plugin.opera.2') !!}</li>
+ <li>{!! trans('index.plugin.opera.3') !!}</li>
+ <li>{!! trans('index.plugin.opera.4') !!}</li>
+ <li><small>{!! trans('index.plugin.opera.5') !!}</small>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.opera.6', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.opera.7') !!}</li>
+ <li>{!! trans('index.plugin.opera.8') !!}</li>
+ <li>{!! trans('index.plugin.opera.9') !!}</li>
+ <li>{!! trans('index.plugin.opera.10') !!}</li>
+ </ol>
+ @elseif ($browser === 'IE')
+ <ol>
+ <li>{!! trans('index.plugin.IE.1') !!}</li>
+ <li>{!! trans('index.plugin.IE.4') !!} (<span class="glyphicon glyphicon-cog"></span>)</li>
+ <li>{!! trans('index.plugin.IE.5') !!}</li>
+ <li>{!! trans('index.plugin.IE.6') !!}</li>
+ <li>{!! trans('index.plugin.IE.7') !!}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.IE.8', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.IE.9') !!}</li>
+ <li>{!! trans('index.plugin.IE.10') !!}</li>
+ <li>{!! trans('index.plugin.IE.11') !!}</li>
+ </ol>
+ @elseif ($browser === 'Edge')
+ <ol>
+ <li>{!! trans('index.plugin.edge.1') !!}<span class="glyphicon glyphicon-option-horizontal"></span>{!! trans('index.plugin.edge.2') !!}</li>
+ <li>{!! trans('index.plugin.edge.3') !!}</li>
+ <li>{!! trans('index.plugin.edge.4') !!}</li>
+ <li>{!! trans('index.plugin.edge.5') !!}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.edge.6', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.edge.7') !!}</li>
+ <li>{!! trans('index.plugin.edge.8') !!}</li>
+ <li>{!! trans('index.plugin.edge.9') !!}</li>
+ <li>{!! trans('index.plugin.edge.10') !!}</li>
+ <li>{!! trans('index.plugin.edge.11') !!}</li>
+ </ol>
+ @elseif ($browser === 'Safari')
+ <ol>
+ <li>{!! trans('index.plugin.safari.1') !!}</li>
+ <li>{!! trans('index.plugin.safari.2') !!}</li>
+ <li>{!! trans('index.plugin.safari.3') !!}</li>
+ <li>{!! trans('index.plugin.safari.4') !!}</li>
+ </ol>
+ @elseif ($browser === 'Vivaldi')
+ <ol>
+ <li>{!! trans('index.plugin.vivaldi.1') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.2') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.3') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.4') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.5') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.6') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.7') !!}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.vivaldi.8', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.vivaldi.9') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.10') !!}</li>
+ </ol>
+ @endif
+ <hr>
+ <p>@lang('index.plugin.faq.1')<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq#mg-plugin") }}">@lang('index.plugin.faq.2')</a></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
+ <figure>
+ <fieldset id="foki">
+ <input id="web" type="radio" name="focus" value="web" form="searchForm" @if ($focus === 'web') checked @endif required="">
+ <label id="web-label" for="web">
+ <span class="glyphicon glyphicon-globe"></span>
+ <span class="content">{{ trans('index.foki.web') }}</span>
+ </label>
+ <input id="bilder" type="radio" name="focus" value="bilder" form="searchForm" @if ($focus === 'bilder') checked @endif required="">
+ <label id="bilder-label" for="bilder">
+ <span class="glyphicon glyphicon-picture"></span>
+ <span class="content">{{ trans('index.foki.bilder') }}</span>
+ </label>
+ <input id="nachrichten" type="radio" name="focus" value="nachrichten" form="searchForm" @if ($focus === 'nachrichten') checked @endif required="">
+ <label id="nachrichten-label" for="nachrichten">
+ <span class="glyphicon glyphicon-bullhorn"></span>
+ <span class="content">{{ trans('index.foki.nachrichten') }}</span>
+ </label>
+ <input id="wissenschaft" type="radio" name="focus" value="wissenschaft" form="searchForm" @if ($focus === 'wissenschaft') checked @endif required="">
+ <label id="wissenschaft-label" for="wissenschaft">
+ <span class="glyphicon glyphicon-file"></span>
+ <span class="content">{{ trans('index.foki.wissenschaft') }}</span>
+ </label>
+ <input id="produkte" type="radio" name="focus" value="produktsuche" form="searchForm" @if ($focus === 'produkte') checked @endif required="">
+ <label id="produkte-label" for="produkte">
+ <span class="glyphicon glyphicon-shopping-cart"></span>
+ <span class="content">{{ trans('index.foki.produkte') }}</span>
+ </label>
+ <input id="angepasst" type="radio" name="focus" value="angepasst" form="searchForm" @if ($focus === 'angepasst') checked @endif required="">
+ <label id="anpassen-label" for="angepasst">
+ <span class="glyphicon glyphicon-cog"></span>
+ <span class="content">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
+ @if ($focus === 'angepasst')
+ {{ trans('index.foki.angepasst') }}
+ @else
+ {{ trans('index.foki.anpassen') }}
+ @endif
+ </a>
+ </span>
+ </label>
+ </fieldset>
+ <fieldset>
+ <form id="searchForm" @if(Request::has('request') && Request::input('request') === "POST") method="POST" @elseif(Request::has('request') && Request::input('request') === "GET") method="GET" @else method="GET" @endif action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
+ <div class="input-group">
+ <div class="input-group-addon">
+ <button type="button" data-toggle="popover" data-html="true" data-container="body" title="{{ trans('index.design') }}" data-content='<ul id="color-chooser" class="list-inline list-unstyled">
+ <li ><a id="standard" data-rgba="255,194,107,1" href="#"></a></li>
+ <li ><a id="standardHard" data-rgba="255,128,0,1" href="#"></a></li>
+ <li ><a id="blue" data-rgba="164,192,230,1" href="#"></a></li>
+ <li ><a id="blueHard" data-rgba="2,93,140,1" href="#"></a></li>
+ <li ><a id="green" data-rgba="177,226,163,1" href="#"></a></li>
+ <li ><a id="greenHard" data-rgba="127,175,27,1" href="#"></a></li>
+ <li ><a id="red" data-rgba="255,92,92,1" href="#"></a></li>
+ <li ><a id="redHard" data-rgba="255,0,0,1" href="#"></a></li>
+ <li ><a id="pink" data-rgba="255,196,246,1" href="#"></a></li>
+ <li ><a id="pinkHard" data-rgba="254,67,101,1" href="#"></a></li>
+ <li ><a id="black" data-rgba="238,238,238,1" href="#"></a></li>
+ <li ><a id="blackHard" data-rgba="50,50,50,1" href="#"></a></li>
+ </ul>'>
+ <span class="glyphicon glyphicon-tint"></span>
+ </button>
+ </div>
+ <input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
+ <input type="hidden" name="encoding" value="utf8">
+ @if ($focus === 'angepasst') <input type="hidden" name="lang" value={{ $lang }} >
+ <input type="hidden" name="resultCount" value={{ $resultCount }} >
+ <input type="hidden" name="time" value={{ $time }} >
+ <input type="hidden" name="sprueche" value={{ $sprueche }} >
+ <input type="hidden" name="tab" value={{ $tab }} >
+ <input type="hidden" name="maps" value={{ $maps }} >
+ @foreach ($focusPages as $fp)
+ <input type="hidden" name={{ $fp }} value="on">
+ @endforeach
+ <input type="hidden" name="theme" value={{ $theme }}>
+ @elseif( !App::isLocale('de') )
+ <input type="hidden" name="lang" value="{{ App::getLocale() }}">
+ @else
+ <input type="hidden" name="lang" value="all">
+ @endif
+ <div class="input-group-addon">
+ <button type="submit">
+ <span class="glyphicon glyphicon-search"></span>
+ </button>
+ </div>
+ </div>
+ </form>
+ </fieldset>
+ <ul class="list-inline searchform-bonus">
+ <li><a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" target="_blank" rel="noopener" id="foerdershops" class="btn btn-default mutelink" title="{{ trans('index.partnertitle') }}">{{ trans('index.conveyor') }}</a></li>
+ <li class="hidden-xs seperator">|</li>
+ <li id="plug"
+ @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
+ class="hidden"
+ @endunless
+ >
+ <a href="#" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}">{{ trans('index.plugin') }}</a>
+ </li>
+ </ul>
+ </figure>
@endsection
@section('optionalContent')
-<section id="moreInformation" class="hidden-xs">
- <h1 class="hidden">{{ trans('index.sponsors.head.1') }}</h1>
- <div class="row">
- <div id="sponsors" class="col-sm-6">
- <h2>{{ trans('index.sponsors.head.2') }}</h2>
- <ul class="startpage">
- <li>
- {!! trans('index.sponsors.woxikon') !!}
- </li>
- <li>
- {!! trans('index.sponsors.gutscheine') !!}
- </li>
- <li>
- {!! trans('index.sponsors.kredite') !!}
- </li>
- </ul>
- </div>
- <div id="about-us" class="col-sm-6">
- <h2>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "about") }}">{{ trans('index.about.title') }}</a>
- </h2>
- <ul class="startpage">
- <li>
- {!! trans('index.about.1.1') !!}
- </li>
- <li>
- {!! trans('index.about.2.1') !!}
- </li>
- <li>
- @lang('index.about.3.1')
- </li>
- </ul>
- </div>
- </div>
- </section>
+ <section id="moreInformation" class="hidden-xs">
+ <h1 class="hidden">{{ trans('index.sponsors.head.1') }}</h1>
+ <div class="row">
+ <div id="sponsors" class="col-sm-6">
+ <h2>{{ trans('index.sponsors.head.2') }}</h2>
+ <ul class="startpage">
+ <li>{!! trans('index.sponsors.woxikon') !!}</li>
+ <li>{!! trans('index.sponsors.gutscheine') !!}</li>
+ <li>{!! trans('index.sponsors.kredite') !!}</li>
+ </ul>
+ </div>
+ <div id="about-us" class="col-sm-6">
+ <h2>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "about") }}">{{ trans('index.about.title') }}</a>
+ </h2>
+ <ul class="startpage">
+ <li>{!! trans('index.about.1.1') !!}</li>
+ <li>{!! trans('index.about.2.1') !!}</li>
+ <li>@lang('index.about.3.1')</li>
+ </ul>
+ </div>
+ </div>
+ </section>
@endsection
diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php
index 78c1b74cd7990ba8efd1339d52ee9b2afc0b7723..ddb3d6fefa62c37a31da73fcc7daa6c7a95735a0 100644
--- a/resources/views/kontakt/kontakt.blade.php
+++ b/resources/views/kontakt/kontakt.blade.php
@@ -3,28 +3,30 @@
@section('title', $title )
@section('content')
-<h1>{!! trans('kontakt.headline.1') !!}</h1>
-<h2>{!! trans('kontakt.headline.2') !!}</h2>
-<p><span class="bold">{!! trans('kontakt.headline.3') !!}</span>
-<span>{!! trans('kontakt.headline.4') !!}</span></p>
-<h2>{!! trans('kontakt.form.1') !!}</h2>
-<p>{!! trans('kontakt.form.2') !!}</p>
-<p>{!! trans('kontakt.form.3') !!}</p>
-<p class="bold">{!! trans('kontakt.form.4') !!}</p>
-<form class="contact" name="contact" method="post" action="{{ LaravelLocalization::getLocalizedURL() }}">
- {{ csrf_field() }}
- <div class="form-group kontakt-form-group">
- <input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="text"></div>
- <div class="form-group kontakt-form-group">
- <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}"></textarea></div>
- <div class="form-group kontakt-form-group">
- <p><span class="bold">{!! trans('kontakt.form.7') !!} <a href="http://openpgpjs.org/.">OpenPGP.js</a> {!! trans('kontakt.form.8') !!}</span>
-<span>{!! trans('kontakt.form.9') !!}</span></p>
- <button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.10') !!}</button></div></form>
-<h2>{!! trans('kontakt.mail.1') !!}</h2>
-<p>{!! trans('kontakt.mail.2') !!}
-{!! trans('kontakt.mail.3') !!}</p>
-<textarea id="pubkey" style="width:50%" rows="8" readonly>-----BEGIN PGP PUBLIC KEY BLOCK-----
+ <h1>{!! trans('kontakt.headline.1') !!}</h1>
+ <h2>{!! trans('kontakt.headline.2') !!}</h2>
+ <p><span class="bold">{!! trans('kontakt.headline.3') !!}</span>
+ <span>{!! trans('kontakt.headline.4') !!}</span></p>
+ <h2>{!! trans('kontakt.form.1') !!}</h2>
+ <p>{!! trans('kontakt.form.2') !!}</p>
+ <p>{!! trans('kontakt.form.3') !!}</p>
+ <p class="bold">{!! trans('kontakt.form.4') !!}</p>
+ <form class="contact" name="contact" method="post" action="{{ LaravelLocalization::getLocalizedURL() }}">
+ {{ csrf_field() }}
+ <div class="form-group kontakt-form-group">
+ <input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="text"></div>
+ <div class="form-group kontakt-form-group">
+ <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}"></textarea>
+ </div>
+ <div class="form-group kontakt-form-group">
+ <p>{!! trans('kontakt.form.7') !!}</p>
+ <button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.8') !!}</button>
+ </div>
+ </form>
+ <h2>{!! trans('kontakt.mail.1') !!}</h2>
+ <p>{!! trans('kontakt.mail.2') !!}</p>
+ <p>{!! trans('kontakt.mail.3') !!}</p>
+ <textarea id="pubkey" style="width:50%" rows="8" readonly>-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
mQINBFV/1W0BEACsd2knka1L5f5iN7KRbjT/hsWCL6LRmS2lMCIkM2QPnjFHj6pB
diff --git a/resources/views/languages/edit.blade.php b/resources/views/languages/edit.blade.php
index b9a0ef95400190d9fe27c60dc5b5eb8e0078aadb..a01f2bbc71ccb0127864450294392ae769e6b410 100644
--- a/resources/views/languages/edit.blade.php
+++ b/resources/views/languages/edit.blade.php
@@ -3,52 +3,57 @@
@section('title', $title )
@section('content')
-<script type="text/javascript" src="/js/all.js"></script>
-<h1>{{ trans('languages.header') }}</h1>
-<p>{{ trans('languages.beschreibung.1') }}</p>
-<p>{{ trans('languages.beschreibung.2') }}</p>
-<div class="progress">
- <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="{{ round(100 * (($langTexts[$to]+$new) / count($sum))) }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ round(100 * (($langTexts[$to]+$new) / count($sum))) }}%">
- {{ trans('languages.progress', ['uebersetzteTexte'=> ($langTexts[$to]+$new), 'textCount'=>count($sum), 'percentage'=>round(100 * (($langTexts[$to]+$new) / count($sum)))]) }}
-
- </div>
-</div>
-<h1>{{$filename}}</h1>
-<form id="submit" method="POST">
-<input type="hidden" name="filename" value="{{$filename}}" />
-</form>
-<table class="table">
- <thead>
- <tr>
- <th>#ID</th>
- <th>{{$to}}
- @foreach($langs as $lang => $value)
- <th>{{$lang}}</th>
- @endforeach
- </tr>
- </thead>
- <tbody>
- @foreach($texts as $name => $langValues)
- @if($langValues === "")
- <tr>
- <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
- <td></td>
- <td></td>
- </tr>
- @else
- <tr>
- <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
- <td>@if(isset($langValues[$to])) <textarea class="language-text-area" type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}" readonly >{{$langValues[$to]}}</textarea> @else <textarea class="language-text-area" rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $name)}}" ></textarea> @endif</td>
- @foreach($langs as $lang => $value)
- <td>{!! $langValues[$lang] or "" !!}</td>
+ <script type="text/javascript" src="/js/all.js"></script>
+ <h1>{{ trans('languages.header') }}</h1>
+ <p>{{ trans('languages.beschreibung.1') }}</p>
+ <p>{{ trans('languages.beschreibung.2') }}</p>
+ <div class="progress">
+ <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="{{ round(100 * (($langTexts[$to]+$new) / count($sum))) }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ round(100 * (($langTexts[$to]+$new) / count($sum))) }}%">
+ {{ trans('languages.progress', ['uebersetzteTexte'=> ($langTexts[$to]+$new), 'textCount'=>count($sum), 'percentage'=>round(100 * (($langTexts[$to]+$new) / count($sum)))]) }}
+ </div>
+ </div>
+ <h1>{{$filename}}</h1>
+ <form id="submit" method="POST">
+ <input type="hidden" name="filename" value="{{$filename}}" />
+ </form>
+ <table class="table">
+ <thead>
+ <tr>
+ <th>#ID</th>
+ <th>{{$to}}</th>
+ @foreach($langs as $lang => $value)
+ <th>{{$lang}}</th>
+ @endforeach
+ </tr>
+ </thead>
+ <tbody>
+ @foreach($texts as $name => $langValues)
+ @if($langValues === "")
+ <tr>
+ <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
+ <td></td>
+ <td></td>
+ </tr>
+ @else
+ <tr>
+ <td class="name language-name">{{preg_replace("/(\s*).*#(.*)$/si", "$1$2", $name)}}</td>
+ <td>
+ @if(isset($langValues[$to]))
+ <textarea class="language-text-area" type="text" rows="1" cols="50" form="submit" name="{{ base64_encode($name) }}" readonly >{{$langValues[$to]}}</textarea>
+ @else
+ <textarea class="language-text-area" rows="1" cols="50" form="submit" name="{{base64_encode("_new_" . $name)}}"></textarea>
+ @endif
+ </td>
+ @foreach($langs as $lang => $value)
+ <td>{!! $langValues[$lang] or "" !!}</td>
+ @endforeach
+ </tr>
+ @endif
@endforeach
- </tr>
- @endif
- @endforeach
- </tbody>
-</table>
-<p>{{ trans('languages.hinweis.1') }}</p>
-<p>{!! trans('languages.hinweis.2') !!}</p>
-<p>{!! trans('languages.hinweis.3') !!}</p>
-<button class="btn btn-success" type="submit" form="submit">Daten übermitteln</button>
+ </tbody>
+ </table>
+ <p>{{ trans('languages.hinweis.1') }}</p>
+ <p>{!! trans('languages.hinweis.2') !!}</p>
+ <p>{!! trans('languages.hinweis.3') !!}</p>
+ <button class="btn btn-success" type="submit" form="submit">Daten übermitteln</button>
@endsection
diff --git a/resources/views/languages/overview.blade.php b/resources/views/languages/overview.blade.php
index 2a136ae4773b5b5db9286050427e83ab77274574..0cb49229eedc2218fda5cde48fe7d47314c124f0 100644
--- a/resources/views/languages/overview.blade.php
+++ b/resources/views/languages/overview.blade.php
@@ -3,33 +3,32 @@
@section('title', $title )
@section('content')
-@if(!$deComplete)
-<p>Hinweis: Es sind nicht alle Texte für die Referenzsprache(deutsch) vorhanden. Das Bearbeiten der Sprachdateien ist auf die deutsche begrenzt, bis diese komplett ist.</p>
-@endif
-<table class="table">
- <thead>
- <tr>
- <th>Sprachkürzel</th>
- <th>Status</th>
- <th>Aktion</th>
- </tr>
- </thead>
- <tbody>
- @foreach($langTexts as $lang => $values)
- <tr @if(floor(($values['textCount'] / count($sum)) * 100) < 100) class="danger" @else class="success" @endif>
- <td>{{$lang}}</td>
- <td>{{ $values['textCount'] . "/" . count($sum)}} Texten übersetzt. ({{ floor(($values['textCount'] / count($sum)) * 100) }} %)</td>
- <td><a href="
- @if( $lang === "de" && floor(($values['textCount'] / count($sum)) * 100) < 100)
- {{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), url("/languages/edit", ['from'=>'all', 'to'=>'de'])) }}
- @elseif($lang !== "de" && floor(($values['textCount'] / count($sum)) * 100) < 100)
- {{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), url("/languages/edit", ['from'=>'de', 'to'=>$lang])) }}
- @else
- #
- @endif " class="btn btn-default @if((!$deComplete && $lang !== "de") || floor(($values['textCount'] / count($sum)) * 100) >= 100) disabled @endif">Texte für "{{ $lang }}" ergänzen</a></td>
+ @if(!$deComplete)
+ <p>Hinweis: Es sind nicht alle Texte für die Referenzsprache(deutsch) vorhanden. Das Bearbeiten der Sprachdateien ist auf die deutsche begrenzt, bis diese komplett ist.</p>
+ @endif
+ <table class="table">
+ <thead>
+ <tr>
+ <th>Sprachkürzel</th>
+ <th>Status</th>
+ <th>Aktion</th>
</tr>
- @endforeach
- </tbody>
-</table>
-
+ </thead>
+ <tbody>
+ @foreach($langTexts as $lang => $values)
+ <tr @if(floor(($values['textCount'] / count($sum)) * 100) < 100) class="danger" @else class="success" @endif>
+ <td>{{$lang}}</td>
+ <td>{{ $values['textCount'] . "/" . count($sum)}} Texten übersetzt. ({{ floor(($values['textCount'] / count($sum)) * 100) }} %)</td>
+ <td><a href="
+ @if( $lang === "de" && floor(($values['textCount'] / count($sum)) * 100) < 100)
+ {{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), url("/languages/edit", ['from'=>'all', 'to'=>'de'])) }}
+ @elseif($lang !== "de" && floor(($values['textCount'] / count($sum)) * 100) < 100)
+ {{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), url("/languages/edit", ['from'=>'de', 'to'=>$lang])) }}
+ @else
+ #
+ @endif " class="btn btn-default @if((!$deComplete && $lang !== "de") || floor(($values['textCount'] / count($sum)) * 100) >= 100) disabled @endif">Texte für "{{ $lang }}" ergänzen</a></td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
@endsection
diff --git a/resources/views/layouts/ad.blade.php b/resources/views/layouts/ad.blade.php
index 48af348d40608b89f96005b19859bdf92d483d56..b8f215319ba71df15db4d6a2d211657475c32b2b 100644
--- a/resources/views/layouts/ad.blade.php
+++ b/resources/views/layouts/ad.blade.php
@@ -1,23 +1,23 @@
@if(isset($ad))
-<div class="result ad row">
- <div class="number col-sm-1"></div>
- <div class="resultInformation col-sm-10">
- <p class="title">
- <a class="title" href="{{ $ad['link'] }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0">
- {{ $ad['titel'] }}
- </a>
- </p>
- <p class="link">
- <a href="{{ $ad['link'] }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0">
- {{ $ad['anzeigeLink'] }}
- </a>
- <span class="hoster">
- {!! trans('ad.von') !!} {!! $ad['gefVon'] !!}
- </span>
- </p>
- <p class="description">
- {{ $ad['descr'] }}
- </p>
+ <div class="result ad row">
+ <div class="number col-sm-1"></div>
+ <div class="resultInformation col-sm-10">
+ <p class="title">
+ <a class="title" href="{{ $ad['link'] }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0">
+ {{ $ad['titel'] }}
+ </a>
+ </p>
+ <p class="link">
+ <a href="{{ $ad['link'] }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad['gefVon'] }}" data-count="0">
+ {{ $ad['anzeigeLink'] }}
+ </a>
+ <span class="hoster">
+ {!! trans('ad.von') !!} {!! $ad['gefVon'] !!}
+ </span>
+ </p>
+ <p class="description">
+ {{ $ad['descr'] }}
+ </p>
+ </div>
</div>
-</div>
@endif
diff --git a/resources/views/layouts/products.blade.php b/resources/views/layouts/products.blade.php
index 2f21168d9572dc7950a8739e66cb01bae2ae89a0..df6b4c94499e41f88d8e9cba74559c6c23901123 100644
--- a/resources/views/layouts/products.blade.php
+++ b/resources/views/layouts/products.blade.php
@@ -4,17 +4,17 @@
<span id="mark">Produktanzeigen:</span>
<ul class="lightSlider" >
@foreach($products as $product)
- <li>
- <div class="product">
- <a href="{{$product["link"]}}" title="{{$product["titel"]}}" target="_blank" rel="noopener">
- <div class="price">{!!$product["price"]!!}</div>
- <img src="{{ $metager->getImageProxyLink($product["image"]) }}" />
- <p class="title">{{$product["titel"]}}</p>
- <p class="shop">{{$product["gefVon"]}}</p>
- <p class="shipping">{{$product["additionalInformation"]["shipping"]}}</p>
- </a>
- </div>
- </li>
+ <li>
+ <div class="product">
+ <a href="{{$product["link"]}}" title="{{$product["titel"]}}" target="_blank" rel="noopener">
+ <div class="price">{!!$product["price"]!!}</div>
+ <img src="{{ $metager->getImageProxyLink($product["image"]) }}" />
+ <p class="title">{{$product["titel"]}}</p>
+ <p class="shop">{{$product["gefVon"]}}</p>
+ <p class="shipping">{{$product["additionalInformation"]["shipping"]}}</p>
+ </a>
+ </div>
+ </li>
@endforeach
</ul>
</div>
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index d022da8f35d8e4692f755764f0515c4c6e81553e..6b91b758ae23884028475559f53c3aabefbe3876 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -1,224 +1,217 @@
- @if( strpos(rtrim(Request::header('REFERER'), '/'), LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") ) === 0 && ( $browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'IE' || $browser === 'Edge') )
- <div id="searchplugin" class="alert alert-warning alert-dismissible" role="alert" style="">
- <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
- {!! trans('researchandtabs.plugin.1', ['browser' => $browser]) !!}
- <br />
- <div style="">
- <a href="{{ action('StartpageController@loadStartPage', Request::all()) }}#plugin-modal" target="_blank" rel="noopener" type="button" class="btn btn-info" style="">{!! trans('researchandtabs.plugin.2') !!}</a>
- </div>
- </div>
- @endif
+@if( strpos(rtrim(Request::header('REFERER'), '/'), LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") ) === 0 && ( $browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'IE' || $browser === 'Edge') )
+ <div id="searchplugin" class="alert alert-warning alert-dismissible" role="alert" style="">
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
+ {!! trans('researchandtabs.plugin.1', ['browser' => $browser]) !!}
+ <br />
+ <div style="">
+ <a href="{{ action('StartpageController@loadStartPage', Request::all()) }}#plugin-modal" target="_blank" rel="noopener" type="button" class="btn btn-info" style="">{!! trans('researchandtabs.plugin.2') !!}</a>
+ </div>
+ </div>
+@endif
<div class="content-wrapper container">
- <header id="research" class="row">
- <nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
- <div class="container">
- <div class="row">
- <div class="col-xs-3 logo dense-col">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
- </div>
- <div class="col-xs-9 dense-col">
- <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form" id="submitForm">
- <div class="input-group">
- <input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
- <div class="input-group-addon">
- <button type='submit' form="submitForm" id='search'><span class="glyphicon glyphicon-search"></span>
- </button>
- </div>
- </div>
-
- @foreach( $metager->request->all() as $key => $value)
- @if($key !== "eingabe" && $key !== "page" && $key !== "next")
- <input type='hidden' name='{{ $key }}' value='{{ $value }}' form='submitForm' />
- @endif
- @endforeach
-
- </form>
- </div>
- </ul>
- </div>
- </nav>
- <ul class="nav nav-tabs" id="foki" role="tablist">
- @if( $metager->getFokus() === "web" )
- <li id="webTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
- <a aria-controls="web" data-href="#web" href="#web">
- <span class='glyphicon glyphicon-globe'></span>
- <span class="hidden-xs">{{ trans('index.foki.web') }}</span>
- </a>
- </li>
- @else
- <li data-loaded="0" id="webTabSelector" class="tab-selector" role="presentation">
- <a aria-controls="web" data-href="{{ $metager->generateSearchLink('web') }}" href="{{ $metager->generateSearchLink('web') }}">
- <span class='glyphicon glyphicon-globe'></span>
- <span class="hidden-xs">{{ trans('index.foki.web') }}</span>
- </a>
- </li>
- @endif
-
- @if( $metager->getFokus() === "bilder" )
- <li id="bilderTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
- <a aria-controls="bilder" data-href="#bilder" href="#bilder">
- <span class='glyphicon glyphicon-picture'></span>
- <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
- </a>
- </li>
- @else
- <li data-loaded="0" id="bilderTabSelector" class="tab-selector" role="presentation">
- <a aria-controls="bilder" data-href="{{ $metager->generateSearchLink('bilder') }}" href="{{ $metager->generateSearchLink('bilder') }}">
- <span class='glyphicon glyphicon-picture'></span>
- <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
- </a>
- </li>
- @endif
-
- @if( $metager->getFokus() === "nachrichten" )
- <li id="nachrichtenTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
- <a aria-controls="nachrichten" data-href="#nachrichten" href="#nachrichten">
- <span class='glyphicon glyphicon-bullhorn'></span>
- <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
- </a>
- </li>
- @else
- <li data-loaded="0" id="nachrichtenTabSelector" class="tab-selector" role="presentation" >
- <a aria-controls="nachrichten" data-href="{{ $metager->generateSearchLink('nachrichten') }}" href="{{ $metager->generateSearchLink('nachrichten') }}">
- <span class='glyphicon glyphicon-bullhorn'></span>
- <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
- </a>
- </li>
- @endif
-
- @if( $metager->getFokus() === "wissenschaft" )
- <li id="wissenschaftTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
- <a aria-controls="wissenschaft" data-href="#wissenschaft" href="#wissenschaft">
- <span class='glyphicon glyphicon-file'></span>
- <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
- </a>
- </li>
- @else
- <li data-loaded="0" id="wissenschaftTabSelector" class="tab-selector" role="presentation">
- <a aria-controls="wissenschaft" data-href="{{ $metager->generateSearchLink('wissenschaft') }}" href="{{ $metager->generateSearchLink('wissenschaft') }}">
- <span class='glyphicon glyphicon-file'></span>
- <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
- </a>
- </li>
- @endif
-
- @if( $metager->getFokus() === "produktsuche" )
- <li id="produktsucheTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
- <a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
- <span class='glyphicon glyphicon-shopping-cart'></span>
- <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
- </a>
- </li>
- @else
- <li data-loaded="0" id="produktsucheTabSelector" class="tab-selector" role="presentation" >
- <a aria-controls="produktsuche" data-href="{{ $metager->generateSearchLink('produktsuche') }}" href="{{ $metager->generateSearchLink('produktsuche') }}">
- <span class='glyphicon glyphicon-shopping-cart'></span>
- <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
- </a>
- </li>
- @endif
-
- @if( $metager->getFokus() === "angepasst" )
- <li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
- <a aria-controls="angepasst" data-href="#angepasst" href="#angepasst">
- <span class='glyphicon glyphicon-cog'></span>
- <span class="hidden-xs">{{ trans('index.foki.angepasst') }}</span>
- </a>
- </li>
- @endif
-
- <li id="mapsTabSelector" role="presentation" class="tab-selector">
- <a href="https://maps.metager.de/map/{{ $metager->getQ() }}/-6.781309835595698/44.85855550132342/33.9779675081543/58.25372144666716" target="_blank">
- <span class='glyphicon glyphicon-map-marker'></span>
- <span class="hidden-xs">{!! trans('index.foki.maps') !!}</span>
- </a>
- </li>
- </ul>
- </header>
- <main class="tab-content row">
-
- @if( $metager->getFokus() === "web" )
- <div role="tabpanel" class="tab-pane active" id="web">
- <div class="row">
- @yield('results')
- </div>
- </div>
- @else
- <div role="tabpanel" class="tab-pane" id="web">
- <div class="loader">
- <img src="/img/ajax-loader.gif" alt="" />
- </div>
- </div>
- @endif
-
-
-
- @if( $metager->getFokus() === "bilder" )
- <div role="tabpanel" class="tab-pane active" id="bilder">
- <div class="row">
- @yield('results')
- </div>
- </div>
- @else
- <div role="tabpanel" class="tab-pane" id="bilder">
- <div class="loader">
- <img src="/img/ajax-loader.gif" alt="" />
- </div>
- </div>
- @endif
-
-
-
- @if( $metager->getFokus() === "nachrichten" )
- <div role="tabpanel" class="tab-pane active" id="nachrichten">
- <div class="row">
- @yield('results')
- </div>
- </div>
- @else
- <div role="tabpanel" class="tab-pane" id="nachrichten">
- <div class="loader">
- <img src="/img/ajax-loader.gif" alt="" />
- </div>
- </div>
- @endif
-
- @if( $metager->getFokus() === "wissenschaft" )
- <div role="tabpanel" class="tab-pane active" id="wissenschaft">
- <div class="row">
- @yield('results')
- </div>
- </div>
- @else
- <div role="tabpanel" class="tab-pane" id="wissenschaft">
- <div class="loader">
- <img src="/img/ajax-loader.gif" alt="" />
- </div>
- </div>
- @endif
-
- @if( $metager->getFokus() === "produktsuche" )
- <div role="tabpanel" class="tab-pane active" id="produktsuche">
- <div class="row">
- @yield('results')
- </div>
- </div>
- @else
- <div role="tabpanel" class="tab-pane" id="produktsuche">
- <div class="loader">
- <img src="/img/ajax-loader.gif" alt="" />
- </div>
- </div>
- @endif
-
-
-
- @if( $metager->getFokus() === "angepasst" )
- <div role="tabpanel" class="tab-pane active" id="angepasst">
- <div class="row">
- @yield('results')
- </div>
- </div>
- @endif
- </main>
- </div>
+ <header id="research" class="row">
+ <nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
+ <div class="container">
+ <div class="row">
+ <div class="col-xs-3 logo dense-col">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
+ </div>
+ <div class="col-xs-9 dense-col">
+ <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form" id="submitForm">
+ <div class="input-group">
+ <input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
+ <div class="input-group-addon">
+ <button type='submit' form="submitForm" id='search'><span class="glyphicon glyphicon-search"></span>
+ </button>
+ </div>
+ </div>
+ @foreach( $metager->request->all() as $key => $value)
+ @if($key !== "eingabe" && $key !== "page" && $key !== "next")
+ <input type='hidden' name='{{ $key }}' value='{{ $value }}' form='submitForm' />
+ @endif
+ @endforeach
+ </form>
+ </div>
+ </div>
+ </div>
+ </nav>
+ <ul class="nav nav-tabs" id="foki" role="tablist">
+
+ @if( $metager->getFokus() === "web" )
+ <li id="webTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
+ <a aria-controls="web" data-href="#web" href="#web">
+ <span class='glyphicon glyphicon-globe'></span>
+ <span class="hidden-xs">{{ trans('index.foki.web') }}</span>
+ </a>
+ </li>
+ @else
+ <li data-loaded="0" id="webTabSelector" class="tab-selector" role="presentation">
+ <a aria-controls="web" data-href="{{ $metager->generateSearchLink('web') }}" href="{{ $metager->generateSearchLink('web') }}">
+ <span class='glyphicon glyphicon-globe'></span>
+ <span class="hidden-xs">{{ trans('index.foki.web') }}</span>
+ </a>
+ </li>
+ @endif
+
+ @if( $metager->getFokus() === "bilder" )
+ <li id="bilderTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
+ <a aria-controls="bilder" data-href="#bilder" href="#bilder">
+ <span class='glyphicon glyphicon-picture'></span>
+ <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
+ </a>
+ </li>
+ @else
+ <li data-loaded="0" id="bilderTabSelector" class="tab-selector" role="presentation">
+ <a aria-controls="bilder" data-href="{{ $metager->generateSearchLink('bilder') }}" href="{{ $metager->generateSearchLink('bilder') }}">
+ <span class='glyphicon glyphicon-picture'></span>
+ <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
+ </a>
+ </li>
+ @endif
+
+ @if( $metager->getFokus() === "nachrichten" )
+ <li id="nachrichtenTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
+ <a aria-controls="nachrichten" data-href="#nachrichten" href="#nachrichten">
+ <span class='glyphicon glyphicon-bullhorn'></span>
+ <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
+ </a>
+ </li>
+ @else
+ <li data-loaded="0" id="nachrichtenTabSelector" class="tab-selector" role="presentation" >
+ <a aria-controls="nachrichten" data-href="{{ $metager->generateSearchLink('nachrichten') }}" href="{{ $metager->generateSearchLink('nachrichten') }}">
+ <span class='glyphicon glyphicon-bullhorn'></span>
+ <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
+ </a>
+ </li>
+ @endif
+
+ @if( $metager->getFokus() === "wissenschaft" )
+ <li id="wissenschaftTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
+ <a aria-controls="wissenschaft" data-href="#wissenschaft" href="#wissenschaft">
+ <span class='glyphicon glyphicon-file'></span>
+ <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
+ </a>
+ </li>
+ @else
+ <li data-loaded="0" id="wissenschaftTabSelector" class="tab-selector" role="presentation">
+ <a aria-controls="wissenschaft" data-href="{{ $metager->generateSearchLink('wissenschaft') }}" href="{{ $metager->generateSearchLink('wissenschaft') }}">
+ <span class='glyphicon glyphicon-file'></span>
+ <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
+ </a>
+ </li>
+ @endif
+
+ @if( $metager->getFokus() === "produktsuche" )
+ <li id="produktsucheTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
+ <a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
+ <span class='glyphicon glyphicon-shopping-cart'></span>
+ <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
+ </a>
+ </li>
+ @else
+ <li data-loaded="0" id="produktsucheTabSelector" class="tab-selector" role="presentation" >
+ <a aria-controls="produktsuche" data-href="{{ $metager->generateSearchLink('produktsuche') }}" href="{{ $metager->generateSearchLink('produktsuche') }}">
+ <span class='glyphicon glyphicon-shopping-cart'></span>
+ <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
+ </a>
+ </li>
+ @endif
+
+ @if( $metager->getFokus() === "angepasst" )
+ <li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
+ <a aria-controls="angepasst" data-href="#angepasst" href="#angepasst">
+ <span class='glyphicon glyphicon-cog'></span>
+ <span class="hidden-xs">{{ trans('index.foki.angepasst') }}</span>
+ </a>
+ </li>
+ @endif
+
+ <li id="mapsTabSelector" role="presentation" class="tab-selector">
+ <a href="https://maps.metager.de/map/{{ $metager->getQ() }}/-6.781309835595698/44.85855550132342/33.9779675081543/58.25372144666716" target="_blank">
+ <span class='glyphicon glyphicon-map-marker'></span>
+ <span class="hidden-xs">{!! trans('index.foki.maps') !!}</span>
+ </a>
+ </li>
+ </ul>
+ </header>
+ <main class="tab-content row">
+
+ @if( $metager->getFokus() === "web" )
+ <div role="tabpanel" class="tab-pane active" id="web">
+ <div class="row">
+ @yield('results')
+ </div>
+ </div>
+ @else
+ <div role="tabpanel" class="tab-pane" id="web">
+ <div class="loader">
+ <img src="/img/ajax-loader.gif" alt="" />
+ </div>
+ </div>
+ @endif
+
+ @if( $metager->getFokus() === "bilder" )
+ <div role="tabpanel" class="tab-pane active" id="bilder">
+ <div class="row">
+ @yield('results')
+ </div>
+ </div>
+ @else
+ <div role="tabpanel" class="tab-pane" id="bilder">
+ <div class="loader">
+ <img src="/img/ajax-loader.gif" alt="" />
+ </div>
+ </div>
+ @endif
+
+ @if( $metager->getFokus() === "nachrichten" )
+ <div role="tabpanel" class="tab-pane active" id="nachrichten">
+ <div class="row">
+ @yield('results')
+ </div>
+ </div>
+ @else
+ <div role="tabpanel" class="tab-pane" id="nachrichten">
+ <div class="loader">
+ <img src="/img/ajax-loader.gif" alt="" />
+ </div>
+ </div>
+ @endif
+
+ @if( $metager->getFokus() === "wissenschaft" )
+ <div role="tabpanel" class="tab-pane active" id="wissenschaft">
+ <div class="row">
+ @yield('results')
+ </div>
+ </div>
+ @else
+ <div role="tabpanel" class="tab-pane" id="wissenschaft">
+ <div class="loader">
+ <img src="/img/ajax-loader.gif" alt="" />
+ </div>
+ </div>
+ @endif
+
+ @if( $metager->getFokus() === "produktsuche" )
+ <div role="tabpanel" class="tab-pane active" id="produktsuche">
+ <div class="row">
+ @yield('results')
+ </div>
+ </div>
+ @else
+ <div role="tabpanel" class="tab-pane" id="produktsuche">
+ <div class="loader">
+ <img src="/img/ajax-loader.gif" alt="" />
+ </div>
+ </div>
+ @endif
+
+ @if( $metager->getFokus() === "angepasst" )
+ <div role="tabpanel" class="tab-pane active" id="angepasst">
+ <div class="row">
+ @yield('results')
+ </div>
+ </div>
+ @endif
+ </main>
+</div>
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 85840c551f634241ec4409ebc93caa2c10e4876f..6df9a382e46d26246b4aecd8d4533badce911d88 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -1,25 +1,25 @@
<div class="result row">
- <div class="number col-sm-1 hidden-xs" style="color:{{ $result->color }}">
- {{ $result->number }})
- </div>
- <div class="resultInformation col-xs-12 col-sm-11">
- <div class="col-xs-10 col-sm-11" style="padding:0; ">
+ <div class="number col-sm-1 hidden-xs" style="color:{{ $result->color }}">
+ {{ $result->number }})
+ </div>
+ <div class="resultInformation col-xs-12 col-sm-11">
+ <div class="col-xs-10 col-sm-11" style="padding:0; ">
<p class="title">
<a class="title" href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
- {{ $result->titel }}
+ {{ $result->titel }}
</a>
</p>
<div class="link">
<div>
<div class="link-link">
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
- {{ $result->anzeigeLink }}
+ {{ $result->anzeigeLink }}
</a>
</div>
<div class="options">
<a tabindex="0" data-toggle="popover" data-trigger="focus" data-placement="auto bottom" data-container="body" data-html="true" data-title="<span class='glyphicon glyphicon-cog'></span> Optionen">
@if(strlen($metager->getSite()) === 0)
- <span class="glyphicon glyphicon-triangle-bottom"></span>
+ <span class="glyphicon glyphicon-triangle-bottom"></span>
@endif
</a>
<div class="content hidden">
@@ -35,47 +35,47 @@
</a>
</li>
@if( $result->strippedHost !== $result->strippedDomain )
- <li>
- <a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
- {!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
- </a>
- </li>
+ <li>
+ <a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
+ {!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
+ </a>
+ </li>
@endif
</ul>
</div>
</div>
</div>
<span class="hoster">
- von {!! $result->gefVon !!}
+ von {!! $result->gefVon !!}
</span>
@if( isset($result->partnershop) && $result->partnershop === TRUE )
- <span class="partnershop-info">
- <img src="/img/boosticon.png" height="13" alt="">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
- </span>
+ <span class="partnershop-info">
+ <img src="/img/boosticon.png" height="13" alt="">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
+ </span>
@endif
<a class="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">
<img src="/img/proxyicon.png" alt="" />
{!! trans('result.options.5') !!}
</a>
</div>
- </div>
- @if( isset($result->logo) )
+ </div>
+ @if( isset($result->logo) )
<div class="col-xs-2 col-sm-1" style="padding: 0;">
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}">
- <img src="{{ $metager->getImageProxyLink($result->logo) }}" alt="" />
+ <img src="{{ $metager->getImageProxyLink($result->logo) }}" alt="" />
</a>
</div>
- @endif
- @if( $result->image !== "" )
+ @endif
+ @if( $result->image !== "" )
<div class="description">
- <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
- <img src="{{ $metager->getImageProxyLink($result->image) }}" align="left" width="120px" height="60px" alt="" />
+ <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
+ <img src="{{ $metager->getImageProxyLink($result->image) }}" align="left" width="120px" height="60px" alt="" />
</a>
{!! $result->descr !!}
</div>
- @else
+ @else
<div class="description">{{ $result->descr }}</div>
- @endif
- </div>
+ @endif
+ </div>
</div>
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index a20f03160b48a01af4d40ee352202bd51d84072e..6502bd8a16953875c81336584a3056c108584b87 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -1,42 +1,40 @@
<!DOCTYPE html>
<html>
-<head>
- <title>{{ $metager->getQ() }} - MetaGer</title>
- <!--<link href="/css/bootstrap.css" rel="stylesheet" />-->
- <link href="/favicon.ico" rel="icon" type="image/x-icon" />
- <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
- <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
- <meta content="{{ getmypid() }}" name="p" />
- <meta content="{{ $eingabe }}" name="q" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" />
- <meta http-equiv="language" content="{!! trans('staticPages.meta.language') !!}" />
- <meta HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE" />
- <link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
- <!--<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />-->
- <link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
- <link type="text/css" rel="stylesheet" href="/css/lightslider.css" />
- <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
-</head>
-<body id="resultBody">
- @if( !isset($suspendheader) )
- @include('layouts.researchandtabs')
- @else
- <div class="tab-content container-fluid">
- @yield('results')
- </div>
- @endif
- <footer>
- <div class="row">
- <div class="col-xs-6">
- <a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
+ <head>
+ <title>{{ $metager->getQ() }} - MetaGer</title>
+ <link href="/favicon.ico" rel="icon" type="image/x-icon" />
+ <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
+ <meta content="{{ getmypid() }}" name="p" />
+ <meta content="{{ $eingabe }}" name="q" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE" />
+ <meta http-equiv="language" content="{!! trans('staticPages.meta.language') !!}" />
+ <meta HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE" />
+ <link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
+ <link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
+ <link type="text/css" rel="stylesheet" href="/css/lightslider.css" />
+ <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
+ </head>
+ <body id="resultBody">
+ @if( !isset($suspendheader) )
+ @include('layouts.researchandtabs')
+ @else
+ <div class="tab-content container-fluid">
+ @yield('results')
</div>
- <div class="col-xs-6">
- <a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
+ @endif
+ <footer>
+ <div class="row">
+ <div class="col-xs-6">
+ <a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
+ </div>
+ <div class="col-xs-6">
+ <a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
+ </div>
</div>
- </div>
- </footer>
- <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
- <script type="text/javascript" src="{{ elixir('js/all.js') }}"></script>
-</body>
+ </footer>
+ <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
+ <script type="text/javascript" src="{{ elixir('js/all.js') }}"></script>
+ </body>
</html>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index d8b8167731749a6f85cbd71bb99a371a750f8a37..5cbacd3eaf3c35306fbfbd37c5ee9a89ad365410 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -2,7 +2,7 @@
<html lang="{!! trans('staticPages.meta.language') !!}">
<head>
<meta charset="utf-8" />
- <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>@yield('title')</title>
<meta name="description" content="{!! trans('staticPages.meta.Description') !!}" />
<meta name="keywords" content="{!! trans('staticPages.meta.Keywords') !!}" />
@@ -28,7 +28,6 @@
@endif
@endif
</head>
-
<body>
<header>
<nav class="navbar navbar-default navbar-fixed-top">
@@ -42,54 +41,93 @@
</button>
@yield('homeIcon')
</div>
-
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}</a></li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}</a>
+ </li>
<li @if (isset($navbarFocus) && $navbarFocus === 'foerdern') class="dropdown active" @else class="dropdown" @endif >
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}</a></li>
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}">{{ trans('staticPages.nav23') }}</a></li>
- <li><a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl">{{ trans('staticPages.nav17') }}</a></li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}">{{ trans('staticPages.nav23') }}</a>
+ </li>
+ <li>
+ <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl">{{ trans('staticPages.nav17') }}</a>
+ </li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}</a></li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}</a>
+ </li>
<li @if (isset($navbarFocus) && $navbarFocus === 'hilfe') class="dropdown active" @else class="dropdown" @endif >
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe">{{ trans('staticPages.nav20') }}
<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav20') }}</a></li>
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}">{{ trans('staticPages.nav21') }}</a></li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav20') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}">{{ trans('staticPages.nav21') }}</a>
+ </li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'kontakt') class="dropdown active" @else class="dropdown" @endif >
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}</a></li>
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}</a></li>
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}</a></li>
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}</a></li>
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}</a></li>
+ <li>
+ <a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}</a>
+ </li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="dropdown active" @else class="dropdown" @endif >
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}</a></li>
- <li><a href="https://metager.de/klassik/zitat-suche/" target="_blank" rel="noopener">{{ trans('staticPages.nav22') }}</a></li>
- <li><a href="https://metager.de/klassik/asso/" target="_blank" rel="noopener">{{ trans('staticPages.nav11') }}</a></li>
- <li><a href="http://code.metager.de/" target="_blank" rel="noopener">{{ trans('staticPages.nav12') }}</a></li>
- <li><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe#mg-app") }}">@lang('staticPages.nav25')</a></li>
- <li><a href="https://metager.to/" target="_blank" rel="noopener">{{ trans('staticPages.nav13') }}</a></li>
- <li><a href="https://maps.metager.de" target="_blank">Maps.MetaGer.de</a></li>
- <li><a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank" rel="noopener">{{ trans('staticPages.nav24') }}</a></li>
- <li><a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" target="_blank" rel="noopener">{{ trans('staticPages.nav14') }}</a></li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}</a>
+ </li>
+ <li>
+ <a href="https://metager.de/klassik/zitat-suche/" target="_blank" rel="noopener">{{ trans('staticPages.nav22') }}</a>
+ </li>
+ <li>
+ <a href="https://metager.de/klassik/asso/" target="_blank" rel="noopener">{{ trans('staticPages.nav11') }}</a>
+ </li>
+ <li>
+ <a href="http://code.metager.de/" target="_blank" rel="noopener">{{ trans('staticPages.nav12') }}</a>
+ </li>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe#mg-app") }}">@lang('staticPages.nav25')</a>
+ </li>
+ <li>
+ <a href="https://metager.to/" target="_blank" rel="noopener">{{ trans('staticPages.nav13') }}</a>
+ </li>
+ <li>
+ <a href="https://maps.metager.de" target="_blank">Maps.MetaGer.de</a>
+ </li>
+ <li>
+ <a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank" rel="noopener">{{ trans('staticPages.nav24') }}</a>
+ </li>
+ <li>
+ <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" target="_blank" rel="noopener">{{ trans('staticPages.nav14') }}</a>
+ </li>
</ul>
</li>
<li class="dropdown">
@@ -97,7 +135,9 @@
<span class="caret"></span></a>
<ul class="dropdown-menu">
@foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
- <li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
+ <li>
+ <a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a>
+ </li>
@endforeach
</ul>
</li>
@@ -119,13 +159,18 @@
@yield('optionalContent')
<footer class="noprint">
<ul class="list-inline hidden-xs">
- <li><a href="https://www.suma-ev.de/" target="_blank" rel="noopener">
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a></li>
+ <li>
+ <a href="https://www.suma-ev.de/" target="_blank" rel="noopener">
+ <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
+ </li>
<li id="info">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
- {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" rel="noopener" >{{ trans('staticPages.sumaev.2') }}</a></li>
- <li><a href="https://www.uni-hannover.de/" target="_blank" rel="noopener">
- <img src="/img/luh_metager.png" alt="LUH Logo"></a></li>
+ {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" rel="noopener" >{{ trans('staticPages.sumaev.2') }}</a>
+ </li>
+ <li>
+ <a href="https://www.uni-hannover.de/" target="_blank" rel="noopener">
+ <img src="/img/luh_metager.png" alt="LUH Logo"></a>
+ </li>
</ul>
</footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 8ea71c40b630f030084372ad094a66db7fa4d7c5..23081528fa9953a925793680be14afa31f4064de 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -1,16 +1,16 @@
@extends('layouts.resultPage')
@section('results')
-@if( sizeof($errors) > 0 )
+ @if(sizeof($errors) > 0)
<div class="alert alert-danger">
<ul>
@foreach($errors as $error)
- <li>{!! $error !!}</li>
+ <li>{!! $error !!}</li>
@endforeach
</ul>
</div>
@endif
- @if( sizeof($warnings) > 0)
+ @if(sizeof($warnings) > 0)
<div class="alert alert-warning">
<ul>
@foreach($warnings as $warning)
@@ -19,41 +19,39 @@
</ul>
</div>
@endif
- @if( $metager->showQuicktips() )
+ @if($metager->showQuicktips())
<div class="col-xs-12 col-md-8 resultContainer">
@else
<div class="col-xs-12 col-md-12 resultContainer">
@endif
- @if($metager->hasProducts())
- @include('layouts.products', ['products' => $metager->getProducts()])
- @else
- {{-- 3-Mal Werbung --}}
- @for($i = 0; $i <= 2; $i++)
- @include('layouts.ad', ['ad' => $metager->popAd()])
- @endfor
- @endif
- @if($metager->getMaps())
- <div class="result row" id="map">
- <div class="number col-sm-1 hidden-xs"></div>
- <div class="resultInformation col-xs-12 col-sm-11">
- <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
- </div>
+ @if($metager->hasProducts())
+ @include('layouts.products', ['products' => $metager->getProducts()])
+ @else
+ @for($i = 0; $i <= 2; $i++)
+ @include('layouts.ad', ['ad' => $metager->popAd()])
+ @endfor
+ @endif
+ @if($metager->getMaps())
+ <div class="result row" id="map">
+ <div class="number col-sm-1 hidden-xs"></div>
+ <div class="resultInformation col-xs-12 col-sm-11">
+ <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
- @endif
- @foreach($metager->getResults() as $result)
- @if($result->number % 7 === 0)
- @include('layouts.ad', ['ad' => $metager->popAd()])
- @endif
- @include('layouts.result', ['result' => $result])
- @endforeach
- <nav aria-label="...">
- <ul class="pager">
- <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
- <li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
- </ul>
- </nav>
</div>
-
+ @endif
+ @foreach($metager->getResults() as $result)
+ @if($result->number % 7 === 0)
+ @include('layouts.ad', ['ad' => $metager->popAd()])
+ @endif
+ @include('layouts.result', ['result' => $result])
+ @endforeach
+ <nav aria-label="...">
+ <ul class="pager">
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
+ </ul>
+ </nav>
+ </div>
@if( $metager->showQuicktips() )
<div class="hidden-xs col-md-4" id="quicktips">
<iframe class="col-mod-4 hidden-xs hidden-sm" src="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/qt") }}?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}&lang={{ Request::input('lang', 'all') }}&unfilteredLink={{ base64_encode($metager->getUnfilteredLink()) }}"></iframe>
diff --git a/resources/views/metager3bilder.blade.php b/resources/views/metager3bilder.blade.php
index 7be2e357ccd3b36d305f2b2bb33d0f311492ed48..92853dc59ad325631ace03602cd5ecb62473b678 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/resources/views/metager3bilder.blade.php
@@ -1,16 +1,16 @@
@extends('layouts.resultPage')
@section('results')
-@if( sizeof($errors) > 0 )
+ @if(sizeof($errors) > 0)
<div class="alert alert-danger">
<ul>
@foreach($errors as $error)
- <li>{!! $error !!}</li>
+ <li>{!! $error !!}</li>
@endforeach
</ul>
</div>
@endif
- @if( sizeof($warnings) > 0)
+ @if(sizeof($warnings) > 0)
<div class="alert alert-warning">
<ul>
@foreach($warnings as $warning)
@@ -31,7 +31,7 @@
</div>
<nav aria-label="...">
<ul class="pager">
- <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
</ul>
</nav>
diff --git a/resources/views/metager3bilderresults.blade.php b/resources/views/metager3bilderresults.blade.php
index 61ba9e4acaaa9775313099c249250549a92f14f3..ea77ec3eaae0d9ab08f5d7b0540ab1ad9b55d513 100644
--- a/resources/views/metager3bilderresults.blade.php
+++ b/resources/views/metager3bilderresults.blade.php
@@ -1,21 +1,21 @@
@if( sizeof($errors) > 0 )
- <div class="alert alert-danger">
- <ul>
- @foreach($errors as $error)
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors as $error)
<li>{!! $error !!}</li>
- @endforeach
- </ul>
- </div>
- @endif
- @if( sizeof($warnings) > 0)
- <div class="alert alert-warning">
- <ul>
- @foreach($warnings as $warning)
- <li>{!! $warning !!}</li>
- @endforeach
- </ul>
- </div>
- @endif
+ @endforeach
+ </ul>
+ </div>
+@endif
+@if( sizeof($warnings) > 0)
+ <div class="alert alert-warning">
+ <ul>
+ @foreach($warnings as $warning)
+ <li>{!! $warning !!}</li>
+ @endforeach
+ </ul>
+ </div>
+@endif
<div id="container">
@foreach($metager->getResults() as $result)
<div class="item">
@@ -27,8 +27,8 @@
@endforeach
</div>
<nav aria-label="...">
- <ul class="pager">
- <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
- <li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
- </ul>
- </nav>
+ <ul class="pager">
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
+ </ul>
+</nav>
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index e502c76e545861b565ce406ccbcd96f79f2664f7..d043ca884940af5d87be7f4009745430298939fb 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -1,37 +1,36 @@
@if( sizeof($errors) > 0 )
- <div class="alert alert-danger">
- <ul>
- @foreach($errors as $error)
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors as $error)
<li>{!! $error !!}</li>
- @endforeach
- </ul>
- </div>
- @endif
- @if( sizeof($warnings) > 0)
- <div class="alert alert-warning">
- <ul>
- @foreach($warnings as $warning)
- <li>{!! $warning !!}</li>
- @endforeach
- </ul>
- </div>
- @endif
+ @endforeach
+ </ul>
+ </div>
+@endif
+@if( sizeof($warnings) > 0)
+ <div class="alert alert-warning">
+ <ul>
+ @foreach($warnings as $warning)
+ <li>{!! $warning !!}</li>
+ @endforeach
+ </ul>
+ </div>
+@endif
<div class="col-xs-12 col-md-8">
@if($metager->hasProducts())
@include('layouts.products', ['products' => $metager->getProducts()])
@else
- {{-- 3-Mal Werbung --}}
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
@if($metager->getMaps())
- <div class="result row" id="map">
- <div class="number col-sm-1 hidden-xs"></div>
- <div class="resultInformation col-xs-12 col-sm-11">
- <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
+ <div class="result row" id="map">
+ <div class="number col-sm-1 hidden-xs"></div>
+ <div class="resultInformation col-xs-12 col-sm-11">
+ <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
+ </div>
</div>
- </div>
@endif
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@@ -41,7 +40,7 @@
@endforeach
<nav aria-label="...">
<ul class="pager">
- <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
+ <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
</ul>
</nav>
diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php
index 39e81a7fe884a9001d51a14a4784d124095079f3..e15b2b5cf4192ef71c3159ef4646943d30be4af9 100644
--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -2,55 +2,62 @@
<html lang="{!! trans('staticPages.meta.language') !!}">
<head>
<title>{!! trans('quicktip.title') !!}</title>
- <!--<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default-neu') }}.css" />-->
<link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
</head>
<body class="quicktips">
@if(App::isLocale("de"))
- <div class="quicktip aufruf-winter">
- <div class="media">
- <div class="media-body">
- <h2 class="qtheader"><a href="@lang('spendenaufruf.link')" target="_blank">@lang('spendenaufruf.heading')</a></h2>
- <div>@lang('spendenaufruf.text')</div>
- <br>
- <a href="@lang('spendenaufruf.link')" class="btn btn-primary btn-block aufruf-action-btn" target="_blank">@lang('spendenaufruf.button')</a>
- </div>
- </div>
- </div>
+ <div class="quicktip aufruf-winter">
+ <div class="media">
+ <div class="media-body">
+ <h2 class="qtheader"><a href="@lang('spendenaufruf.link')" target="_blank">@lang('spendenaufruf.heading')</a></h2>
+ <div>@lang('spendenaufruf.text')</div>
+ <br>
+ <a href="@lang('spendenaufruf.link')" class="btn btn-primary btn-block aufruf-action-btn" target="_blank">@lang('spendenaufruf.button')</a>
+ </div>
+ </div>
+ </div>
@endif
@if( $spruch !== "" )
<blockquote id="spruch">{!! $spruch !!}</blockquote>
@endif
- @foreach( $mqs as $mq)
+ @foreach($mqs as $mq)
<div class="quicktip">
- @if( isset($mq['details']) )
- <details>
- <summary>
- @endif
- <div class="media">
- @if( isset($mq['image']) && isset($mq['image-alt'] ))
- <div class="media-left">
- <img class="qt-icon" src="{!! $mq['image'] !!}" alt="{!! $mq['image-alt'] !!}">
+ @if(isset($mq['details']))
+ <details>
+ <summary>
+ <div class="media">
+ @if( isset($mq['image']) && isset($mq['image-alt'] ))
+ <div class="media-left">
+ <img class="qt-icon" src="{!! $mq['image'] !!}" alt="{!! $mq['image-alt'] !!}">
+ </div>
+ @endif
+ <div class="media-body">
+ <h2 class="qtheader"><a href="{{ $mq['URL'] }}" target="_blank" rel="noopener">{{ $mq['title'] }}</a></h2>
+ <div>{!! $mq['summary'] !!}</div>
</div>
- @endif
- <div class="media-body">
- <h2 class="qtheader"><a href="{{ $mq['URL'] }}" target="_blank" rel="noopener">{{ $mq['title'] }}</a></h2>
- <div>{!! $mq['summary'] !!}</div>
- </div>
- @if( isset($mq['details']) )
<div class="media-right">
<span class="glyphicon glyphicon-info-sign info-details-available" aria-hidden="true"></span>
</div>
- @endif
- </div>
- @if( isset($mq['details']) )
- </summary>
+ </div>
+ </summary>
{!! $mq['details'] !!}
- </details>
- @endif
- @if( isset($mq['gefVon']) )
- <div class="pull-right">{!! $mq['gefVon'] !!}</div>
+ </details>
+ @else
+ <div class="media">
+ @if( isset($mq['image']) && isset($mq['image-alt'] ))
+ <div class="media-left">
+ <img class="qt-icon" src="{!! $mq['image'] !!}" alt="{!! $mq['image-alt'] !!}">
+ </div>
@endif
+ <div class="media-body">
+ <h2 class="qtheader"><a href="{{ $mq['URL'] }}" target="_blank" rel="noopener">{{ $mq['title'] }}</a></h2>
+ <div>{!! $mq['summary'] !!}</div>
+ </div>
+ </div>
+ @endif
+ @if( isset($mq['gefVon']) )
+ <div class="pull-right">{!! $mq['gefVon'] !!}</div>
+ @endif
</div>
@endforeach
<div class="quicktip">
@@ -70,7 +77,6 @@
</summary>
</details>
</div>
- <script src="{{ elixir('js/quicktips.js') }}">
- </script>
+ <script src="{{ elixir('js/quicktips.js') }}"></script>
</body>
</html>
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 5f6a01c4c3dcf88bf989110cfd5d1b2be0d90d44..077429de9e8cd619771b3bc11ba113341e3e5015 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -8,7 +8,6 @@
<p id="lead">{!! trans('settings.head.2') !!}</p>
<h2>{!! trans('settings.allgemein.1') !!}</h2>
<input type="hidden" name="focus" value="angepasst">
-
<container>
<div class="row">
<div class="col-sm-6 col-md-4 col-lg-3">
@@ -56,7 +55,6 @@
</div>
</div>
</container>
-
<h2>{!! trans('settings.suchmaschinen.1') !!} <small><button type="button" class="btn btn-link allUnchecker">{!! trans('settings.suchmaschinen.2') !!}</button></small></h2>
@foreach( $foki as $fokus => $sumas )
<div class="headingGroup {{ $fokus }}">
diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php
index bc833f4b2bcd8c9feb8aab2c356c0dc845a06523..a93c7760c2d217b5191aaa7b040af26c16531e9b 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -5,111 +5,111 @@
@section('navbarFocus.donate', 'class="dropdown active"')
@section('content')
-<link type="text/css" rel="stylesheet" href="/css/beitritt.css" />
-<h1>{{ trans('beitritt.heading.1') }}</h1>
-<form>
- <div class="form-group beitritt-form-group">
- <label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label>
- <input type="text" class="form-control" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="firma" class="non-bold">{{ trans('beitritt.beitritt.2') }}</label>
- <input type="text" class="form-control" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}" />
- </div>
- <div class="form-group beitritt-form-group">
- <label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label>
- <input type="text" class="form-control" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}" />
- </div>
- <div class="form-group beitritt-form-group">
- <label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label>
- <input type="text" class="form-control" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label>
- <input type="email" class="form-control" name="email" placeholder=""/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label>
- <input type="text" class="form-control" name="homepage" placeholder="http://"/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label>
- <input type="text" class="form-control" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}"/>
- </div>
- <div class="form-group beitritt-form-group">
- <label class="non-bold" for="betrag">{{ trans('beitritt.beitritt.8') }}</label>
+ <link type="text/css" rel="stylesheet" href="/css/beitritt.css" />
+ <h1>{{ trans('beitritt.heading.1') }}</h1>
+ <form>
+ <div class="form-group beitritt-form-group">
+ <label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label>
+ <input type="text" class="form-control" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="firma" class="non-bold">{{ trans('beitritt.beitritt.2') }}</label>
+ <input type="text" class="form-control" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label>
+ <input type="text" class="form-control" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label>
+ <input type="text" class="form-control" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label>
+ <input type="email" class="form-control" name="email" placeholder="">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label>
+ <input type="text" class="form-control" name="homepage" placeholder="http://">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label>
+ <input type="text" class="form-control" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label class="non-bold" for="betrag">{{ trans('beitritt.beitritt.8') }}</label>
+ <div class="row">
+ <div class="pull-left donation-amount-input">
+ <input type="text" class="form-control" name="betrag">
+ </div>
+ <div class="pull-left" style="padding-left: 10px">
+ <p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p>
+ </div>
+ </div>
+ </div>
+ <label class="non-bold">
+ {{ trans('beitritt.beitritt.10') }}
+ </label>
+ <label class="non-bold">
+ {{ trans('beitritt.beitritt.11') }}
+ </label>
<div class="row">
- <div class="pull-left donation-amount-input">
- <input type="text" class="form-control" name="betrag" />
+ <div class="pull-left">
+ <div class="radio">
+ <label>
+ <input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
+ </label>
+ </div>
</div>
<div class="pull-left" style="padding-left: 10px">
- <p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p>
+ <div class="radio">
+ <label>
+ <input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
+ </label>
+ </div>
</div>
</div>
- </div>
- <label class="non-bold">
- {{ trans('beitritt.beitritt.10') }}
- </label>
- <label class="non-bold">
- {{ trans('beitritt.beitritt.11') }}
- </label>
- <div class="row">
- <div class="pull-left">
- <div class="radio">
- <label>
- <input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
- </label>
- </div>
+ <div class="form-group beitritt-form-group">
+ <label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
+ <input type="text" class="form-control" id="ort" placeholder="">
</div>
- <div class="pull-left" style="padding-left: 10px">
- <div class="radio">
- <label>
- <input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
- </label>
- </div>
+ <br />
+ <p class="sign">---------------------------------------------------------</p>
+ <p>{{ trans('beitritt.abbuchung.1') }}</p>
+ <h3>{{ trans('beitritt.abbuchung.2') }}</h3>
+ <p>{{ trans('beitritt.abbuchung.3') }}</p>
+ <div class="form-group beitritt-form-group">
+ <label for="kontoname" class="non-bold">{{ trans('beitritt.abbuchung.4') }}</label>
+ <input type="text" class="form-control" name="kontoname" placeholder="">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label>
+ <input type="text" class="form-control" name="bankverbindung" placeholder="">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="iban" class="non-bold">{{ trans('beitritt.abbuchung.6') }}</label>
+ <input type="text" class="form-control" name="iban" placeholder="">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label>
+ <input type="text" class="form-control" name="bic" placeholder="">
+ </div>
+ <div class="form-group beitritt-form-group">
+ <label for="ort2" class="non-bold">{{ trans('beitritt.abbuchung.8') }}</label>
+ <input type="text" class="form-control" id="ort2" placeholder="">
</div>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
- <input type="text" class="form-control" id="ort" placeholder=""/>
- </div>
- <br />
- <p class="sign">---------------------------------------------------------
-{{ trans('beitritt.abbuchung.1') }}</p>
- <h3>{{ trans('beitritt.abbuchung.2') }}</h3>
- <p>{{ trans('beitritt.abbuchung.3') }} </p>
- <div class="form-group beitritt-form-group">
- <label for="kontoname" class="non-bold">{{ trans('beitritt.abbuchung.4') }}</label>
- <input type="text" class="form-control" name="kontoname" placeholder=""/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label>
- <input type="text" class="form-control" name="bankverbindung" placeholder=""/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="iban" class="non-bold">{{ trans('beitritt.abbuchung.6') }}</label>
- <input type="text" class="form-control" name="iban" placeholder=""/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label>
- <input type="text" class="form-control" name="bic" placeholder=""/>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="ort2" class="non-bold">{{ trans('beitritt.abbuchung.8') }}</label>
- <input type="text" class="form-control" id="ort2" placeholder=""/>
- </div>
- <br />
- <p class="sign">---------------------------------------------------------
-{{ trans('beitritt.abbuchung.9') }}</p>
-</form>
-<hr />
+ <br />
+ <p class="sign">---------------------------------------------------------</p>
+ <p>{{ trans('beitritt.abbuchung.9') }}</p>
+ </form>
+ <hr>
<p class="pagebreak">{{ trans('beitritt.anweisung.1') }}</p>
-<ul class="dotlist">
-<li>{{ trans('beitritt.anweisung.2') }} </li>
-<li>{{ trans('beitritt.anweisung.3') }} </li>
-<li>{{ trans('beitritt.anweisung.4') }} </li>
-</ul>
-<p>{{ trans('beitritt.anweisung.5') }}</p>
-<p>{{ trans('beitritt.anweisung.6') }} </p>
-<button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
+ <ul class="dotlist">
+ <li>{{ trans('beitritt.anweisung.2') }}</li>
+ <li>{{ trans('beitritt.anweisung.3') }}</li>
+ <li>{{ trans('beitritt.anweisung.4') }}</li>
+ </ul>
+ <p>{{ trans('beitritt.anweisung.5') }}</p>
+ <p>{{ trans('beitritt.anweisung.6') }}</p>
+ <button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
@endsection
diff --git a/resources/views/spende/danke.blade.php b/resources/views/spende/danke.blade.php
index ff5f6d500ca21b68e2279aba334fb90d79b036e2..8db0db09d56b29462f3d7820d6dab20d16b079ff 100644
--- a/resources/views/spende/danke.blade.php
+++ b/resources/views/spende/danke.blade.php
@@ -5,48 +5,48 @@
@section('navbarFocus.donate', 'class="dropdown active"')
@section('content')
-<h1>{{ trans('spenden.danke.title') }}</h1>
-<div class="col">
- <div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
- <p style="width:100%;" class="text-muted">{{ trans('spenden.danke.nachricht') }}</p>
- <h2>{{ trans('spenden.danke.kontrolle') }}</h2>
- <div>
- <table class="table table-condensed">
- <tr>
- <td>{{ trans('spenden.lastschrift.3.placeholder')}}</td>
- <td>{{ $data['name'] }}</td>
- </tr>
- <tr>
- <td>{{ trans('spenden.telefonnummer') }}</td>
- <td>{{ $data['telefon'] }}</td>
- </tr>
- <tr>
- <td>Email</td>
- <td>{{ $data['email'] }}</td>
- </tr>
- <tr>
- <td>{{ trans('spenden.iban') }}</td>
- <td>{{ $data['kontonummer'] }}</td>
- </tr>
- <tr>
- <td>{{ trans('spenden.bic') }}</td>
- <td>{{ $data['bankleitzahl'] }}</td>
- </tr>
- <tr>
- <td>{{ trans('spenden.danke.message') }}</td>
- <td>{{ $data['nachricht'] }}</td>
- </tr>
- </table>
+ <h1>{{ trans('spenden.danke.title') }}</h1>
+ <div class="col">
+ <div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
+ <p style="width:100%;" class="text-muted">{{ trans('spenden.danke.nachricht') }}</p>
+ <h2>{{ trans('spenden.danke.kontrolle') }}</h2>
+ <div>
+ <table class="table table-condensed">
+ <tr>
+ <td>{{ trans('spenden.lastschrift.3.placeholder')}}</td>
+ <td>{{ $data['name'] }}</td>
+ </tr>
+ <tr>
+ <td>{{ trans('spenden.telefonnummer') }}</td>
+ <td>{{ $data['telefon'] }}</td>
+ </tr>
+ <tr>
+ <td>Email</td>
+ <td>{{ $data['email'] }}</td>
+ </tr>
+ <tr>
+ <td>{{ trans('spenden.iban') }}</td>
+ <td>{{ $data['kontonummer'] }}</td>
+ </tr>
+ <tr>
+ <td>{{ trans('spenden.bic') }}</td>
+ <td>{{ $data['bankleitzahl'] }}</td>
+ </tr>
+ <tr>
+ <td>{{ trans('spenden.danke.message') }}</td>
+ <td>{{ $data['nachricht'] }}</td>
+ </tr>
+ </table>
+ </div>
+ <button type="button" class="btn btn-primary noprint" onclick="window.print();">{{ trans('spenden.drucken') }}</button>
</div>
- <button type="button" class="btn btn-primary noprint" onclick="window.print();">{{ trans('spenden.drucken') }}</button>
- </div>
- <div class="col-lg-6 col-md-12 col-sm-12 others noprint" id="right">
- <h2>{{ trans('spenden.about.1') }}</h2>
- <p>{!! trans('spenden.about.2') !!}</p>
- <p>{!! trans('spenden.about.3') !!}</p>
- <p>{!! trans('spenden.about.4') !!}</p>
- <p>{!! trans('spenden.about.5') !!}</p>
+ <div class="col-lg-6 col-md-12 col-sm-12 others noprint" id="right">
+ <h2>{{ trans('spenden.about.1') }}</h2>
+ <p>{!! trans('spenden.about.2') !!}</p>
+ <p>{!! trans('spenden.about.3') !!}</p>
+ <p>{!! trans('spenden.about.4') !!}</p>
+ <p>{!! trans('spenden.about.5') !!}</p>
+ </div>
+ <div class="clearfix"></div>
</div>
- <div class="clearfix"></div>
-</div>
@endsection
diff --git a/resources/views/spende/partnershops.blade.php b/resources/views/spende/partnershops.blade.php
index 1aa08bc6f35348dc1f9cc68ef58cb4ee353d16b1..9bed3dfbd569a8c6e57b6f3e9e85ec44d8cee192 100644
--- a/resources/views/spende/partnershops.blade.php
+++ b/resources/views/spende/partnershops.blade.php
@@ -5,7 +5,7 @@
@section('navbarFocus.datenschutz', 'class="active"')
@section('content')
-<h1>{{ trans('partnershops.heading1') }}</h1>
-<p>{{ trans('partnershops.absatz1') }}</p>
-<p>{!! trans('partnershops.absatz2') !!}</p>
-@endsection
\ No newline at end of file
+ <h1>{{ trans('partnershops.heading1') }}</h1>
+ <p>{{ trans('partnershops.absatz1') }}</p>
+ <p>{!! trans('partnershops.absatz2') !!}</p>
+@endsection
diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php
index 29b75df8ee2ba43e5708e3eaf892b152eea1f64c..869f96a1d68be3e6f559be9f2df8341d4bbc7499 100644
--- a/resources/views/spende/spende.blade.php
+++ b/resources/views/spende/spende.blade.php
@@ -7,77 +7,77 @@
@section('content')
<h1>{!! trans('spende.headline.1') !!}</h1>
<h2 class="subheading">{!! trans('spende.headline.2') !!}</h2>
-<div class="col">
- <div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
+ <div class="col">
+ <div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
<h3>{!! trans('spende.bankinfo.1') !!}</h3>
<p>{!! trans('spende.bankinfo.2') !!}</p>
<p class="text-muted">{!! trans('spende.bankinfo.3') !!}</p>
- <hr>
- <div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
+ <hr>
+ <div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
<h3>{!! trans('spende.paypal.1') !!}</h3>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input name="cmd" value="_xclick" type="hidden">
- <input name="business" value="wsb@suma-ev.de" type="hidden">
- <input name="item_name" value="SuMa-eV Spende" type="hidden">
- <input name="buyer_credit_promo_code" value="" type="hidden">
- <input name="buyer_credit_product_category" value="" type="hidden">
- <input name="buyer_credit_shipping_method" value="" type="hidden">
- <input name="buyer_credit_user_address_change" value="" type="hidden">
- <input name="no_shipping" value="0" type="hidden">
- <input name="no_note" value="1" type="hidden">
- <input name="currency_code" value="EUR" type="hidden">
- <input name="tax" value="0" type="hidden">
- <input name="lc" value="DE" type="hidden">
- <input name="bn" value="PP-DonationsBF" type="hidden">
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input name="cmd" value="_xclick" type="hidden">
+ <input name="business" value="wsb@suma-ev.de" type="hidden">
+ <input name="item_name" value="SuMa-eV Spende" type="hidden">
+ <input name="buyer_credit_promo_code" value="" type="hidden">
+ <input name="buyer_credit_product_category" value="" type="hidden">
+ <input name="buyer_credit_shipping_method" value="" type="hidden">
+ <input name="buyer_credit_user_address_change" value="" type="hidden">
+ <input name="no_shipping" value="0" type="hidden">
+ <input name="no_note" value="1" type="hidden">
+ <input name="currency_code" value="EUR" type="hidden">
+ <input name="tax" value="0" type="hidden">
+ <input name="lc" value="DE" type="hidden">
+ <input name="bn" value="PP-DonationsBF" type="hidden">
<input src="/img/paypalspenden.gif" name="submit" width="120px" alt="{!! trans('spende.paypal.2') !!}">
- </form>
- </div>
- <div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
+ </form>
+ </div>
+ <div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
<h3>{!! trans('spende.bitcoins.1') !!}</h3>
{!! trans('spende.bitcoins.2') !!}<br/>
- <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V</a>
- </div>
- <div class="clearfix"></div>
- <hr>
+ <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V</a>
+ </div>
+ <div class="clearfix"></div>
+ <hr>
<h3 id="lastschrift">{!! trans('spende.lastschrift.1') !!}</h3>
<p>{!! trans('spende.lastschrift.2') !!}</p>
- <form role="form" method="POST">
- <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}" />
- <div class="form-group donation-form-group">
+ <form role="form" method="POST">
+ <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}">
+ <div class="form-group donation-form-group">
<label for="Name">{!! trans('spende.lastschrift.3') !!}</label>
<input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" value="{{ old('Name') }}" />
- </div>
- <div class="form-group donation-form-group">
+ </div>
+ <div class="form-group donation-form-group">
<label for="email">{!! trans('spende.lastschrift.4') !!}</label>
- <input type="email" class="form-control" id="email" name="email" placeholder="Email" value="{{ old('email') }}" />
- </div>
- <div class="form-group donation-form-group">
+ <input type="email" class="form-control" id="email" name="email" placeholder="Email" value="{{ old('email') }}">
+ </div>
+ <div class="form-group donation-form-group">
<label for="tel">{!! trans('spende.lastschrift.5') !!}</label>
- <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx" value="{{ old('Telefon') }}" />
- </div>
- <div class="form-group donation-form-group">
+ <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx" value="{{ old('Telefon') }}">
+ </div>
+ <div class="form-group donation-form-group">
<label for="iban">{!! trans('spende.lastschrift.6') !!}</label>
- <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN" value="{{ old('Kontonummer') }}" />
- </div>
- <div class="form-group donation-form-group">
+ <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN" value="{{ old('Kontonummer') }}">
+ </div>
+ <div class="form-group donation-form-group">
<label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
- <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC" value="{{ old('Bankleitzahl') }}" />
- </div>
- <div class="form-group donation-form-group">
+ <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC" value="{{ old('Bankleitzahl') }}">
+ </div>
+ <div class="form-group donation-form-group">
<label for="msg">{!! trans('spende.lastschrift.8') !!}</label>
<textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.placeholder') !!}">{{ old('Nachricht') }}</textarea>
- </div>
+ </div>
<button type="submit" class="btn btn-default">{!! trans('spende.lastschrift.9') !!}</button>
- </form>
+ </form>
<p>{!! trans('spende.lastschrift.10') !!}</p>
- </div>
- <div class="col-lg-6 col-md-12 col-sm-12 others" id="right">
+ </div>
+ <div class="col-lg-6 col-md-12 col-sm-12 others" id="right">
<h3>{!! trans('spende.about.1') !!}</h3>
<p>{!! trans('spende.about.2') !!}</p>
<p>{!! trans('spende.about.3') !!}</p>
<p>{!! trans('spende.about.4') !!}</p>
<p>{!! trans('spende.about.5') !!}</p>
+ </div>
+ <div class="clearfix"></div>
</div>
- <div class="clearfix"></div>
-</div>
@endsection
diff --git a/resources/views/spende/spendenaufruf.blade.php b/resources/views/spende/spendenaufruf.blade.php
index 069b158d44356851e06e602b066b82de0579d244..28808b086870e09ce3f33f65498e870e77313cc6 100644
--- a/resources/views/spende/spendenaufruf.blade.php
+++ b/resources/views/spende/spendenaufruf.blade.php
@@ -5,148 +5,118 @@
@section('navbarFocus.donate', 'class="dropdown active"')
@section('content')
-<h1>MetaGer: die unabhängige, nicht-kommerzielle Internet-Suche</h1>
-<p><a href="#formular">Direkt zum Spendenformular</a></p>
-<p>
-In den vergangenen Monaten hat sich MetaGer prächtig weiter entwickelt.
-Daran haben <em>Sie</em>, die MetaGer-Nutzer, einen maßgeblichen Anteil: Ohne
-<em>Ihre</em> Hilfe gäbe es die unabhängige, nicht-kommerzielle MetaGer-Suche
-schon lange nicht mehr.
-<p>
-Für das kommende Jahr haben wir uns nun allerhand vorgenommen:
-<ul>
- <li><p>Unsere englische Version <a href="https://metager.net" target="_blank">https://metager.net</a> muss im englischen Sprachraum
- expandieren: In Großbritannien ist ein Gesetz (das "<i lang="en-UK">Investigatory Powers
- Bill</i>") beschlossen, welches <q cite="https://netzpolitik.org//2016/analyse-london-segnet-haertestes-ueberwachungsgesetz-einer-demokratie-ab/">alle bisherigen Eingriffe in Grundrechte in
- den Schatten</q> stellt - der Orwellsche Ãœberwachungsstaat mit extremer
- Vorratsdatenspeicherung ist Realität geworden
- (<a href="https://netzpolitik.org//2016/analyse-london-segnet-haertestes-ueberwachungsgesetz-einer-demokratie-ab/">https://netzpolitik.org//2016/analyse-london-segnet-haertestes-ueberwachungsgesetz-einer-demokratie-ab/</a>).
- Dagegen bietet MetaGer optimale Schutzmöglichkeiten mit unserem
- anonymisierenden Proxy, der durch den Klick auf "anonym öffnen" genutzt
- wird und durch unseren Zugang über das TOR-Netzwerk. Dieses Wissen müssen
- wir jetzt im englischen Sprachraum propagieren. Und auch hierzulande
- steht eine <a href="https://digitalcourage.de/themen/vorratsdatenspeicherung" target="_blank">Neuauflage der Vorratsdatenspeicherung</a> vor der Tür.</p></li>
- <li><p>Neben der Suche nach Texten und Bildern ist die Suche nach räumlicher,
- geographischer Information eine der häufigst genutzten Internetdienste.
- Gerade hierbei sind die Standortaufzeichnungen der globalen
- Suchmaschinenanbieter ein Überwachungsinstrument erster Güte. Um dagegen
- eine Alternative zu bieten, entwickeln wir <a href="https://maps.metager.de" target="_blank">maps.metager.de</a>. Sie
- können es jetzt bereits nutzen: eine erste Version mit Deutschland-Karten
- ist online. Aber das ist bei weitem noch nicht alles, was wir damit
- vorhaben: Routenplaner, Karten außerhalb Deutschlands usw. Hiermit wollen
- wir gegen diese Ãœberwachung der geographischen Nutzerdaten eine
- Alternative schaffen.</p></li>
- <li><p>Im August 2016 haben wir den MetaGer-Quellcode öffentlich gemacht (Sie
- finden diesen unter <a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank">https://gitlab.metager3.de/open-source/MetaGer</a>). Damit
- ist zum einen öffentlich kontrollierbar, wie wir Datenschutz und
- Privatsphäre im Detail in die Realität umsetzen. Zum anderen kann jede/r
- MetaGer mit weiterentwickeln und programmieren. Denn gegen die gewaltige
- Macht der globalen IT-Konzerne haben nur offene Systeme eine Chance, an
- denen <em>viele</em> mitmachen! Hier erwarten wir im kommenden Jahr neue Ideen und
- Features für MetaGer. Die von uns ausgelobten <a href="https://suma-awards.de" target="_blank">SUMA Awards</a> belohnen solche
- Programmierungen mit insgesamt 2.500,-EUR.</p></li>
- <li><p>Daneben steht wie immer das "<i>Tagesgeschäft</i>" mit vielen Nutzeranfragen.
- Unser Ziel ist es, dass <em>jede/r</em> die/der uns etwas fragt, eine vernünftige
- Antwort bekommt. Auch das unterscheidet uns von den globalen
- Suchmaschinenanbietern: Bei MetaGer findet jeder einzelne Mensch
- Beachtung.</p></li>
-</ul>
-<p class="lead">
-Damit wir dieses alles "<i>stemmen</i>" können, sind wir auch weiterhin auf
-Ihre Hilfe angewiesen; wir bitten um Spenden für unsere Arbeit:
-</p>
-<div class="" style="margin-top:50px">
- <h1 id="formular">Jetzt Spenden</h1>
- <div class="col-sm-6">
- <h2>{{ trans('spenden.bankinfo.1') }}</h2>
- <p style="white-space:pre;">{{ trans('spenden.bankinfo.2') }}</p>
- <p class="text-muted">{{ trans('spenden.bankinfo.3') }}</p>
- </div>
- <div class="col-sm-6">
- <div class="">
+ <h1>MetaGer: die unabhängige, nicht-kommerzielle Internet-Suche</h1>
+ <p><a href="#formular">Direkt zum Spendenformular</a></p>
+ <p>In den vergangenen Monaten hat sich MetaGer prächtig weiter entwickelt.
+ Daran haben <em>Sie</em>, die MetaGer-Nutzer, einen maßgeblichen Anteil: Ohne
+ <em>Ihre</em> Hilfe gäbe es die unabhängige, nicht-kommerzielle MetaGer-Suche
+ schon lange nicht mehr.</p>
+ <p>Für das kommende Jahr haben wir uns nun allerhand vorgenommen:</p>
+ <ul>
+ <li>
+ <p>Unsere englische Version <a href="https://metager.net" target="_blank">https://metager.net</a> muss im englischen Sprachraum expandieren: In Großbritannien ist ein Gesetz (das "<i lang="en-UK">Investigatory Powers Bill</i>") beschlossen, welches <q cite="https://netzpolitik.org//2016/analyse-london-segnet-haertestes-ueberwachungsgesetz-einer-demokratie-ab/">alle bisherigen Eingriffe in Grundrechte in den Schatten</q> stellt - der Orwellsche Überwachungsstaat mit extremer Vorratsdatenspeicherung ist Realität geworden (<a href="https://netzpolitik.org//2016/analyse-london-segnet-haertestes-ueberwachungsgesetz-einer-demokratie-ab/">https://netzpolitik.org//2016/analyse-london-segnet-haertestes-ueberwachungsgesetz-einer-demokratie-ab/</a>). Dagegen bietet MetaGer optimale Schutzmöglichkeiten mit unserem anonymisierenden Proxy, der durch den Klick auf "anonym öffnen" genutzt wird und durch unseren Zugang über das TOR-Netzwerk. Dieses Wissen müssen wir jetzt im englischen Sprachraum propagieren. Und auch hierzulande steht eine <a href="https://digitalcourage.de/themen/vorratsdatenspeicherung" target="_blank">Neuauflage der Vorratsdatenspeicherung</a> vor der Tür.</p>
+ </li>
+ <li>
+ <p>Neben der Suche nach Texten und Bildern ist die Suche nach räumlicher, geographischer Information eine der häufigst genutzten Internetdienste. Gerade hierbei sind die Standortaufzeichnungen der globalen Suchmaschinenanbieter ein Überwachungsinstrument erster Güte. Um dagegen eine Alternative zu bieten, entwickeln wir <a href="https://maps.metager.de" target="_blank">maps.metager.de</a>. Sie können es jetzt bereits nutzen: eine erste Version mit Deutschland-Karten ist online. Aber das ist bei weitem noch nicht alles, was wir damit vorhaben: Routenplaner, Karten außerhalb Deutschlands usw. Hiermit wollen wir gegen diese Überwachung der geographischen Nutzerdaten eine Alternative schaffen.</p>
+ </li>
+ <li>
+ <p>Im August 2016 haben wir den MetaGer-Quellcode öffentlich gemacht (Sie finden diesen unter <a href="https://gitlab.metager3.de/open-source/MetaGer" target="_blank">https://gitlab.metager3.de/open-source/MetaGer</a>). Damit ist zum einen öffentlich kontrollierbar, wie wir Datenschutz und Privatsphäre im Detail in die Realität umsetzen. Zum anderen kann jede/r MetaGer mit weiterentwickeln und programmieren. Denn gegen die gewaltige Macht der globalen IT-Konzerne haben nur offene Systeme eine Chance, an denen <em>viele</em> mitmachen! Hier erwarten wir im kommenden Jahr neue Ideen und Features für MetaGer. Die von uns ausgelobten <a href="https://suma-awards.de" target="_blank">SUMA Awards</a> belohnen solche Programmierungen mit insgesamt 2.500,-EUR.</p>
+ </li>
+ <li>
+ <p>Daneben steht wie immer das "<i>Tagesgeschäft</i>" mit vielen Nutzeranfragen. Unser Ziel ist es, dass <em>jede/r</em> die/der uns etwas fragt, eine vernünftige Antwort bekommt. Auch das unterscheidet uns von den globalen Suchmaschinenanbietern: Bei MetaGer findet jeder einzelne Mensch Beachtung.</p>
+ </li>
+ </ul>
+ <p class="lead">Damit wir dieses alles "<i>stemmen</i>" können, sind wir auch weiterhin auf
+ Ihre Hilfe angewiesen; wir bitten um Spenden für unsere Arbeit:</p>
+ <div class="" style="margin-top:50px">
+ <h1 id="formular">Jetzt Spenden</h1>
+ <div class="col-sm-6">
+ <h2>{{ trans('spenden.bankinfo.1') }}</h2>
+ <p style="white-space:pre;">{{ trans('spenden.bankinfo.2') }}</p>
+ <p class="text-muted">{{ trans('spenden.bankinfo.3') }}</p>
+ </div>
+ <div class="col-sm-6">
+ <div class="">
+ <div class="col-md-6">
+ <h2>{!! trans('spenden.logos.1') !!}</h2>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input name="cmd" value="_xclick" type="hidden">
+ <input name="business" value="wsb@suma-ev.de" type="hidden">
+ <input name="item_name" value="SuMa-eV Spende" type="hidden">
+ <input name="buyer_credit_promo_code" value="" type="hidden">
+ <input name="buyer_credit_product_category" value="" type="hidden">
+ <input name="buyer_credit_shipping_method" value="" type="hidden">
+ <input name="buyer_credit_user_address_change" value="" type="hidden">
+ <input name="no_shipping" value="0" type="hidden">
+ <input name="no_note" value="1" type="hidden">
+ <input name="currency_code" value="EUR" type="hidden">
+ <input name="tax" value="0" type="hidden">
+ <input name="lc" value="DE" type="hidden">
+ <input name="bn" value="PP-DonationsBF" type="hidden">
+ <input src="/img/paypalspenden.gif" name="submit" width="120px" alt="Spenden Sie mit PayPal - schnell, kostenlos und sicher!" type="image">
+ </form>
+ </div>
+ <div class="col-md-6">
+ <h2>{!! trans('spenden.logos.2') !!}</h2>
+ <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V"><img src="/img/WeAcceptBitcoin.png" style="width:120px" alt="Bitcoin"></a>
+ </div>
+ </div>
+ </div>
+ <div class="clearfix"></div>
+ <hr>
<div class="col-md-6">
- <h2>{!! trans('spenden.logos.1') !!}</h2>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input name="cmd" value="_xclick" type="hidden">
- <input name="business" value="wsb@suma-ev.de" type="hidden">
- <input name="item_name" value="SuMa-eV Spende" type="hidden">
- <input name="buyer_credit_promo_code" value="" type="hidden">
- <input name="buyer_credit_product_category" value="" type="hidden">
- <input name="buyer_credit_shipping_method" value="" type="hidden">
- <input name="buyer_credit_user_address_change" value="" type="hidden">
- <input name="no_shipping" value="0" type="hidden">
- <input name="no_note" value="1" type="hidden">
- <input name="currency_code" value="EUR" type="hidden">
- <input name="tax" value="0" type="hidden">
- <input name="lc" value="DE" type="hidden">
- <input name="bn" value="PP-DonationsBF" type="hidden">
- <input src="/img/paypalspenden.gif" name="submit" width="120px" alt="Spenden Sie mit PayPal - schnell, kostenlos und sicher!" type="image">
+ <h2 id="lastschrift">{{ trans('spenden.lastschrift.1') }}</h2>
+ <p>{{ trans('spenden.lastschrift.2') }}</p>
+ <form role="form" method="POST" action="{{ action('MailController@donation') }}">
+ <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}" />
+ <div class="form-group" style="text-align:left;">
+ <label for="Name">{{ trans('spenden.lastschrift.3') }}</label>
+ <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spenden.lastschrift.3.placeholder') }}">
+ </div>
+ <div class="form-group" style="text-align:left;">
+ <label for="email">{{ trans('spenden.lastschrift.4') }}</label>
+ <input type="email" class="form-control" id="email" name="email" placeholder="Email">
+ </div>
+ <div class="form-group" style="text-align:left;">
+ <label for="tel">{{ trans('spenden.lastschrift.5') }}</label>
+ <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
+ </div>
+ <div class="form-group" style="text-align:left;">
+ <label for="iban">{{ trans('spenden.lastschrift.6') }}</label>
+ <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
+ </div>
+ <div class="form-group" style="text-align:left;">
+ <label for="bic">{{ trans('spenden.lastschrift.7') }}</label>
+ <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
+ </div>
+ <div class="form-group" style="text-align:left;">
+ <label for="msg">{{ trans('spenden.lastschrift.8') }}</label>
+ <textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{{ trans('spenden.lastschrift.8.placeholder') }}"></textarea>
+ </div>
+ <button type="submit" class="btn btn-default">{{ trans('spenden.lastschrift.9') }}</button>
</form>
+ <p>{{ trans('spenden.lastschrift.10') }}</p>
</div>
<div class="col-md-6">
- <h2>{!! trans('spenden.logos.2') !!}</h2>
- <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V"><img src="/img/WeAcceptBitcoin.png" style="width:120px" alt="Bitcoin"></a>
+ <h2 id="mails">Aus den EMails vorheriger Spender:</h2>
+ <ul style="text-align:left; list-style-type: initial;">
+ <li>"Danke, dass es metager gibt."</li>
+ <li>"Ich (85J.) möchte für Ihre aufwändige Arbeit 200 Euro spenden. Bleibt stark gegen die Kraken."</li>
+ <li>"Ihre Arbeit halte ich für sehr wertvoll"</li>
+ <li>"Danke für Ihre gute Arbeit!"</li>
+ <li>"Super das neue MetaGer!"</li>
+ <li>"Suchmaschine wie von Ihnen entwickelt und betrieben ist sehr begrüßenswert. Meine Spende dazu"</li>
+ <li>"Als kleinen Beitrag für Ihre große und großartige Arbeit spende ich"</li>
+ <li>"Bitte buchen Sie 100,-EUR für Ihre gute Arbeit ab."</li>
+ <li>"Gerade in der heutigen Zeit braucht es eine Suchmaschine aus sicherer Hand und guten Absichten."</li>
+ <li>"Ihre Arbeit ist Spitze. Deshalb möchte Ihr Projekt fördern."</li>
+ <li>"Ich verwende schon seit Jahren Metager und danke mit einer Spende"</li>
+ <li>"MetaGer ist Spitze! Ich spende"</li>
+ <li>"Armer Rentner spendet gerne 5,00 Euro"</li>
+ <li>"Ich verwende fast nur noch die MetaGer-Suche und bin damit sehr zufrieden"</li>
+ <li>"Danke für euer Werk!"</li>
+ </ul>
</div>
- </div>
- </div>
- <div class="clearfix"></div>
- <hr />
- <div class="col-md-6">
- <h2 id="lastschrift">{{ trans('spenden.lastschrift.1') }}</h2>
- <p>{{ trans('spenden.lastschrift.2') }}</p>
- <form role="form" method="POST" action="{{ action('MailController@donation') }}">
- <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}" />
- <div class="form-group" style="text-align:left;">
- <label for="Name">{{ trans('spenden.lastschrift.3') }}</label>
- <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{{ trans('spenden.lastschrift.3.placeholder') }}">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="email">{{ trans('spenden.lastschrift.4') }}</label>
- <input type="email" class="form-control" id="email" name="email" placeholder="Email">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="tel">{{ trans('spenden.lastschrift.5') }}</label>
- <input type="tel" class="form-control" id="tel" name="Telefon" placeholder="xxxx-xxxxx">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="iban">{{ trans('spenden.lastschrift.6') }}</label>
- <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="bic">{{ trans('spenden.lastschrift.7') }}</label>
- <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC">
- </div>
- <div class="form-group" style="text-align:left;">
- <label for="msg">{{ trans('spenden.lastschrift.8') }}</label>
- <textarea class="form-control" id="msg" required="" name="Nachricht" placeholder="{{ trans('spenden.lastschrift.8.placeholder') }}"></textarea>
- </div>
- <button type="submit" class="btn btn-default">{{ trans('spenden.lastschrift.9') }}</button>
- </form>
- <p>{{ trans('spenden.lastschrift.10') }}</p>
- </div>
- <div class="col-md-6">
- <h2 id="mails">Aus den EMails vorheriger Spender:</h2>
- <ul style="text-align:left; list-style-type: initial;">
- <li>"Danke, dass es metager gibt."</li>
- <li>"Ich (85J.) möchte für Ihre aufwändige Arbeit 200 Euro spenden. Bleibt stark gegen die Kraken."</li>
- <li>"Ihre Arbeit halte ich für sehr wertvoll"</li>
- <li>"Danke für Ihre gute Arbeit!"</li>
- <li>"Super das neue MetaGer!"</li>
- <li>"Suchmaschine wie von Ihnen entwickelt und betrieben ist sehr begrüßenswert. Meine Spende dazu"</li>
- <li>"Als kleinen Beitrag für Ihre große und großartige Arbeit spende ich"</li>
- <li>"Bitte buchen Sie 100,-EUR für Ihre gute Arbeit ab."</li>
- <li>"Gerade in der heutigen Zeit braucht es eine Suchmaschine aus sicherer Hand und guten Absichten."</li>
- <li>"Ihre Arbeit ist Spitze. Deshalb möchte Ihr Projekt fördern."</li>
- <li>"Ich verwende schon seit Jahren Metager und danke mit einer Spende"</li>
- <li>"MetaGer ist Spitze! Ich spende"</li>
- <li>"Armer Rentner spendet gerne 5,00 Euro"</li>
- <li>"Ich verwende fast nur noch die MetaGer-Suche und bin damit sehr zufrieden"</li>
- <li>"Danke für euer Werk!"</li>
- </ul>
- </div>
-</div>
-<div id="left" class="col-lg-6 col-md-12 col-sm-12 others">
-
-
</div>
+ <div id="left" class="col-lg-6 col-md-12 col-sm-12 others"></div>
@endsection
diff --git a/resources/views/team/team.blade.php b/resources/views/team/team.blade.php
index 2e0b378f425f3b31401851b1bd48fa7fc0a85de8..89a238f3c9c4e493b337c49fbf9085cdb3636926 100644
--- a/resources/views/team/team.blade.php
+++ b/resources/views/team/team.blade.php
@@ -6,27 +6,33 @@
<h1>Team</h1>
<ul class="dotlist">
<li>
- <a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank" rel="noopener">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {!! trans('team.role.1') !!} -
+ <p><a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank" rel="noopener">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {!! trans('team.role.1') !!} -
<a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> -
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/pubkey-wsb") }}">Public Key</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/pubkey-wsb") }}">Public Key</a></p>
</li>
- <li>Becker, Georg - {!! trans('team.role.2') !!} -
- <a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a>
+ <li>
+ <p>Becker, Georg - {!! trans('team.role.2') !!} -
+ <a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a></p>
</li>
- <li>Branz, Manuela - {!! trans('team.role.3') !!} -
- <a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a>
+ <li>
+ <p>Branz, Manuela - {!! trans('team.role.3') !!} -
+ <a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a></p>
</li>
- <li>Pfennig, Dominik - {!! trans('team.role.4') !!} -
- <a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a>
+ <li>
+ <p>Pfennig, Dominik - {!! trans('team.role.4') !!} -
+ <a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a></p>
</li>
- <li>Höfer, Phil - {!! trans('team.role.5') !!} -
- <a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a>
+ <li>
+ <p>Höfer, Phil - {!! trans('team.role.5') !!} -
+ <a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a></p>
</li>
- <li>Hasselbring, Karl - {!! trans('team.role.6') !!} -
- <a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a>
+ <li>
+ <p>Hasselbring, Karl - {!! trans('team.role.6') !!} -
+ <a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a></p>
</li>
- <li>Riel, Carsten - {!! trans('team.role.7') !!} -
- <a href="carsten@suma-ev.de">carsten@suma-ev.de</a>
+ <li>
+ <p>Riel, Carsten - {!! trans('team.role.7') !!} -
+ <a href="carsten@suma-ev.de">carsten@suma-ev.de</a></p>
</li>
</ul>
<p>{!! trans('team.contact.1') !!}</p>
diff --git a/resources/views/tips.blade.php b/resources/views/tips.blade.php
index 56018048289733dd3d01aeb7d63cf1358031415d..85efd7c9c11fa28a994e7ac57c0b1e1cd2c49b8e 100644
--- a/resources/views/tips.blade.php
+++ b/resources/views/tips.blade.php
@@ -3,10 +3,10 @@
@section('title', $title )
@section('content')
-<h1>{!! trans('tips.title') !!}</h1>
-<ol>
- @foreach( $tips as $tip )
- <li>{!! $tip !!}</li>
- @endforeach
-</ol>
+ <h1>{!! trans('tips.title') !!}</h1>
+ <ol>
+ @foreach( $tips as $tip )
+ <li>{!! $tip !!}</li>
+ @endforeach
+ </ol>
@endsection
diff --git a/resources/views/tor.blade.php b/resources/views/tor.blade.php
index 1f7ae866147899ab0067935fb8357d4c658964e6..e7acf2e16995b70501e34225bdc1245fe960dcd9 100644
--- a/resources/views/tor.blade.php
+++ b/resources/views/tor.blade.php
@@ -3,6 +3,6 @@
@section('title', $title )
@section('content')
-<h1>MetaGer hidden service</h1>
-<a class="btn btn-primary" href="http://b7cxf4dkdsko6ah2.onion/" role="button">{{trans('tor.torbutton')}}</a>
+ <h1>MetaGer hidden service</h1>
+ <a class="btn btn-primary" href="http://b7cxf4dkdsko6ah2.onion/" role="button">{{trans('tor.torbutton')}}</a>
@endsection
diff --git a/resources/views/vendor/notifications/email-plain.blade.php b/resources/views/vendor/notifications/email-plain.blade.php
index acefa652383d18d49dc722e2e7342f28ea543590..80372d041b258c2af95a16057c69b477fd6274a1 100644
--- a/resources/views/vendor/notifications/email-plain.blade.php
+++ b/resources/views/vendor/notifications/email-plain.blade.php
@@ -1,12 +1,12 @@
<?php
-if (! empty($greeting)) {
+if (!empty($greeting)) {
echo $greeting, "\n\n";
} else {
echo $level == 'error' ? 'Whoops!' : 'Hello!', "\n\n";
}
-if (! empty($introLines)) {
+if (!empty($introLines)) {
echo implode("\n", $introLines), "\n\n";
}
@@ -14,7 +14,7 @@ if (isset($actionText)) {
echo "{$actionText}: {$actionUrl}", "\n\n";
}
-if (! empty($outroLines)) {
+if (!empty($outroLines)) {
echo implode("\n", $outroLines), "\n\n";
}
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index 1f46f377ee1c4b9a78f81ecdddfc3cbfe26e487a..6eb60010484ef669736e2d8994bc1de3feb9f0e6 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -2,17 +2,17 @@
<html>
<head>
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
- <style type="text/css" rel="stylesheet" media="all">
- /* Media Queries */
- @media only screen and (max-width: 500px) {
- .button {
- width: 100% !important;
- }
- }
- </style>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+ <style type="text/css" rel="stylesheet" media="all">
+ /* Media Queries */
+ @media only screen and (max-width: 500px) {
+ .button {
+ width: 100% !important;
+ }
+ }
+ </style>
</head>
<?php
@@ -51,8 +51,8 @@ $style = [
/* Buttons ------------------------------ */
'button' => 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px;
- background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px;
- text-align: center; text-decoration: none; -webkit-text-size-adjust: none;',
+ background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px;
+ text-align: center; text-decoration: none; -webkit-text-size-adjust: none;',
'button--green' => 'background-color: #22BC66;',
'button--red' => 'background-color: #dc4d2f;',
@@ -63,51 +63,51 @@ $style = [
<?php $fontFamily = 'font-family: Arial, \'Helvetica Neue\', Helvetica, sans-serif;';?>
<body style="{{ $style['body'] }}">
- <table width="100%" cellpadding="0" cellspacing="0">
- <tr>
- <td style="{{ $style['email-wrapper'] }}" align="center">
- <table width="100%" cellpadding="0" cellspacing="0">
- <!-- Logo -->
- <tr>
- <td style="{{ $style['email-masthead'] }}">
- <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank" rel="noopener">
- {{ config('app.name') }}
- </a>
- </td>
- </tr>
-
- <!-- Email Body -->
- <tr>
- <td style="{{ $style['email-body'] }}" width="100%">
- <table style="{{ $style['email-body_inner'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
- <tr>
- <td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
- <!-- Greeting -->
- <h1 style="{{ $style['header-1'] }}">
- @if (! empty($greeting))
- {{ $greeting }}
- @else
- @if ($level == 'error')
- Whoops!
- @else
- Hello!
- @endif
- @endif
- </h1>
-
- <!-- Intro -->
- @foreach ($introLines as $line)
- <p style="{{ $style['paragraph'] }}">
- {{ $line }}
- </p>
- @endforeach
-
- <!-- Action Button -->
- @if (isset($actionText))
- <table style="{{ $style['body_action'] }}" align="center" width="100%" cellpadding="0" cellspacing="0">
- <tr>
- <td align="center">
- <?php
+ <table width="100%" cellpadding="0" cellspacing="0">
+ <tr>
+ <td style="{{ $style['email-wrapper'] }}" align="center">
+ <table width="100%" cellpadding="0" cellspacing="0">
+ <!-- Logo -->
+ <tr>
+ <td style="{{ $style['email-masthead'] }}">
+ <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank" rel="noopener">
+ {{ config('app.name') }}
+ </a>
+ </td>
+ </tr>
+
+ <!-- Email Body -->
+ <tr>
+ <td style="{{ $style['email-body'] }}" width="100%">
+ <table style="{{ $style['email-body_inner'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
+ <tr>
+ <td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
+ <!-- Greeting -->
+ <h1 style="{{ $style['header-1'] }}">
+ @if (! empty($greeting))
+ {{ $greeting }}
+ @else
+ @if ($level == 'error')
+ Whoops!
+ @else
+ Hello!
+ @endif
+ @endif
+ </h1>
+
+ <!-- Intro -->
+ @foreach ($introLines as $line)
+ <p style="{{ $style['paragraph'] }}">
+ {{ $line }}
+ </p>
+ @endforeach
+
+ <!-- Action Button -->
+ @if (isset($actionText))
+ <table style="{{ $style['body_action'] }}" align="center" width="100%" cellpadding="0" cellspacing="0">
+ <tr>
+ <td align="center">
+ <?php
switch ($level) {
case 'success':
$actionColor = 'button--green';
@@ -120,73 +120,73 @@ switch ($level) {
}
?>
- <a href="{{ $actionUrl }}"
- style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
- class="button"
- target="_blank" rel="noopener">
- {{ $actionText }}
- </a>
- </td>
- </tr>
- </table>
- @endif
-
- <!-- Outro -->
- @foreach ($outroLines as $line)
- <p style="{{ $style['paragraph'] }}">
- {{ $line }}
- </p>
- @endforeach
-
- <!-- Salutation -->
- <p style="{{ $style['paragraph'] }}">
- Regards,<br>{{ config('app.name') }}
- </p>
-
- <!-- Sub Copy -->
- @if (isset($actionText))
- <table style="{{ $style['body_sub'] }}">
- <tr>
- <td style="{{ $fontFamily }}">
- <p style="{{ $style['paragraph-sub'] }}">
- If you’re having trouble clicking the "{{ $actionText }}" button,
- copy and paste the URL below into your web browser:
- </p>
-
- <p style="{{ $style['paragraph-sub'] }}">
- <a style="{{ $style['anchor'] }}" href="{{ $actionUrl }}" target="_blank" rel="noopener">
- {{ $actionUrl }}
- </a>
- </p>
- </td>
- </tr>
- </table>
- @endif
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <!-- Footer -->
- <tr>
- <td>
- <table style="{{ $style['email-footer'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
- <tr>
- <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
- <p style="{{ $style['paragraph-sub'] }}">
- © {{ date('Y') }}
- <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank" rel="noopener">{{ config('app.name') }}</a>.
- All rights reserved.
- </p>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+ <a href="{{ $actionUrl }}"
+ style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
+ class="button"
+ target="_blank" rel="noopener">
+ {{ $actionText }}
+ </a>
+ </td>
+ </tr>
+ </table>
+ @endif
+
+ <!-- Outro -->
+ @foreach ($outroLines as $line)
+ <p style="{{ $style['paragraph'] }}">
+ {{ $line }}
+ </p>
+ @endforeach
+
+ <!-- Salutation -->
+ <p style="{{ $style['paragraph'] }}">
+ Regards,<br>{{ config('app.name') }}
+ </p>
+
+ <!-- Sub Copy -->
+ @if (isset($actionText))
+ <table style="{{ $style['body_sub'] }}">
+ <tr>
+ <td style="{{ $fontFamily }}">
+ <p style="{{ $style['paragraph-sub'] }}">
+ If you’re having trouble clicking the "{{ $actionText }}" button,
+ copy and paste the URL below into your web browser:
+ </p>
+
+ <p style="{{ $style['paragraph-sub'] }}">
+ <a style="{{ $style['anchor'] }}" href="{{ $actionUrl }}" target="_blank" rel="noopener">
+ {{ $actionUrl }}
+ </a>
+ </p>
+ </td>
+ </tr>
+ </table>
+ @endif
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <!-- Footer -->
+ <tr>
+ <td>
+ <table style="{{ $style['email-footer'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
+ <tr>
+ <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
+ <p style="{{ $style['paragraph-sub'] }}">
+ © {{ date('Y') }}
+ <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank" rel="noopener">{{ config('app.name') }}</a>.
+ All rights reserved.
+ </p>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
</body>
</html>
diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php
index 180bd8b2c5ba57bf323348d303493c236aedd072..92e5c65296c4bd4b8eda57521fa0d40038cd08d3 100644
--- a/resources/views/vendor/pagination/bootstrap-4.blade.php
+++ b/resources/views/vendor/pagination/bootstrap-4.blade.php
@@ -1,36 +1,36 @@
@if ($paginator->hasPages())
- <ul class="pagination">
- <!-- Previous Page Link -->
- @if ($paginator->onFirstPage())
- <li class="page-item disabled"><span class="page-link">«</span></li>
- @else
- <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
- @endif
+ <ul class="pagination">
+ <!-- Previous Page Link -->
+ @if ($paginator->onFirstPage())
+ <li class="page-item disabled"><span class="page-link">«</span></li>
+ @else
+ <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
+ @endif
- <!-- Pagination Elements -->
- @foreach ($elements as $element)
- <!-- "Three Dots" Separator -->
- @if (is_string($element))
- <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li>
- @endif
+ <!-- Pagination Elements -->
+ @foreach ($elements as $element)
+ <!-- "Three Dots" Separator -->
+ @if (is_string($element))
+ <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li>
+ @endif
- <!-- Array Of Links -->
- @if (is_array($element))
- @foreach ($element as $page => $url)
- @if ($page == $paginator->currentPage())
- <li class="page-item active"><span class="page-link">{{ $page }}</span></li>
- @else
- <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
- @endif
- @endforeach
- @endif
- @endforeach
+ <!-- Array Of Links -->
+ @if (is_array($element))
+ @foreach ($element as $page => $url)
+ @if ($page == $paginator->currentPage())
+ <li class="page-item active"><span class="page-link">{{ $page }}</span></li>
+ @else
+ <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
+ @endif
+ @endforeach
+ @endif
+ @endforeach
- <!-- Next Page Link -->
- @if ($paginator->hasMorePages())
- <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
- @else
- <li class="page-item disabled"><span class="page-link">»</span></li>
- @endif
- </ul>
+ <!-- Next Page Link -->
+ @if ($paginator->hasMorePages())
+ <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
+ @else
+ <li class="page-item disabled"><span class="page-link">»</span></li>
+ @endif
+ </ul>
@endif
diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php
index 4f6dd712748a740bf6f66bf57bddc3e4f44fbb3d..ce9614720ff8d140a8f3bbcedfee3a5866283275 100644
--- a/resources/views/vendor/pagination/default.blade.php
+++ b/resources/views/vendor/pagination/default.blade.php
@@ -1,36 +1,36 @@
@if ($paginator->hasPages())
- <ul class="pagination">
- <!-- Previous Page Link -->
- @if ($paginator->onFirstPage())
- <li class="disabled"><span>«</span></li>
- @else
- <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
- @endif
+ <ul class="pagination">
+ <!-- Previous Page Link -->
+ @if ($paginator->onFirstPage())
+ <li class="disabled"><span>«</span></li>
+ @else
+ <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
+ @endif
- <!-- Pagination Elements -->
- @foreach ($elements as $element)
- <!-- "Three Dots" Separator -->
- @if (is_string($element))
- <li class="disabled"><span>{{ $element }}</span></li>
- @endif
+ <!-- Pagination Elements -->
+ @foreach ($elements as $element)
+ <!-- "Three Dots" Separator -->
+ @if (is_string($element))
+ <li class="disabled"><span>{{ $element }}</span></li>
+ @endif
- <!-- Array Of Links -->
- @if (is_array($element))
- @foreach ($element as $page => $url)
- @if ($page == $paginator->currentPage())
- <li class="active"><span>{{ $page }}</span></li>
- @else
- <li><a href="{{ $url }}">{{ $page }}</a></li>
- @endif
- @endforeach
- @endif
- @endforeach
+ <!-- Array Of Links -->
+ @if (is_array($element))
+ @foreach ($element as $page => $url)
+ @if ($page == $paginator->currentPage())
+ <li class="active"><span>{{ $page }}</span></li>
+ @else
+ <li><a href="{{ $url }}">{{ $page }}</a></li>
+ @endif
+ @endforeach
+ @endif
+ @endforeach
- <!-- Next Page Link -->
- @if ($paginator->hasMorePages())
- <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
- @else
- <li class="disabled"><span>»</span></li>
- @endif
- </ul>
+ <!-- Next Page Link -->
+ @if ($paginator->hasMorePages())
+ <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
+ @else
+ <li class="disabled"><span>»</span></li>
+ @endif
+ </ul>
@endif
diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php
index 1736cf31b8786d033cd99ff7849eb1b4219a2521..7cfcb1e8f0c1820b0bb97fd2d913ba1fc62b5ecb 100644
--- a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php
+++ b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php
@@ -1,17 +1,17 @@
@if ($paginator->hasPages())
- <ul class="pagination">
- <!-- Previous Page Link -->
- @if ($paginator->onFirstPage())
- <li class="page-item disabled"><span class="page-link">«</span></li>
- @else
- <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
- @endif
+ <ul class="pagination">
+ <!-- Previous Page Link -->
+ @if ($paginator->onFirstPage())
+ <li class="page-item disabled"><span class="page-link">«</span></li>
+ @else
+ <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
+ @endif
- <!-- Next Page Link -->
- @if ($paginator->hasMorePages())
- <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
- @else
- <li class="page-item disabled"><span class="page-link">»</span></li>
- @endif
- </ul>
+ <!-- Next Page Link -->
+ @if ($paginator->hasMorePages())
+ <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
+ @else
+ <li class="page-item disabled"><span class="page-link">»</span></li>
+ @endif
+ </ul>
@endif
diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php
index 98bef087189f4e664d936a2268630e6722fbb30e..1ac5d92d82965cc0702bf259fb85ca7e17ccf3d1 100644
--- a/resources/views/vendor/pagination/simple-default.blade.php
+++ b/resources/views/vendor/pagination/simple-default.blade.php
@@ -1,17 +1,17 @@
@if ($paginator->hasPages())
- <ul class="pagination">
- <!-- Previous Page Link -->
- @if ($paginator->onFirstPage())
- <li class="disabled"><span>«</span></li>
- @else
- <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
- @endif
+ <ul class="pagination">
+ <!-- Previous Page Link -->
+ @if ($paginator->onFirstPage())
+ <li class="disabled"><span>«</span></li>
+ @else
+ <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">«</a></li>
+ @endif
- <!-- Next Page Link -->
- @if ($paginator->hasMorePages())
- <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
- @else
- <li class="disabled"><span>»</span></li>
- @endif
- </ul>
+ <!-- Next Page Link -->
+ @if ($paginator->hasMorePages())
+ <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">»</a></li>
+ @else
+ <li class="disabled"><span>»</span></li>
+ @endif
+ </ul>
@endif
diff --git a/resources/views/widget/sitesearch.blade.php b/resources/views/widget/sitesearch.blade.php
index 8368a6084d480c5299c967f4a780669b63d25c4a..2b4ecdddebcaf3adc796c82704c9f58ab596e3a3 100644
--- a/resources/views/widget/sitesearch.blade.php
+++ b/resources/views/widget/sitesearch.blade.php
@@ -3,71 +3,78 @@
@section('title', $title )
@section('content')
-<h1>{{ trans('sitesearch.head.1') }}</h1>
-<p>{{ trans('sitesearch.head.2') }}</p>
-<h2>{{ trans('sitesearch.head.3') }}</h2>
-<form method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/sitesearch/") }}" accept-charset="UTF-8">
- <div class="input-group">
- <input type="text" class="form-control" name="site" placeholder="{{ trans('sitesearch.head.4') }}" required="" value="{{ $site }}">
- <span class="input-group-btn">
- <button class="btn btn-default" type="submit">{{ trans('sitesearch.head.5') }}</button>
- </span>
- </div>
-</form>
-@if ($site !== '')
-<h2>{{ trans('sitesearch.generated.1') }}</h2>
-<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
- <img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
- <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('sitesearch.generated.3') }}" required=""><button class="metager-searchbutton" type="submit">{{ trans('sitesearch.generated.4') }}</button>
- <input type="hidden" name="lang" value="{{ trans('sitesearch.generated.6') }}">
- <input type="hidden" name="encoding" value="utf8">
- <input type="hidden" name="site" value="{{ $site }}">
-</form>
-<h2>{{ trans('sitesearch.generated.5') }} <button id="copyButton" class="btn btn-default" type="button"><span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span> {{ trans('websearch.head.copy') }}</button></h2>
-<textarea id="codesnippet" readonly style="width:100%;height:500px"><form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8" >
- <style type="text/css" scoped>
- .metager-searchinput {
- height: 30px;
- padding: 6px 12px;
- font-size: 14px;
- line-height: 1.42857;
- color: #555;
- background-color: #FFF;
- background-image: none;
- border: 1px solid #CCC;
- border-right: 0px none;
- border-radius: 4px;
- border-top-right-radius: 0px;
- border-bottom-right-radius: 0px;
- margin:0px;
- }
- .metager-searchbutton {
- height: 30px;
- border-left: 0px none;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
- border: 1px solid #CCC;
- padding: 6px 12px;
- margin:0px;
- font-size: 14px;
- font-weight: normal;
- line-height: 1;
- white-space: nowrap;
- color: #555;
- text-align: center;
- background-color: #EEE;
- }
- .metager-logo {
- height: 30px;
- float: left;
- top:-2px;
- margin-right: 3px;
- }
- </style>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="{{ trans('sitesearch.generated.3') }}" required></input><button class="metager-searchbutton" type="submit">{{ trans('sitesearch.generated.4') }}</button><input type="hidden" name="encoding" value="utf8"></input><input type="hidden" name="site" value="{{ $site }}"></input><input type="hidden" name="lang" value="{{ trans('sitesearch.generated.6') }}"></input><input type="hidden" name="wdgt-version" value="1"></input></form>
-</textarea>
-@endif
+ <h1>{{ trans('sitesearch.head.1') }}</h1>
+ <p>{{ trans('sitesearch.head.2') }}</p>
+ <h2>{{ trans('sitesearch.head.3') }}</h2>
+ <form method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/sitesearch/") }}" accept-charset="UTF-8">
+ <div class="input-group">
+ <input type="text" class="form-control" name="site" placeholder="{{ trans('sitesearch.head.4') }}" required="" value="{{ $site }}">
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="submit">{{ trans('sitesearch.head.5') }}</button>
+ </span>
+ </div>
+ </form>
+ @if ($site !== '')
+ <h2>{{ trans('sitesearch.generated.1') }}</h2>
+ <form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
+ <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('sitesearch.generated.3') }}" required="">
+ <button class="metager-searchbutton" type="submit">{{ trans('sitesearch.generated.4') }}</button>
+ <input type="hidden" name="lang" value="{{ trans('sitesearch.generated.6') }}">
+ <input type="hidden" name="encoding" value="utf8">
+ <input type="hidden" name="site" value="{{ $site }}">
+ </form>
+ <h2>{{ trans('sitesearch.generated.5') }} <button id="copyButton" class="btn btn-default" type="button"><span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span> {{ trans('websearch.head.copy') }}</button></h2>
+ <textarea id="codesnippet" readonly style="width:100%;height:500px">
+ <form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8">
+ <style type="text/css" scoped>
+ .metager-searchinput {
+ height: 30px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin:0px;
+ }
+ .metager-searchbutton {
+ height: 30px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+ }
+ .metager-logo {
+ height: 30px;
+ float: left;
+ top:-2px;
+ margin-right: 3px;
+ }
+ </style>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
+ <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('sitesearch.generated.3') }}" required>
+ <button class="metager-searchbutton" type="submit">{{ trans('sitesearch.generated.4') }}</button>
+ <input type="hidden" name="encoding" value="utf8"></input><input type="hidden" name="site" value="{{ $site }}">
+ <input type="hidden" name="lang" value="{{ trans('sitesearch.generated.6') }}">
+ <input type="hidden" name="wdgt-version" value="1">
+ </form>;
+ </textarea>
+ @endif
@endsection
diff --git a/resources/views/widget/websearch.blade.php b/resources/views/widget/websearch.blade.php
index d0e27346d69fbc600c164951c9ac15447092ff5d..0759fa722771f8e3f8d1fe916c0f01695c3a655f 100644
--- a/resources/views/widget/websearch.blade.php
+++ b/resources/views/widget/websearch.blade.php
@@ -3,56 +3,66 @@
@section('title', $title )
@section('content')
-<h1>{{ trans('websearch.head.1') }}</h1>
-<p>{{ trans('websearch.head.2') }}</p>
-<h2>{{ trans('websearch.head.3') }}</h2>
-<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET" accept-charset="UTF-8" >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
- <img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required=""><input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}"><input type="hidden" name="encoding" value="utf8"><button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button>
-</form>
-<h2>{{ trans('websearch.head.7') }} <button id="copyButton" class="btn btn-default" type="button"><span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span> {{ trans('websearch.head.copy') }}</button></h2>
-<textarea id="codesnippet" readonly style="width:100%;height:500px"><form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8" >
- <style type="text/css" scoped>
- .metager-searchinput {
- height: 30px;
- padding: 6px 12px;
- font-size: 14px;
- line-height: 1.42857;
- color: #555;
- background-color: #FFF;
- background-image: none;
- border: 1px solid #CCC;
- border-right: 0px none;
- border-radius: 4px;
- border-top-right-radius: 0px;
- border-bottom-right-radius: 0px;
- margin:0px;
- }
- .metager-searchbutton {
- height: 30px;
- border-left: 0px none;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
- border: 1px solid #CCC;
- padding: 6px 12px;
- margin:0px;
- font-size: 14px;
- font-weight: normal;
- line-height: 1;
- white-space: nowrap;
- color: #555;
- text-align: center;
- background-color: #EEE;
- }
- .metager-logo {
- height: 30px;
- float: left;
- top:-2px;
- margin-right: 3px;
- }
- </style>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a><input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required></input><input type="hidden" name="encoding" value="utf8"><button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button><input type="hidden" name="wdgt-version" value="1"></input><input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}"></form>
-</textarea>
+ <h1>{{ trans('websearch.head.1') }}</h1>
+ <p>{{ trans('websearch.head.2') }}</p>
+ <h2>{{ trans('websearch.head.3') }}</h2>
+ <form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET" accept-charset="UTF-8" >
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
+ <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required="">
+ <input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}">
+ <input type="hidden" name="encoding" value="utf8">
+ <button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button>
+ </form>
+ <h2>{{ trans('websearch.head.7') }} <button id="copyButton" class="btn btn-default" type="button"><span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span> {{ trans('websearch.head.copy') }}</button></h2>
+ <textarea id="codesnippet" readonly style="width:100%;height:500px">
+ <form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8" >
+ <style type="text/css" scoped>
+ .metager-searchinput {
+ height: 30px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-right: 0px none;
+ border-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin:0px;
+ }
+ .metager-searchbutton {
+ height: 30px;
+ border-left: 0px none;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border: 1px solid #CCC;
+ padding: 6px 12px;
+ margin:0px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ white-space: nowrap;
+ color: #555;
+ text-align: center;
+ background-color: #EEE;
+ }
+ .metager-logo {
+ height: 30px;
+ float: left;
+ top:-2px;
+ margin-right: 3px;
+ }
+ </style>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
+ <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required>
+ <input type="hidden" name="encoding" value="utf8">
+ <button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button>
+ <input type="hidden" name="wdgt-version" value="1">
+ <input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}">
+ </form>
+ </textarea>
@endsection
diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php
index b07307cc87cc6d6773131c55bf4e8805893f454c..e9ff45093dff49b93c11ef9cf10305527fbcc485 100644
--- a/resources/views/widget/widget.blade.php
+++ b/resources/views/widget/widget.blade.php
@@ -3,8 +3,8 @@
@section('title', $title )
@section('content')
-<h1>{{ trans('widget.head') }}</h1>
-<p>{{ trans('widget.body.1') }}</p>
-<p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
-<p>{{ trans('widget.body.4') }}</p>
+ <h1>{{ trans('widget.head') }}</h1>
+ <p>{{ trans('widget.body.1') }}</p>
+ <p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
+ <p>{{ trans('widget.body.4') }}</p>
@endsection