diff --git a/_config.yml b/_config.yml index 562b4653..a110eece 100644 --- a/_config.yml +++ b/_config.yml @@ -58,6 +58,33 @@ collections: permalink: /providers/:name sort_by: order +defaults: + - scope: + path: "" + type: "devices" + values: + layout: recommendation + - scope: + path: "" + type: "browsers" + values: + layout: recommendation + - scope: + path: "" + type: "software" + values: + layout: recommendation + - scope: + path: "" + type: "os" + values: + layout: recommendation + - scope: + path: "" + type: "providers" + values: + layout: recommendation + # Build settings markdown: kramdown plugins: diff --git a/_includes/blog-card.html b/_includes/blog-card.html new file mode 100644 index 00000000..4bbc5b93 --- /dev/null +++ b/_includes/blog-card.html @@ -0,0 +1,11 @@ +
+ +
+
+

{{ post.title }}

+

{{ post.excerpt }} Continue Reading...

+

{{ post.author }} - {{ post.date | date: "%b %-d, %Y" }}

+
+
+ +
diff --git a/_includes/downloads.html b/_includes/downloads.html new file mode 100644 index 00000000..9184fabe --- /dev/null +++ b/_includes/downloads.html @@ -0,0 +1,15 @@ +

Downloads

+ + diff --git a/_includes/recommendation-1.html b/_includes/recommendation-1.html index 136bf383..df6ac3b1 100644 --- a/_includes/recommendation-1.html +++ b/_includes/recommendation-1.html @@ -8,7 +8,7 @@

{{ post.name }}

{% if post.info %}

{{ post.info }}

{% endif %} {% if post.warning %}

{{ post.warning }}

{% endif %} - {{ post.excerpt | markdownify }} + {{ post.short | markdownify }}

{% if post.platform_win %}{% endif %} {% if post.platform_mac %}{% endif %} diff --git a/_layouts/recommendation.html b/_layouts/recommendation.html new file mode 100644 index 00000000..554e6cb2 --- /dev/null +++ b/_layouts/recommendation.html @@ -0,0 +1,8 @@ +--- +layout: default +--- +

+

{{ page.title }}

+ {{ content }} + {% include footer.html %} +
diff --git a/blog.html b/blog.html index dc1401b8..33e77912 100644 --- a/blog.html +++ b/blog.html @@ -7,17 +7,7 @@ permalink: /blog/
{% for post in site.posts %} -
- -
-
-

{{ post.title }}

-

{{ post.excerpt }} Continue Reading...

-

{{ post.author }} - {{ post.date | date: "%b %-d, %Y" }}

-
-
- -
+ {% include blog-card.html %} {% endfor %}
diff --git a/collections/_browsers/firefox.html b/collections/_browsers/firefox.html new file mode 100644 index 00000000..af02ce9c --- /dev/null +++ b/collections/_browsers/firefox.html @@ -0,0 +1,42 @@ +--- +name: Firefox +logo: /assets/img/browsers/firefox-logo.svg +short: "**Firefox** is a fast, reliable, open-source, privacy-respecting browser developed by Mozilla. Unlike Google Chrome, Firefox won’t track your data and send it to various companies. Firefox also allows you to simply install a number of add-ons that will improve your privacy online." +website: 'https://firefox.com/' +privacy_policy: 'https://www.mozilla.org/en-US/privacy/firefox/' +platform_win: 'https://www.mozilla.org/firefox/windows/' +platform_mac: 'https://www.mozilla.org/firefox/mac/' +platform_linux: 'https://www.mozilla.org/firefox/linux/' +platform_bsd: 'https://www.freshports.org/www/firefox' +platform_android: 'https://play.google.com/store/apps/details?id=org.mozilla.firefox' +platform_fdroid: 'https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/' +platform_ios: 'https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926' +source: 'https://hg.mozilla.org/mozilla-central/' +order: 1 +--- + +
+
+ {{ page.name }} logo +
+
+

Firefox is a fast, reliable, open-source, privacy-respecting browser developed by Mozilla.

+

Unlike Google Chrome, Firefox won’t track your data and send it to various companies. Firefox also allows you to simply install a number of add-ons that will improve your privacy online.

+ Visit {{ page.website | remove:'https://' | split:'/' | first }} +
+
+ +{% include downloads.html %} + +

Source Code

+ +

Mozilla publishes the source code for the Firefox browser at {{ page.source }}.

+ +

Related Content

+ +{% assign blog1 = site.posts | where:"title","Firefox Privacy: Tips and Tricks for Better Browsing" %} +{% for post in blog1 %} +
+ {% include blog-card.html %} +
+{% endfor %} diff --git a/collections/_browsers/firefox.md b/collections/_browsers/firefox.md deleted file mode 100644 index 0b4e05bb..00000000 --- a/collections/_browsers/firefox.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: Firefox -logo: /assets/img/browsers/firefox-logo.svg -short: Firefox is fast, reliable, open-source, and respects your privacy. -website: 'https://firefox.com/' -privacy_policy: 'https://www.mozilla.org/en-US/privacy/firefox/' -platform_win: 'https://www.mozilla.org/firefox/windows/' -platform_mac: 'https://www.mozilla.org/firefox/mac/' -platform_linux: 'https://www.mozilla.org/firefox/linux/' -platform_bsd: 'https://www.freshports.org/www/firefox' -source: 'https://hg.mozilla.org/mozilla-central/' -order: 1 ---- -**Firefox** is a fast, reliable, open-source, privacy-respecting browser developed by Mozilla. - -Unlike Google Chrome, Firefox won’t track your data and send it to various companies. Firefox also allows you to simply install a number of add-ons that will improve your privacy online. diff --git a/collections/_browsers/tor-browser.md b/collections/_browsers/tor-browser.md index 398def75..0c8fc5a4 100644 --- a/collections/_browsers/tor-browser.md +++ b/collections/_browsers/tor-browser.md @@ -2,14 +2,18 @@ name: Tor Browser info: Provides Anonymity logo: /assets/img/browsers/tor-logo.svg -short: Tor Browser is your choice if you need an extra layer of anonymity. +short: "**Tor Browser** is your choice if you need an extra layer of anonymity. It’s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. [How does Tor work?](https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor)" website: 'https://www.torproject.org/' website_tor: 'http://expyuzz4wqqyqhjn.onion/' privacy_policy: 'https://support.torproject.org/tbb/tbb-3/' platform_win: 'https://www.torproject.org/download/' platform_mac: 'https://www.torproject.org/download/' platform_linux: 'https://www.torproject.org/download/' +platform_android: 'https://play.google.com/store/apps/details?id=org.torproject.torbrowser' +platform_fdroid: 'https://guardianproject.info/fdroid/' source: 'https://trac.torproject.org/projects/tor' order: 2 --- Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. [How does Tor work?](https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor) + +{% include downloads.html %} diff --git a/collections/_evergreen/browsers.html b/collections/_evergreen/browsers.html index 15a32edf..e89ae242 100644 --- a/collections/_evergreen/browsers.html +++ b/collections/_evergreen/browsers.html @@ -4,7 +4,7 @@ title: Browser Recommendations ---

- These are our current web browser recommendations and some tweaks you can use to preserve your privacy. + These are our current web browser recommendations, settings, and add-ons you can use to preserve your privacy.

{% assign firefox = site.browsers | where:"name","Firefox" %} diff --git a/index.html b/index.html index 283e58f9..495d0727 100644 --- a/index.html +++ b/index.html @@ -127,17 +127,7 @@ layout: default
{% for post in site.posts limit:2 %} -
- -
-
-

{{ post.title }}

-

{{ post.excerpt }} Continue Reading...

-

{{ post.author }} - {{ post.date | date: "%b %-d, %Y" }}

-
-
- -
+ {% include blog-card.html %} {% endfor %}