Fix templates for app data

_data/software/browsers/1_google-chrome.yml

@@ -2,3 +2,4 @@ title: Google Chrome
 type: "Anti-Recommendation"
 description: |
   Chrome is completely controlled by Google, and taps into your browsing history to track you across the web and serve you targeted advertisements. Because of Google's interest in increased ad revenues, Google Chrome offers [no privacy protections](https://www.washingtonpost.com/technology/2019/06/21/google-chrome-has-become-surveillance-software-its-time-switch/) out of the box compared to Firefox, and has taken anti-consumer steps to [block common extensions like adblockers](https://www.wired.com/story/google-chrome-ad-blockers-extensions-api/). <mark>It's best to avoid this browser at all costs.</mark>
+order: 1

_data/software/browsers/3_brave.yml

@@ -2,3 +2,4 @@ title: Brave Browser
 type: Anti-Recommendation
 description: |
   Despite being widely touted as a privacy-friendly Chromium browser, we have a number of concerns with Brave's business practices and future business model that prevents us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like PrivacyTools ([PrivacyTools PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)).
+order: 3

_data/software/browsers/firefox.yml

@@ -7,12 +7,27 @@ description: |
   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'
+downloads:
+  - name: Windows
+    icon: fab fa-windows
+    url: 'https://www.mozilla.org/firefox/windows/'
+  - name: macOS
+    icon: fab fa-apple
+    url: 'https://www.mozilla.org/firefox/mac/'
+  - name: Linux
+    icon: fab fa-linux
+    url: 'https://www.mozilla.org/firefox/linux/'
+  - name: FreeBSD
+    icon: fab fa-freebsd
+    url: 'https://www.freshports.org/www/firefox'
+  - name: Google Play
+    icon: fab fa-google-play
+    url: 'https://play.google.com/store/apps/details?id=org.mozilla.firefox'
+  - name: Android
+    icon: fab fa-android
+    url: 'https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/'
+  - name: iOS
+    icon: fab fa-app-store-ios
+    url: 'https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926'
 source: 'https://hg.mozilla.org/mozilla-central/'
 order: 1

_data/software/browsers/tor-browser.yml

@@ -7,10 +7,16 @@ description: |
 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/'
+downloads:
+  - icon: fab fa-windows
+    url: 'https://www.torproject.org/download/'
+  - icon: fab fa-apple
+    url: 'https://www.torproject.org/download/'
+  - icon: fab fa-linux
+    url: 'https://www.torproject.org/download/'
+  - icon: fab fa-android
+    url: 'https://play.google.com/store/apps/details?id=org.torproject.torbrowser'
+  - icon: fab fa-app-store-ios
+    url: 'https://guardianproject.info/fdroid/'
 source: 'https://trac.torproject.org/projects/tor'
 order: 2

_data/software/browsers/ungoogled-chromium.yml

@@ -2,3 +2,4 @@ title: Ungoogled Chromium
 type: Worth Mentioning
 description: |
   A desktop browser based on Chromium which removes all Google integrations, while adding features which seek to enhance your security, privacy, and control of your browser. However, <mark>we do not strongly recommend the use of Ungoogled Chromium for most users</mark> at this time, because of a lack of official builds and updates from the developer. We strongly believe that auto-updating apps are key for maintaining security, lest you browse the web with outdated builds of your browser which may be susceptible to any number of live exploits.
+order: 2

_includes/anti-recommendation.html

@@ -1,2 +0,0 @@
-<h3 class="h4"><a href="{{ post.url }}"><strike>{{ post.title }}</strike></a></h3>
-{{ post.description | markdownify }}

_includes/downloads.html

@@ -1,19 +0,0 @@
-{% if page.platform_win or page.platform_mac or page.platform_linux or page.platform_bsd or page.platform_android or page.platform_fdroid or page.platform_ios %}
-<h2 class="pt-3">Downloads</h2>
-
-<ul class="list-unstyled">
-{% if page.platform_win or page.platform_mac or page.platform_linux or page.platform_bsd %}
-<li><h3 class="h5 pt-3">Desktop/PC</h3><ul class="list-unstyled">
-  {% if page.platform_win %}<li><a href="{{ page.platform_win }}"><i class="fab fa-windows fa-fw"></i> Download for Windows</a></li>{% endif %}
-  {% if page.platform_mac %}<li><a href="{{ page.platform_mac }}"><i class="fab fa-app-store fa-fw"></i> Download for macOS</a></li>{% endif %}
-  {% if page.platform_linux %}<li><a href="{{ page.platform_linux }}"><i class="fab fa-linux fa-fw"></i> Download for Linux</a></li>{% endif %}
-  {% if page.platform_bsd %}<li><a href="{{ page.platform_bsd }}"><i class="fab fa-freebsd fa-fw"></i> Download for FreeBSD</a></li>{% endif %}
-</ul></li>
-{% endif %}{% if page.platform_android or page.platform_fdroid or page.platform_ios %}
-<li><h3 class="h5 pt-3">Mobile</h3><ul class="list-unstyled">
-  {% if page.platform_android %}<li><a href="{{ page.platform_android }}"><i class="fab fa-google-play fa-fw"></i> Download for Android</a></li>{% endif %}
-  {% if page.platform_fdroid %}<li><a href="{{ page.platform_fdroid }}"><i class="fab fa-android fa-fw"></i> Download for Android (F-Droid)</a></li>{% endif %}
-  {% if page.platform_ios %}<li><a href="{{ page.platform_ios }}"><i class="fab fa-app-store-ios fa-fw"></i> Download for iOS</a></li>{% endif %}
-</ul></li>{% endif %}
-</ul>
-{% endif %}

_includes/recommendation-card.html

@@ -1,23 +1,24 @@
 <div class="card my-5">
   <div class="card-body">
-    <div class="row m-3">
+    <div class="row p-3">
       <div class="col-12 col-sm-4 col-md-3 text-center">
-        <img src="{{ post.logo }}" alt="{{ post.name }} logo" class="py-5 w-75">
+        <img src="{{ item.logo }}" alt="{{ item.name }} logo" class="py-5 w-75">
       </div>
-      <div class="col-12 col-sm-8 col-md-9 text-center text-md-left">
-        <h2>{{ post.title }}</h2>
-        {% if post.info %} <p class="badge badge-info"><i class="fad fa-info-circle"></i> {{ post.info }}</p>{% endif %}
-        {% if post.warning %} <p class="badge badge-warning"><i class="fad fa-exclamation-triangle"></i> {{ post.warning }}</p>{% endif %}
-        {{ post.description | markdownify }}
-        <p>
-        {% if post.platform_win %}<a href="{{ post.platform_win }}"><i class="fab fa-windows fa-fw h2"></i></a>{% endif %}
-        {% if post.platform_mac %}<a href="{{ post.platform_mac }}"><i class="fab fa-apple fa-fw h2"></i></a>{% endif %}
-        {% if post.platform_linux %}<a href="{{ post.platform_linux }}"><i class="fab fa-linux fa-fw h2"></i></a>{% endif %}
-        {% if post.platform_android %}<a href="{{ post.platform_android }}"><i class="fab fa-google-play fa-fw h2"></i></a>{% endif %}
-        {% if post.platform_ios %}<a href="{{ post.platform_ios }}"><i class="fab fa-app-store-ios fa-fw h2"></i></a>{% endif %}
-        {% if post.website %}<a href="{{ post.website }}"><i class="far fa-globe fa-fw h2"></i></a>{% endif %}
-        </p>
-        <p><a href="{{ post.url }}" class="btn btn-primary mt-2">More Information</a></p>
+      <div class="col-12 col-sm-8 col-md-9 text-center text-md-left pb-4">
+        <h2>{{ item.title }}</h2>
+        {% if item.info %} <p class="badge badge-info"><i class="fad fa-info-circle"></i> {{ item.info }}</p>{% endif %}
+        {% if item.warning %} <p class="badge badge-warning"><i class="fad fa-exclamation-triangle"></i> {{ item.warning }}</p>{% endif %}
+        {{ item.description | markdownify }}
+        {% if item.downloads %}<p>{% for platform in item.downloads %}
+        <a href="{{ platform.url }}"><i class="{{ platform.icon }} fa-fw h2"></i></a>
+        {% endfor %}
+        </p>{% endif %}
+        {% if item.website or item.article %}<div class="pb-2">
+        {% if item.article %}<a href="{% link {{ item.article }} %}" class="btn btn-primary mt-1 mr-1"><i class="fad fa-info-circle fa-fw"></i>
+          More Information</a>{% endif %}
+        {% if item.website %}<a href="{{ item.website }}" rel="noopener" class="btn btn-secondary mt-1 mr-1"><i class="fad fa-external-link-square fa-fw"></i>
+          Visit {{ item.website | remove_first: "www." | split: "/" | slice: 2 }}</a>{% endif %}
+        </div>{% endif %}
       </div>
     </div>
   </div>

_includes/recommendation-text.html

@@ -0,0 +1,15 @@
+<h3 class="h4{% if item.type == "Anti-Recommendation" %} text-danger">
+  <span class="fad fa-times-octagon fa-fw text-danger"></span>{% else %}">{% endif %} {{ item.title }}
+</h3>
+{{ item.description | markdownify }}
+{% if item.downloads or item.website or item.article %}<p>
+  {% capture text %}
+  {% if item.article %} | <a href="{% link {{ item.article }} %}">More Information</a>{% endif %}
+  {% if item.website %} | <a href="{{ item.website }}">Project Website</a>{% endif %}
+  {% if item.downloads %}
+  {% for platform in item.downloads %}
+  | <i class="{{ platform.icon }} fa-fw"></i> <a href="{{ platform.url }}"> {{ platform.name }}</a>
+  {% endfor %}
+  {% endif %}
+  {% endcapture %}{{ text | remove_first: '| ' }}
+</p>{% endif %}

_includes/worth-mentioning.html

@@ -1,2 +0,0 @@
-<h3 class="h4"><a href="{{ post.url }}">{{ post.title }}</a></h3>
-{{ post.description | markdownify }}

collections/_evergreen/browsers.html

@@ -4,48 +4,35 @@ title: Browser Recommendations
 description: "These are our current web browser recommendations, settings, and add-ons you can use to preserve your privacy."
 ---
 
-{% assign browser = site.browsers | where:"title","Firefox" %}
-{% for post in browser %}
-{% include recommendation-card.html %}
-{% endfor %}
+{% for item_hash in site.data.software.browsers %}
+{% assign item = item_hash[1] %}
 
-{% assign browser = site.browsers | where:"title","Tor Browser" %}
-{% for post in browser %}
+{% if item.type == "Recommendation" %}
 {% include recommendation-card.html %}
+{% endif %}
+
 {% endfor %}
 
 <h2>Worth Mentioning</h2>
 
-{% assign browser = site.browsers | where:"title","Ungoogled Chromium" %}
-{% for post in browser %}
-{% include worth-mentioning.html %}
-{% endfor %}
+{% for item_hash in site.data.software.browsers %}
+{% assign item = item_hash[1] %}
 
-{% assign browser = site.browsers | where:"title","Safari" %}
-{% for post in browser %}
-{% include worth-mentioning.html %}
-{% endfor %}
+{% if item.type == "Worth Mentioning" %}
+{% include recommendation-text.html %}
+{% endif %}
 
-{% assign browser = site.browsers | where:"title","Bromite" %}
-{% for post in browser %}
-{% include worth-mentioning.html %}
 {% endfor %}
 
 <h2>Anti-Recommendations</h2>
 
-{% assign browser = site.browsers | where:"title","Google Chrome" %}
-{% for post in browser %}
-{% include anti-recommendation.html %}
-{% endfor %}
+{% for item_hash in site.data.software.browsers %}
+{% assign item = item_hash[1] %}
 
-{% assign browser = site.browsers | where:"title","Brave Browser" %}
-{% for post in browser %}
-{% include anti-recommendation.html %}
-{% endfor %}
+{% if item.type == "Anti-Recommendation" %}
+{% include recommendation-text.html %}
+{% endif %}
 
-{% assign browser = site.browsers | where:"title","Chromium" %}
-{% for post in browser %}
-{% include anti-recommendation.html %}
 {% endfor %}
 
 {% include hr.html %}