diff --git a/pass/lang/de/index.json b/pass/lang/de/index.json
index 04e25cddf3e957d6ee1f5e305530408a460d46cf..990c89049c97adb7b3a3eb74ef1dea256a386400 100644
--- a/pass/lang/de/index.json
+++ b/pass/lang/de/index.json
@@ -14,7 +14,7 @@
"advantages": {
"ads": {
"heading": "Ohne Werbeanzeigen",
- "description": "In der Regel werden kostenlose Dienste durch Werbeeinnahmen finanziert. MetaGer ist da keine Ausnahme. Selbst die datenschutzfreundlichste Werbeform kann Ihre Daten nicht mehr schützen, wenn auf einen Werbelink geklickt wird. Mit einem MetaGer Schlüssel ist nun aber Schluss damit:",
+ "description": "Werbeanzeigen und Datenschutz vertragen sich in der Regel nicht gut. Auch wenn wir versuchen immer das Beste für euch raus zu holen indem wir unsere Werbung so datenschutzfreundlich wie möglich gestalten, müssen doch auch <a href='{{privacylink}}' target='_blank'>Abstriche</a> gemacht werden. Die werbefreie Suche bietet eine sinvolle Alternative, sodass wir unseren hohen Ansprüchen kompromisslos gerecht werden können.",
"ads": "Werbung",
"tracking": "Tracking Links"
},
@@ -27,6 +27,10 @@
"heading": "Ohne Kompromisse",
"description": "Es gibt bei MetaGer keine Nutzeraccounts. Sie erhalten von uns einen zufällig generierten Schlüssel. Es sind keine Kontaktdaten notwendig. Mit unseren <a href=\"{{linkPaymentMethods}}\">Zahlungsmethoden</a> erfassen wir nur die für die Zahlungsabwicklung notwendigen Daten. Wenn Sie unsere <a href=\"/app\">Android App</a>, oder demnächst auch unsere Browserextension verwenden, sind Sie außerdem unter Verwendung von <a href=\"{{linktoken}}\"> anonymen Token</a> beweisbar genauso anonym unterwegs, wie ohne Schlüssel.",
"compromise": "Kompromisse"
+ },
+ "efficiency": {
+ "heading": "Effizienter Suchen",
+ "description": "Finden Sie noch schneller was Sie suchen. Wir integrieren bei Bedarf an geeigneter Stelle übersichtlich aufbereitet Deeplinks, relevante Nachrichten und Videos in den Suchergebnissen. Auch unsere Bildersuche wird mit weiteren Quellen aufgewertet."
}
},
"howitworks": {
diff --git a/pass/public/images/adfree.svg b/pass/public/images/adfree.svg
index 7e8376749923534639d0515163095364fd4778fa..8554875417e00213a6e9019922e70a633993d8a6 100644
--- a/pass/public/images/adfree.svg
+++ b/pass/public/images/adfree.svg
@@ -47,7 +47,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -79,12 +79,12 @@
id="g845"
style="stroke-width:1.5;stroke-miterlimit:5.0999999;stroke-dasharray:none">
<path
- style="fill:none;stroke:#bf4040;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.1;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;stroke:#bf4040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.0999999;stroke-dasharray:none;stroke-opacity:1"
d="m 33.915119,137.07211 c 156.700001,-29.5 0,0 156.700001,-29.5"
id="path839"
sodipodi:nodetypes="cc" />
<path
- style="fill:none;stroke:#bf4040;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.0999999;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;stroke:#bf4040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.0999999;stroke-dasharray:none;stroke-opacity:1"
d="m 33.915119,107.57211 18.590058,3.49972 138.109943,26.00028"
id="path841"
sodipodi:nodetypes="ccc" />
diff --git a/pass/public/images/adfree_en.svg b/pass/public/images/adfree_en.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a03eb359509332a805f04a9705a37a0d4e1fd128
--- /dev/null
+++ b/pass/public/images/adfree_en.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="163.1171mm"
+ height="36.803467mm"
+ viewBox="0 0 163.1171 36.803467"
+ version="1.1"
+ id="svg8"
+ sodipodi:docname="adfree_en.svg"
+ inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.959798"
+ inkscape:cx="362.5792"
+ inkscape:cy="84.148038"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ inkscape:document-rotation="0"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="2560"
+ inkscape:window-height="1361"
+ inkscape:window-x="2560"
+ inkscape:window-y="480"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-30.615119,-104.07211)">
+ <rect
+ style="fill:#0d9c0d;fill-opacity:0;stroke:#666666;stroke-width:0.753;stroke-linejoin:bevel;stroke-miterlimit:5.1;stroke-dasharray:none;stroke-opacity:1;image-rendering:auto"
+ id="rect833"
+ width="162.36372"
+ height="35.337784"
+ x="30.991806"
+ y="104.80495"
+ ry="2.7937467" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:16.9333px;line-height:1.25;font-family:sans-serif;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.264583"
+ x="54.114273"
+ y="128.52617"
+ id="text837"><tspan
+ sodipodi:role="line"
+ id="tspan835"
+ x="54.114273"
+ y="128.52617"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.9333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#666666;fill-opacity:1;stroke-width:0.264583">Advertisements</tspan></text>
+ <g
+ id="g845"
+ style="stroke-width:1.5;stroke-miterlimit:5.0999999;stroke-dasharray:none">
+ <path
+ style="fill:none;stroke:#bf4040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.0999999;stroke-dasharray:none;stroke-opacity:1"
+ d="M 33.915119,137.07211 61.428542,131.89249 190.61512,107.57211"
+ id="path839"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#bf4040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.0999999;stroke-dasharray:none;stroke-opacity:1"
+ d="m 33.915119,107.57211 18.590058,3.49972 138.109943,26.00028"
+ id="path841"
+ sodipodi:nodetypes="ccc" />
+ </g>
+ </g>
+</svg>
diff --git a/pass/public/images/efficiency.svg b/pass/public/images/efficiency.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5add3bd80f635a2375b0ffc749bf333d0b659c16
--- /dev/null
+++ b/pass/public/images/efficiency.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ fill="#000000"
+ height="800px"
+ width="800px"
+ version="1.1"
+ id="Layer_1"
+ viewBox="0 0 256 173"
+ xml:space="preserve"
+ sodipodi:docname="efficiency.svg"
+ inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
+ id="metadata16"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs14" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1356"
+ id="namedview12"
+ showgrid="false"
+ inkscape:zoom="0.89375"
+ inkscape:cx="378.12818"
+ inkscape:cy="44.645979"
+ inkscape:window-x="0"
+ inkscape:window-y="480"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" />
+<path
+ d="M128.3,56.9c15.2,0,27.4-12.2,27.4-27.4S143.5,2,128.3,2c-15.2,0-27.4,12.2-27.4,27.4C100.9,44.7,113.2,56.9,128.3,56.9z M64.6,136.3H15.3c-16,0-16.9-24.4,0.3-24.4h42.7l24.5-36.1C90,66,98.3,61.3,109.9,61.3h36.5c11.7,0,19.9,4.3,27.1,14.6l24.6,36.1 h43c17.2,0,16.2,24.4,0.6,24.4h-49.3c-3.9,0-8.6-1.4-11.4-5.6l-18.8-26.8l-0.1,67.2H94.8l-0.1-67.2l-18.8,26.8 C73.2,134.9,68.5,136.3,64.6,136.3z"
+ id="path2"
+ style="fill-opacity:1;fill:#808080" />
+<path
+ d="M31,42.5c-16,0-29,13-29,29c0,16,13,29,29,29s29-13,29-29C60,55.5,47,42.5,31,42.5z M31,94.7c-12.8,0-23.3-10.4-23.3-23.3 S18.2,48.2,31,48.2s23.3,10.4,23.3,23.3C54.1,84.3,43.7,94.7,31,94.7z M45.5,65.8c-0.5-0.9-1.7-1.5-2.9-0.8l-10.3,4.6V57.4 c0-0.7-0.2-1.2-0.7-1.7l0,0c-0.4-0.4-0.9-0.5-1.5-0.5c-1.1,0-2.3,0.8-2.3,2.2v15.9c0,0.9,0.5,1.7,1.3,2.1c0.4,0.2,0.7,0.3,1.1,0.3 c0.4,0,0.7-0.1,1.1-0.3l13.3-6.3c0.6-0.3,1-0.8,1.2-1.4C45.8,67.1,45.8,66.4,45.5,65.8L45.5,65.8z"
+ id="path4"
+ style="fill:#808080;fill-opacity:1" />
+<path
+ d="M223.5,58.1v-3.7l-3.9-0.7c-0.3-1.3-0.8-2.5-1.5-3.5l2.3-3.2l-2.6-2.6l-3.2,2.3c-1.1-0.7-2.3-1.2-3.5-1.5l-0.7-3.9h-3.7 l-0.7,3.9c-1.3,0.3-2.5,0.8-3.5,1.5l-3.2-2.3l-2.6,2.6l2.3,3.2c-0.7,1.1-1.2,2.3-1.5,3.5l-3.9,0.7v3.7l3.9,0.7 c0.3,1.3,0.8,2.5,1.5,3.5l-2.3,3.2l2.6,2.6l3.2-2.3c1.1,0.7,2.3,1.2,3.5,1.5l0.7,3.9h3.7l0.7-3.9c1.3-0.3,2.5-0.8,3.5-1.5l3.2,2.3 l2.6-2.6l-2.3-3.2c0.7-1.1,1.2-2.3,1.5-3.5L223.5,58.1z M208.5,62.2c-3.3,0-5.9-2.7-5.9-5.9s2.7-5.9,5.9-5.9c3.3,0,5.9,2.7,5.9,5.9 C214.4,59.5,211.8,62.2,208.5,62.2z M249.4,79.5l4.6-2.8l-1.9-4.7l-5.2,1.2c-1-1.4-2.2-2.7-3.7-3.7l1.2-5.2l-4.6-1.9l-2.9,4.5 c-1.7-0.3-3.5-0.3-5.2,0l-2.8-4.5l-4.7,1.9l1.2,5.2c-1.4,1-2.7,2.2-3.7,3.7l-5.2-1.2l-1.9,4.6l4.5,2.9c-0.3,1.7-0.3,3.5,0,5.2 l-4.6,2.8l1.9,4.7l5.2-1.2c1,1.4,2.2,2.7,3.7,3.7l-1.2,5.2l4.6,1.9l2.9-4.5c1.7,0.3,3.5,0.3,5.2,0l2.8,4.5l4.7-1.9l-1.2-5.2 c1.4-1,2.7-2.2,3.7-3.7l5.2,1.2l1.9-4.6l-4.5-2.9C249.7,82.9,249.7,81.2,249.4,79.5z M241.6,85.1c-1.7,4.1-6.4,6-10.5,4.3 s-6-6.4-4.3-10.5s6.4-6,10.5-4.3C241.4,76.3,243.4,81,241.6,85.1z"
+ id="path6"
+ style="fill:#808080;fill-opacity:1" />
+<g
+ id="shopping_cart">
+</g>
+<g
+ id="cross">
+</g>
+<g
+ id="leaf">
+</g>
+</svg>
diff --git a/pass/public/styles/base.less b/pass/public/styles/base.less
index 05bc44695e3224b3dfd47becc91bffd75450890f..2ce17d4e6b7a34b10f08cc85d538b41747881159 100644
--- a/pass/public/styles/base.less
+++ b/pass/public/styles/base.less
@@ -343,7 +343,8 @@ nav#primary-nav {
}
}
-button.open-chat {
+button.open-chat,
+a.contact-form {
position: fixed;
bottom: 0;
@@ -357,6 +358,19 @@ button.open-chat {
width: 1rem;
}
}
+
+a.contact-form {
+ display: none;
+ font-size: 0.9rem;
+}
+
+button.open-chat.hidden,
+button.open-chat.is-inactive {
+ & + a.contact-form {
+ display: flex;
+ }
+}
+
.zammad-chat.zammad-chat-is-open {
z-index: 99999;
}
diff --git a/pass/public/styles/index.less b/pass/public/styles/index.less
index de67af3c03dfc90d66144f398950eb7bc5231ac6..6584142d72847819621103322125365733b89fd3 100644
--- a/pass/public/styles/index.less
+++ b/pass/public/styles/index.less
@@ -264,6 +264,12 @@ html {
width: 10em;
}
}
+ #efficiency {
+ > img {
+ width: 15em;
+ filter: brightness(0.5);
+ }
+ }
}
#how-it-works {
diff --git a/pass/views/index.ejs b/pass/views/index.ejs
index eae0fdbef3ed3a3e8769a2ae8e78b1c49477a771..9a47ef62a975ebcba73d0c90fbf619df0090fbf6 100644
--- a/pass/views/index.ejs
+++ b/pass/views/index.ejs
@@ -27,10 +27,14 @@
</div>
<div id="advantages">
<div class="advantage" id="no-ads">
+ <%_ if(req.lng == "de" ) { _%>
<img src="<%= baseDir _%>/images/adfree.svg" alt="Image depicting money" />
+ <%_ }else { _%>
+ <img src="<%= baseDir _%>/images/adfree_en.svg" alt="Image depicting money" />
+ <%_ } _%>
<div class="text">
<h2><%= req.t('advantages.ads.heading') _%></h2>
- <p><%= req.t('advantages.ads.description') _%></p>
+ <p><%- req.t('advantages.ads.description', {privacylink: baseDir.replace("/keys", "") + "/datenschutz"}) _%></p>
<div class="relevant-items">
<div><%= req.t('advantages.ads.ads') _%></div>
<div><%= req.t('advantages.ads.tracking') _%></div>
@@ -61,6 +65,15 @@
</div>
</div>
</div>
+ <div class="advantage" id="efficiency">
+ <img src="<%= baseDir _%>/images/efficiency.svg" alt="Image depicting efficiency" />
+ <div class="text">
+ <h2><%= req.t('advantages.efficiency.heading') _%></h2>
+ <p>
+ <%- req.t('advantages.efficiency.description') _%>
+ </p>
+ </div>
+ </div>
</div>
<div id="how-it-works">
<h1><%= req.t('howitworks.heading') _%></h1>
diff --git a/pass/views/templates/page_footer.ejs b/pass/views/templates/page_footer.ejs
index 71074f193d21f03506434d19ffccac1991a8d15b..0e1705f6003aa4e2ed927b85b305bb9efe903c61 100644
--- a/pass/views/templates/page_footer.ejs
+++ b/pass/views/templates/page_footer.ejs
@@ -5,10 +5,15 @@
<li><a href="/impressum"><%= req.t("footer.impress", {ns: "pageheader"}) _%></a></li>
</ul>
</footer>
+
<button class="open-chat button hidden" data-title="<%= req.t("chat.title", {ns: "pageheader"})%>" data-chatid="<%= req.lng == "de"? 1 : 2 %>">
<img src="<%= baseDir %>/images/chat.svg" />
<%= req.t("chat.button", {ns: "pageheader"}) _%>
</button>
+ <a class="contact-form button" href="<%= baseDir.replace("/keys", "")%>/kontakt" target="_blank">
+ <img src="<%= baseDir %>/images/letter.svg" />
+ <%= req.t("chat.button", {ns: "pageheader"}) _%>
+ </a>
</body>
</html>
\ No newline at end of file