diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 3e8e590a..bc055202 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -2,88 +2,254 @@

{% if include.badges %} - {{include.title}} - {% assign badges = include.badges | replace:", ", "," | 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 %} + {{ 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 %} {% else %} - {{include.title}} + {{ include.title }} {% endif %}

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

diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html index ad374d8d..c0fbb4b1 100644 --- a/_includes/sections/file-encryption.html +++ b/_includes/sections/file-encryption.html @@ -43,5 +43,6 @@ diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index e7976ce8..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 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 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/" diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 1f1b66fc..17700fbf 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -15,6 +15,16 @@ github="https://github.com/QubesOS" tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" %} +{% include cardv2.html +title="Fedora Workstation" +image="/assets/img/tools/Fedora.png" +description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://getfedora.org/" +git="https://src.fedoraproject.org/" +%} + {% include cardv2.html title="Debian" image="/assets/img/tools/Debian.png" @@ -25,15 +35,6 @@ git="https://salsa.debian.org/qa/debsources" tor="http://sejnfjrq6szgca7v.onion" %} -{% include cardv2.html -title="Trisquel" -image="/assets/img/tools/Trisquel.png" -description='Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.' -badges="info:GNU/Linux" -website="https://trisquel.info/" -git="https://devel.trisquel.info/groups/trisquel" -%} -

Warning