From 7afc9c3dd5b0153ed335d500c2d5b016734937aa Mon Sep 17 00:00:00 2001 From: BurungHantu1605 Date: Sun, 5 May 2019 11:39:20 +0800 Subject: [PATCH] cardv2 for browsers --- _includes/cardv2.html | 42 ++++++++--- _includes/sections/browser-addons.html | 16 ++--- .../sections/browser-recommendation.html | 71 +++++++++++-------- 3 files changed, 85 insertions(+), 44 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index c246f9a2..9efa14de 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -5,16 +5,44 @@

{{include.title}} + + {% if include.labels %} + {% assign labels = include.labels | replace:", ", "," | split:"," %} +

+ {% for label in labels %} + {% assign label_data = label | split:":" %} + {% assign color = label_data[0] %} + {% assign text = label_data[1] %} + {% assign tooltip = label_data[2] | default: "" %} + {% assign help_icon = '' %} + {{text}} {{ help_icon + }} + {% else %} + >{{text}} + {% endif %} + + {% endfor %} +
+ {% endif %} + {{include.description}} +

Website - {% if include.discussion %} - Forum + {% if include.forum %} + Forum {% endif %} {% if include.tor %} Tor {% endif %} +
+ {% if include.windows %}{% endif %} + {% if include.mac %}{% endif %} + {% if include.linux %}{% endif %} + {% if include.bsd %}{% endif %} + {% if include.web %}{% endif %} + {% if include.firefox %}{% endif %} {% if include.chrome %}{% endif %} {% if include.safari %}{% endif %} @@ -25,18 +53,16 @@ {% if include.ios %}{% endif %} {% if include.fire %}{% endif %} - {% if include.windows %}{% endif %} - {% if include.mac %}{% endif %} - {% if include.linux %}{% endif %} - {% if include.bsd %}{% endif %} - {% if include.web %}{% endif %} + {{include.icon1}} + {{include.icon2}} + {{include.icon3}} {% if include.github %}{% endif %} {% if include.gitlab %}{% endif %} {% if include.git %}{% endif %} - {{include.icon1}}{{include.icon2}}{{include.icon3}}
+

\ No newline at end of file diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index 037f7b92..6c7ac8e7 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -10,7 +10,7 @@ title="Privacy Badger: Stop Tracking" image="/assets/img/addons/privacy-badger.png" description="Privacy Badger is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse." website="https://www.eff.org/privacybadger" -discussion="https://forum.privacytools.io/t/discussion-privacy-badger/265" +forum="https://forum.privacytools.io/t/discussion-privacy-badger/265" github="https://github.com/EFForg/privacybadger" firefox="" chrome="" @@ -23,7 +23,7 @@ title="uBlock Origin: Block Ads and Trackers" image="/assets/img/addons/ublock-origin.png" description="uBlock Origin is an efficient wide-spectrum-blocker that's easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source." website="https://addons.mozilla.org/firefox/addon/ublock-origin/" -discussion="https://forum.privacytools.io/t/discussion-ublock-origin/266" +forum="https://forum.privacytools.io/t/discussion-ublock-origin/266" github="https://github.com/gorhill/uBlock/" firefox="" chrome="" @@ -38,7 +38,7 @@ title="Cookie AutoDelete: Automatically Delete Cookies" image="/assets/img/addons/cookie-autodelete.png" description="Cookie AutoDelete automatically removes cookies when they are no longer used by open browser tabs. With the cookies, lingering sessions, as well as information used to spy on you, will be expunged." website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/" -discussion="https://forum.privacytools.io/t/discussion-cookie-autodelete/267" +forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267" github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete" firefox="" chrome="" @@ -49,7 +49,7 @@ title="HTTPS Everywhere: Secure Connections" image="/assets/img/addons/https-everywhere.png" description="HTTPS Everywhere encrypts your communications with many major websites, making your browsing more secure. A collaboration between The Tor Project and the Electronic Frontier Foundation." website="https://www.eff.org/https-everywhere" -discussion="https://forum.privacytools.io/t/discussion-https-everywhere/268" +forum="https://forum.privacytools.io/t/discussion-https-everywhere/268" github="https://github.com/EFForg/https-everywhere" firefox="" chrome="" @@ -62,7 +62,7 @@ title="Decentraleyes: Block Content Delivery Networks" image="/assets/img/addons/decentraleyes.png" description="Decentraleyes emulates Content Delivery Networks locally by intercepting requests, finding the required resource and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required." website="https://decentraleyes.org/" -discussion="https://forum.privacytools.io/t/discussion-decentraleyes/269" +forum="https://forum.privacytools.io/t/discussion-decentraleyes/269" gitlab="https://git.synz.io/Synzvato/decentraleyes" firefox="" chrome="" @@ -74,7 +74,7 @@ title="Terms of Service; Didn’t Read: Be Informed" image="/assets/img/addons/tosdr.png" description="Terms of Service; Didn’t Read “I have read and agree to the Terms” is the biggest lie on the web. This addon aims to fix that by grading websites based on their Terms of Service agreements and gives short summaries." website="https://tosdr.org/" -discussion="https://forum.privacytools.io/t/discussion-decentraleyes/270" +forum="https://forum.privacytools.io/t/discussion-decentraleyes/270" github="https://github.com/tosdr/" firefox="" chrome="" @@ -93,7 +93,7 @@ title="uMatrix: Stop Cross-Site Requests" image="/assets/img/addons/umatrix.png" description="uMatrix gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics. This gives you greater and more fine-grained control over the information that you leak online." website="https://addons.mozilla.org/firefox/addon/umatrix/" -discussion="https://forum.privacytools.io/t/discussion-umatrix/271" +forum="https://forum.privacytools.io/t/discussion-umatrix/271" github="https://github.com/gorhill/uMatrix" firefox="" chrome="" @@ -105,7 +105,7 @@ title="NoScript Security Suite: Be in total control" image="/assets/img/addons/noscript.png" description="NoScript is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure." website="https://addons.mozilla.org/firefox/addon/noscript/" -discussion="https://forum.privacytools.io/t/discussion-noscript-security-suite/272" +forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272" github="https://github.com/hackademix/noscript" firefox="" chrome="" diff --git a/_includes/sections/browser-recommendation.html b/_includes/sections/browser-recommendation.html index 2dbf54df..3fbf6911 100644 --- a/_includes/sections/browser-recommendation.html +++ b/_includes/sections/browser-recommendation.html @@ -1,32 +1,47 @@

Browser Recommendation

-
+{% include cardv2.html +title="Tor Browser" +image="/assets/img/tools/Tor-Browser.png" +description="Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox, it comes with pre-installed privacy add-ons, encryption and an advanced proxy." +website="https://www.torproject.org/" +forum="https://forum.privacytools.io/t/discussion-tor-browser/278" +git="https://trac.torproject.org/projects/tor" +windows="" +mac="" +linux="" +android="" +ios="" +bsd="" +%} - {% include card.html color="success" - title="Tor Browser" - image="/assets/img/tools/Tor-Browser.png" - url="https://www.torproject.org/" - tor="http://expyuzz4wqqyqhjn.onion" - footer='OS: Windows, macOS, Linux, iOS, Android, OpenBSD.' - description="Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox, it comes with pre-installed privacy add-ons, encryption and an advanced proxy." - %} +{% include cardv2.html +title="Mozilla Firefox" +image="/assets/img/tools/Firefox.png" +description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our +recommendations: WebRTC and about:config and get the privacy add-ons.' +website="https://www.firefox.com/" +forum="https://forum.privacytools.io/t/discussion-firefox/279" +github="https://github.com/mozilla" +windows="" +mac="" +linux="" +android="" +ios="" +bsd="" +%} - {% include card.html color="primary" - title="Mozilla Firefox" - image="/assets/img/tools/Firefox.png" - url="https://www.firefox.com/" - footer="OS: Windows, macOS, Linux, Android, iOS, BSD." - description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our - recommendations: WebRTC and about:config and get the privacy add-ons.' - %} - - {% include card.html color="warning" - title="Brave" - labels="warning:experimental:Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development, it's not as good as Firefox with privacy addons." - image="/assets/img/tools/Brave.png" - url="https://www.brave.com/" - footer="OS: Windows, macOS, Linux, Android, iOS." - description="The new open source browser \"Brave\" automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium." - %} - -
+{% include cardv2.html +title="Brave Browser" +image="/assets/img/tools/Brave.png" +description="The new open source browser \"Brave\" automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium." +labels="warning:experimental:Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development, it's not as good as Firefox with privacy addons." +website="https://www.torproject.org/" +forum="https://forum.privacytools.io/t/discussion-brave-browser/280" +github="https://github.com/brave" +windows="" +mac="" +linux="" +android="" +ios="" +%} \ No newline at end of file