Update label syntax (#1914)

_includes/badge.html

@@ -0,0 +1,20 @@
+{% if include.link %}
+<a
+  href="{{ link }}" class="badge badge-{{ include.color | default: "info" }}"
+  {% if include.tooltip %}
+  data-toggle="tooltip"
+  title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
+{% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
+</a>
+{% else %}
+<span
+  class="badge badge-{{ include.color | default: "info" }}"
+  {% if include.tooltip %}
+    data-toggle="tooltip"
+    title="{{ include.tooltip }}"
+    > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
+  {% else %}
+    > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}
+  {% endif %}
+</span>
+{% endif %}

_includes/cardv2.html

@@ -41,23 +41,35 @@
       {{ include.description }}
       {% if include.labels %}
       {% assign labels = include.labels | split:"|" %}
-        {% for label in labels %}
+      {% for label in labels %}
-          {% assign label_data = label | split:":" %}
+        {% assign label_data = label | split:"::" %}
-          {% assign color = label_data[0] %}
+          {% for label_attr in label_data %}
-          {% assign text = label_data[1] %}
+            {% assign attr = label_attr | split:"==" %}
-          {% assign tooltip = label_data[2] | default: false %}
+            {% if attr[0] == "color" %}
-          {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+              {% assign color = attr[1] %}
-          <span
+            {% elsif attr[0] == "link" %}
-            class="badge badge-{{color}}"
+              {% assign link = attr[1] %}
-            {% if tooltip %}
+            {% elsif attr[0] == "text" %}
-              data-toggle="tooltip"
+              {% assign text = attr[1] %}
-              title="{{ tooltip }}"
+            {% elsif attr[0] == "icon" %}
-              > {{text}} {{ help_icon }}
+              {% assign icon = attr[1] %}
-            {% else %}
+            {% elsif attr[0] == "tooltip" %}
-              > {{text}}
+              {% assign tooltip = attr[1] %}
             {% endif %}
-          </span>
+          {% endfor %}
-        {% endfor %}
+        {% include badge.html
+          link=link
+          color=color
+          text=text
+          icon=icon
+          tooltip=tooltip
+        %}
+        {% assign color = nil %}
+        {% assign link = nil %}
+        {% assign text = nil %}
+        {% assign icon = nil %}
+        {% assign tooltip = nil %}
+      {% endfor %}
       {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">

_includes/sections/cloud-storage.html

@@ -9,7 +9,7 @@
   title="Keybase KBFS"
   image="/assets/img/svg/3rd-party/keybase.svg"
   description='Keybase provides 250GB of E2EE cloud storage for free. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase allows you to share files with any Keybase user, or social media user through the use of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>". They currently do not offer additional space above your quota.'
-  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server."
   website="https://book.keybase.io/docs/files"
   privacy-policy="https://keybase.io/docs/privacypolicy"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
@@ -27,7 +27,7 @@
   title="Nextcloud - Choose your hoster"
   image="/assets/img/svg/3rd-party/nextcloud.svg"
   description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-  labels="warning:<a href=//github.com/nextcloud/end_to_end_encryption/issues/111>Experimental E2EE</a>:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
+  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
   website="https://nextcloud.com/"
   privacy-policy="https://nextcloud.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
@@ -47,6 +47,6 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</li>
   <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
 </ul>

_includes/sections/file-sharing.html

@@ -3,7 +3,7 @@
 {% include cardv2.html
 title="Firefox Send"
 image="/assets/img/svg/3rd-party/firefox_send.svg"
-labels="warning:<a href=//send.firefox.com/legal>Warning</a>: IP addresses are retained in logs for 90 days."
+labels="color==warning::link==https://send.firefox.com/legal::text==Warning::tooltip==IP addresses are retained in logs for 90 days."
 description="Firefox Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether you would like to add a password for an extra layer of security."
 website="https://send.firefox.com/"
 privacy-policy="https://send.firefox.com/legal"

_includes/sections/instant-messenger.html

@@ -24,7 +24,7 @@
   title="Signal"
   image="/assets/img/svg/3rd-party/signal.svg"
   description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been <a href="https://eprint.iacr.org/2016/1013.pdf">indepedently audited (PDF)</a>'
-  labels="warning:<a>Requires phone number</a>:Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|success:VoIP"
+  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==VoIP"
   website="https://signal.org/"
   privacy-policy="https://signal.org/legal/"
   forum="https://forum.privacytools.io/t/discussion-signal/664"
@@ -42,7 +42,7 @@
   title="Keybase"
   image="/assets/img/svg/3rd-party/keybase.svg"
   description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts though the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="warning:<a href=//github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
+  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server."
   website="https://keybase.io/"
   privacy-policy="https://keybase.io/docs/privacypolicy"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
@@ -94,8 +94,8 @@
   include cardv2.html
   title="Riot"
   image="/assets/img/svg/3rd-party/riotim.svg"
-  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.<br />'
+  description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.'
-  labels="success:VoIP"
+  labels="text==VoIP"
   website="https://about.riot.im/"
   privacy-policy="https://riot.im/privacy"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
@@ -166,7 +166,7 @@
   title="Jami"
   image="/assets/img/svg/3rd-party/jami.svg"
   description="Encrypted instant messaging and video calling software. All communications are E2EE using <a href=//jami.net/improving-performance-and-security-with-tls-1-3/>TLS 1.3</a> and never stored elsewhere than on user's devices, even when <a href=//jami.net/why-is-jami-truly-distributed/>TURN servers are used</a>."
-  labels="warning:<a href=//git.jami.net/savoirfairelinux/ring-project/issues/765>Warning</a>:This software is partially centralized but can be self-hosted.|success:VoIP"
+  labels="color==warning::link==https://git.jami.net/savoirfairelinux/ring-project/issues/765::text==Warning::tooltip==This software is partially centralized but can be self-hosted.|text==VoIP"
   website="https://jami.net/"
   privacy-policy="https://jami.net/privacy-policy/"
   forum="https://forum.privacytools.io/t/discussion-jami/2116"

_includes/sections/live-operating-systems.html

@@ -5,7 +5,7 @@ title="Tails"
 image="/assets/img/svg/3rd-party/tails.svg"
 description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
 badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://tails.boum.org/"
 git="https://git-tails.immerda.ch/tails/"
 %}

_includes/sections/mobile-operating-systems.html

@@ -10,7 +10,7 @@ image="/assets/img/svg/3rd-party/grapheneos.svg"
 image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg"
 description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
 badges="info:AOSP"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://grapheneos.org/"
 github="https://github.com/GrapheneOS/"
 %}
@@ -20,7 +20,7 @@ title="LineageOS"
 image="/assets/img/svg/3rd-party/lineageos.svg"
 description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.'
 badges="info:AOSP"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://www.lineageos.org/"
 privacy-policy="https://www.lineageos.org/legal/"
 github="https://github.com/LineageOS"
@@ -31,7 +31,7 @@ title="Ubuntu Touch"
 image="/assets/img/svg/3rd-party/ubuntu.svg"
 description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
 badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://ubuntu-touch.io/"
 privacy-policy="https://ubports.com/privacy"
 github="https://github.com/ubports"

_includes/sections/operating-systems.html

@@ -9,7 +9,7 @@ title="Qubes OS"
 image="/assets/img/svg/3rd-party/qubes_os.svg"
 description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
 badges="info:Xen"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://www.qubes-os.org/"
 privacy-policy="https://www.qubes-os.org/privacy/"
 github="https://github.com/QubesOS"
@@ -21,7 +21,7 @@ title="Fedora Workstation"
 image="/assets/img/svg/3rd-party/fedora.svg"
 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."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://getfedora.org/"
 privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy"
 git="https://src.fedoraproject.org/"

_includes/sections/router-firmware.html

@@ -6,7 +6,7 @@ image="/assets/img/svg/3rd-party/openwrt.svg"
 image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg"
 description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
 badges="info:Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://openwrt.org/"
 git="https://git.openwrt.org/"
 %}
@@ -17,7 +17,7 @@ image="/assets/img/svg/3rd-party/pfsense.svg"
 image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg"
 description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
 badges="info:BSD"
-labels="warning:contrib:This software may depend on or recommend non-free software."
+labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software."
 website="https://www.pfsense.org/"
 privacy-policy="https://www.pfsense.org/privacy.html"
 github="https://github.com/pfsense/"

_includes/sections/search-engines.html

@@ -42,7 +42,7 @@ github="https://github.com/Qwant/"
 title="Startpage.com"
 image="/assets/img/svg/3rd-party/startpage.svg"
 description='Startpage.com is a search engine that provides Google search results with complete privacy protection. <span class="flag-icon flag-icon-nl"></span> Startpage BV is a Netherlands-based company that has been dedicated to privacy-respecting search since 2006.'
-labels="warning:<a href=//support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1>Warning</a>:Startpage.com was recently acquired by United States-based System1."
+labels="color==warning::link==https://support.startpage.com/index.php?/Knowledgebase/Article/View/1277/0/startpage-ceo-robert-beens-discusses-the-investment-from-privacy-one--system1::text==Warning::tooltip==Startpage.com was recently acquired by United States-based System1."
 website="https://www.startpage.com/"
 privacy-policy="https://www.startpage.com/en/privacy-policy/"
 forum="https://forum.privacytools.io/t/delisted-discussion-startpage/284"

_includes/sections/selfhosted-cloud.html

@@ -8,7 +8,7 @@
   title="Nextcloud"
   image="/assets/img/svg/3rd-party/nextcloud.svg"
   description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the <a href=\"/providers/hosting\">server provider</a> you choose."
-  labels="warning:<a href=//github.com/nextcloud/end_to_end_encryption/issues/111>Experimental E2EE</a>:Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
+  labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Experimental E2EE::tooltip==Regarding E2EE their description states 'End-to-end encryption is still in alpha state, don't use this in production and only with test data!'."
   website="https://nextcloud.com/"
   privacy-policy="https://nextcloud.com/privacy/"
   forum="https://forum.privacytools.io/t/discussion-nextcloud/287"

_includes/sections/teamchat.html

@@ -13,7 +13,7 @@
   title="Riot"
   image="/assets/img/svg/3rd-party/riotim.svg"
   description='<a href="//about.riot.im">Riot.im</a> is the reference client for the <a href="//matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="//matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.<br />'
-  labels="success:VoIP"
+  labels="text==VoIP"
   website="https://about.riot.im/"
   privacy-policy="https://riot.im/privacy"
   forum="https://forum.privacytools.io/t/discussion-riot-im/665/"
@@ -32,7 +32,7 @@
   title="Rocket.chat"
   image="/assets/img/svg/3rd-party/rocketchat.svg"
   description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
-  labels="warning:<a href=//rocket.chat/docs/user-guides/end-to-end-encryption/>Experimental E2EE</a>:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes.|success:VoIP"
+  labels="color==warning::link==https://rocket.chat/docs/user-guides/end-to-end-encryption/::text==Experimental E2EE::tooltip==Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. Federation was also added afterwards, potentially causing room for mistakes.|text==VoIP"
   website="https://rocket.chat/"
   privacy-policy="https://rocket.chat/privacy"
   forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
@@ -50,7 +50,7 @@
   title="Keybase"
   image="/assets/img/svg/3rd-party/keybase.svg"
   description='Keybase provides a hosted team chat with E2EE. Its protocol has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. Keybase can help you prove you own social media accounts through the use of cryptographic signing of "<a href="https://en.wikipedia.org/wiki/Keybase#Identity_proofs">identity proofs</a>".'
-  labels="warning:<a href=github.com/keybase/client/issues/6374>Warning</a>:This software relies on a closed-source central server."
+  labels="color==warning::link==https://github.com/keybase/client/issues/6374::text==Warning::tooltip==This software relies on a closed-source central server."
   website="https://keybase.io/"
   privacy-policy="https://keybase.io/docs/privacypolicy"
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"