cardv2 for search engines

_includes/sections/search-engines.html

@@ -4,32 +4,43 @@
   <strong> If you are currently using search engines like Google, Bing or Yahoo, you should pick an alternative here. </strong>
 </div>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
-  title="searx"
+{% include cardv2.html
+title="searx - Decentral"
 image="/assets/img/provider/searx.jpg"
-  url="https://searx.me/"
+description='An <a href="https://github.com/asciimoo/searx">open source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</a>'
+website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
-  extra_button='<a class="btn btn-success mb-1" href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a>'
-  description='An <a href="https://github.com/asciimoo/searx">open source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking.'
+forum="https://forum.privacytools.io/t/discussion-searx/283"
+github="https://github.com/asciimoo/searx"
 %}
 
-  {% include card.html color="primary"
-  title="StartPage"
+{% include cardv2.html
+title="StartPage - Netherlands"
 image="/assets/img/provider/StartPage.png"
-  url="https://www.startpage.com/"
 description="Google search results, with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
+website="https://www.startpage.com/"
+forum="https://forum.privacytools.io/t/discussion-startpage/284"
 %}
 
-  {% include card.html color="warning"
-  title="DuckDuckGo"
+{% include cardv2.html
+title="DuckDuckGo - USA"
 image="/assets/img/provider/DuckDuckGo.jpg"
-  url="https://duckduckgo.com/"
+description='The search engine that doesn\'t track you. Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
+website="https://duckduckgo.com/"
 tor="http://3g2upl4pq6kufc4m.onion"
-  description='The search engine that doesn\'t track you. Some of DuckDuckGo\'s code is free software hosted at <a href="https://github.com/duckduckgo">GitHub</a>, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="../../providers/#ukusa">The company is based in the USA.</a>'
+forum="https://forum.privacytools.io/t/discussion-duckduckgo/285"
+github="https://github.com/duckduckgo"
 %}
-</div>
+
+{% include cardv2.html
+title="Qwant - France"
+image="/assets/img/provider/qwant.jpg"
+description='Qwants philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a>'
+website="https://www.qwant.com/"
+forum="https://forum.privacytools.io/t/discussion-qwant/286"
+github="https://github.com/Qwant/"
+%}
+
 
 <h3>Firefox Addon</h3>
 
@@ -43,7 +54,6 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.qwant.com/">Qwant</a> - Qwant's philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a></li>
   <li><a href="https://yacy.net/">YaCy</a> - A free software P2P search engine powered by its users.</a></li>  
   <li><a href="https://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>  
   <li><a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>