From 23487106c2335f8753c0941dfcc42a15a63d2980 Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sat, 17 Aug 2019 10:44:02 -0700 Subject: [PATCH 1/5] Update Wire's metadata warning for clarity --- _includes/sections/instant-messenger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index e7976ce8..17909486 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -23,7 +23,7 @@ ios="" title="Wire" image="/assets/img/tools/wire.png" description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available." -labels="warning:Warning:Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted).,success:VoIP" +labels="warning:Warning:Wire stores some plaintext metadata about its users on their servers. This data includes users' lists of connections and conversations.,success:VoIP" website="https://wire.com/" forum="https://forum.privacytools.io/t/discussion-wire/750" github="https://github.com/wireapp/" -- 2.47.2 From 541631cab26c7fa313da95e0222b81c8f05b0c23 Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sat, 17 Aug 2019 11:04:15 -0700 Subject: [PATCH 2/5] Update cardv2 to support commas in labels --- _includes/cardv2.html | 2 +- _includes/sections/instant-messenger.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 3e8e590a..fa9b2d2e 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -27,7 +27,7 @@ {{include.title}} {{include.description}} {% if include.labels %} - {% assign labels = include.labels | replace:", ", "," | split:"," %} + {% assign labels = include.labels | split:";" %} {% for label in labels %} {% assign label_data = label | split:":" %} {% assign color = label_data[0] %} diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 17909486..622b1a55 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -23,7 +23,7 @@ ios="" title="Wire" image="/assets/img/tools/wire.png" description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available." -labels="warning:Warning:Wire stores some plaintext metadata about its users on their servers. This data includes users' lists of connections and conversations.,success:VoIP" +labels="warning:Warning:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.;success:VoIP" website="https://wire.com/" forum="https://forum.privacytools.io/t/discussion-wire/750" github="https://github.com/wireapp/" -- 2.47.2 From 84f09ba3df1dfce43ec25d67f6b42e0cb15b4ce9 Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sat, 17 Aug 2019 11:10:20 -0700 Subject: [PATCH 3/5] Update label delimiter to | --- _includes/cardv2.html | 2 +- _includes/sections/instant-messenger.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index fa9b2d2e..ba99a42c 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -27,7 +27,7 @@ {{include.title}} {{include.description}} {% if include.labels %} - {% assign labels = include.labels | split:";" %} + {% assign labels = include.labels | split:"|" %} {% for label in labels %} {% assign label_data = label | split:":" %} {% assign color = label_data[0] %} diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 622b1a55..cca3e64f 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -23,7 +23,7 @@ ios="" title="Wire" image="/assets/img/tools/wire.png" description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available." -labels="warning:Warning:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.;success:VoIP" +labels="warning:Warning:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP" website="https://wire.com/" forum="https://forum.privacytools.io/t/discussion-wire/750" github="https://github.com/wireapp/" -- 2.47.2 From d43f38c9ce01ba50073bc18febb39a7b1c140977 Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sat, 17 Aug 2019 16:38:40 -0700 Subject: [PATCH 4/5] Update label delimiter to | for badges --- _includes/cardv2.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index ba99a42c..b0f37d80 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -3,7 +3,7 @@

{% if include.badges %} {{include.title}} - {% assign badges = include.badges | replace:", ", "," | split:"," %} + {% assign badges = include.badges | split:"|" %} {% for badge in badges %} {% assign badge_data = badge | split:":" %} {% assign color = badge_data[0] %} -- 2.47.2 From 74281acc0d3121b7f4f8ed9390b3d4284ee590c0 Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sat, 17 Aug 2019 16:53:40 -0700 Subject: [PATCH 5/5] Update cardv2.html formatting --- _includes/cardv2.html | 268 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 217 insertions(+), 51 deletions(-) diff --git a/_includes/cardv2.html b/_includes/cardv2.html index b0f37d80..bc055202 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -2,88 +2,254 @@

{% if include.badges %} - {{include.title}} + {{ include.title }} {% assign badges = include.badges | split:"|" %} - {% for badge in badges %} - {% assign badge_data = badge | split:":" %} - {% assign color = badge_data[0] %} - {% assign text = badge_data[1] %} - {% assign tooltip = badge_data[2] | default: false %} - {% assign help_icon = '' %} - {{text}} {{ help_icon - }} - {% else %} - >{{text}} - {% endif %} - - {% endfor %} + {% for badge in badges %} + {% assign badge_data = badge | split:":" %} + {% assign color = badge_data[0] %} + {% assign text = badge_data[1] %} + {% assign tooltip = badge_data[2] | default: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon }} + {% else %} + > {{text}} + {% endif %} + + {% endfor %} {% else %} - {{include.title}} + {{ include.title }} {% endif %}

- {{include.title}} - {{include.description}} + {{include.title}} + {{ include.description }} {% if include.labels %} {% assign labels = include.labels | 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: false %} - {% assign help_icon = '' %} - {{text}} {{ help_icon - }} - {% else %} - >{{text}} - {% endif %} - - {% endfor %} + {% 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: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon }} + {% else %} + > {{text}} + {% endif %} + + {% endfor %} {% endif %}

- Website + + + Website + {% if include.forum %} - Forum + + + Forum + {% endif %} {% if include.tor %} - Tor + + Tor + {% endif %}
- {% if include.windows %}{% if include.windows != "" %}{% else %}{% endif %}{% endif %} - {% if include.mac %}{% if include.mac != "" %}{% else %}{% endif %}{% endif %} - {% if include.linux %}{% if include.linux != "" %}{% else %}{% endif %}{% endif %} - {% if include.bsd %}{% if include.bsd != "" %}{% else %}{% endif %}{% endif %} + {% if include.windows %} + {% if include.windows != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.firefox %}{% if include.firefox != "" %}{% else %}{% endif %}{% endif %} - {% if include.chrome %}{% if include.chrome != "" %}{% else %}{% endif %}{% endif %} - {% if include.safari %}{% if include.safari != "" %}{% else %}{% endif %}{% endif %} - {% if include.opera %}{% if include.opera != "" %}{% else %}{% endif %}{% endif %} - {% if include.edge %}{% if include.edge != "" %}{% else %}{% endif %}{% endif %} + {% if include.mac %} + {% if include.mac != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.android %}{% if include.android != "" %}{% else %}{% endif %}{% endif %} - {% if include.ios %}{% if include.ios != "" %}{% else %}{% endif %}{% endif %} - {% if include.fire %}{% if include.fire != "" %}{% else %}{% endif %}{% endif %} + {% if include.linux %} + {% if include.linux != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.web %}{% if include.web != "" %}{% else %}{% endif %}{% endif %} + {% if include.bsd %} + {% if include.bsd != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.firefox %} + {% if include.firefox != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.chrome %} + {% if include.chrome != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.safari %} + {% if include.safari != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.opera %} + {% if include.opera != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.edge %} + {% if include.edge != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.android %} + {% if include.android != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.ios %} + {% if include.ios != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.fire %} + {% if include.fire != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.web %} + {% if include.web != "" %} + + + + {% else %} + + {% endif %} + {% endif %} {{include.icon1}} {{include.icon2}} {{include.icon3}} - {% if include.github %}{% endif %} - {% if include.gitlab %}{% endif %} - {% if include.git %}{% endif %} - {% if include.source %}{% endif %} + {% if include.github %} + + + + {% endif %} + + {% if include.gitlab %} + + + + {% endif %} + + {% if include.git %} + + + + {% endif %} + + {% if include.source %} + + + + {% endif %}
-

-- 2.47.2