-
+
-
+
-
-
{{ post.title }}
- {% if post.info %}
{{ post.info }}
{% endif %}
- {% if post.warning %}
{{ post.warning }}
{% endif %}
- {{ post.description | markdownify }}
-
- {% if post.platform_win %}{% endif %}
- {% if post.platform_mac %}{% endif %}
- {% if post.platform_linux %}{% endif %}
- {% if post.platform_android %}{% endif %}
- {% if post.platform_ios %}{% endif %}
- {% if post.website %}{% endif %}
-
-
More Information
+
+
{{ item.title }}
+ {% if item.info %}
{{ item.info }}
{% endif %}
+ {% if item.warning %}
{{ item.warning }}
{% endif %}
+ {{ item.description | markdownify }}
+ {% if item.downloads %}
{% for platform in item.downloads %}
+
+ {% endfor %}
+
{% endif %}
+ {% if item.website or item.article %}
{% endif %}
diff --git a/_includes/recommendation-text.html b/_includes/recommendation-text.html
new file mode 100644
index 00000000..53a30530
--- /dev/null
+++ b/_includes/recommendation-text.html
@@ -0,0 +1,15 @@
+
+ {% else %}">{% endif %} {{ item.title }}
+
+{{ item.description | markdownify }}
+{% if item.downloads or item.website or item.article %}
+ {% capture text %}
+ {% if item.article %} | More Information{% endif %}
+ {% if item.website %} | Project Website{% endif %}
+ {% if item.downloads %}
+ {% for platform in item.downloads %}
+ | {{ platform.name }}
+ {% endfor %}
+ {% endif %}
+ {% endcapture %}{{ text | remove_first: '| ' }}
+
{% endif %}
diff --git a/_includes/worth-mentioning.html b/_includes/worth-mentioning.html
deleted file mode 100644
index a6bf76c9..00000000
--- a/_includes/worth-mentioning.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-{{ post.description | markdownify }}
diff --git a/collections/_evergreen/browsers.html b/collections/_evergreen/browsers.html
index 2ebeaaaa..b364e928 100644
--- a/collections/_evergreen/browsers.html
+++ b/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 %}
Worth Mentioning
-{% 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 %}
Anti-Recommendations
-{% 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 %}