diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3df664f7..88e4f94f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,17 +1,19 @@ - + ## Description -Resolves: #none #### Check List -- [ ] I have read and understand [CONTRIBUTING.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md). +- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md). -- [ ] I have listed the source code for this project in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). +- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). - [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software). - [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues). -Code Repository (if applicable): +* Netlify preview for the mainly edited page: + +* Code Repository (if applicable): diff --git a/_i18n/en.yml b/_i18n/en.yml index 53aa5392..19b58cfe 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -18,6 +18,7 @@ service_descriptions: privatebin: "Encrypted Pastebin" searx: "Privacy Friendly Searx" writefreely: "Federated Blog" + blog: "Blog" provider: provider: "Provider" us_uk: "Avoid US & UK services" @@ -205,6 +206,8 @@ privacy_resources: info7_d: '"I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.' info8: "privacy.net" info8_d: "What does the US government know about you?" + info9: "The Great Cloudwall" + info9_d: "Critique and information on why to avoid Cloudflare, a big company with a huge portition of the internet behind it." tool1: "ipleak.net" tool1_d: "IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites." tool2: "The ultimate Online Privacy Test Resource List" @@ -219,12 +222,10 @@ privacy_resources: tool6_d: "Help fight to end mass surveillance. Get these tools to protect yourself and your friends." tool7: "Security First" tool7_d: "Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment." - tool8: "Block Cloudflare MiTM Attack" - tool8_d: "Firefox add-on to detect and block Cloudflare MITM attack." - tool9: "Osalt" - tool9_d: "A directory to help you find open source alternatives to proprietary tools." - tool10: "AlternativeTo" - tool10_d: "A directory to help find alternatives to other software, with the option to only show open source software." + tool8: "Osalt" + tool8_d: "A directory to help you find open source alternatives to proprietary tools." + tool9: "AlternativeTo" + tool9_d: "A directory to help find alternatives to other software, with the option to only show open source software." note: "Note: Just being open source does not make software secure!" participate: participate: "Participate with suggestions and constructive criticism" @@ -304,12 +305,13 @@ pc_os: ms_warning: "If you are currently using a operating system like Windows 10, you should pick an alternative here." qubesos_descr: "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." debian_descr: "Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project." - trisquel_descr: "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." + fedora_descr: "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." warning: "Warning" win10_nightmare: "Don't use Windows 10 - It's a privacy nightmare" worth_mentioning: "Worth Mentioning" openbsd_descr: "A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography." arch_descr: "A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement." + trisquel_descr: "Derived from Ubuntu, this 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." parabola_descr: "is a completely open source version of Arch Linux." whonix_descr: "A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a \"Workstation\" and a Tor \"Gateway.\" All communication are forced through the Tor network to accomplish this." mobile_os: 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/nav.html b/_includes/nav.html index 297f71e4..ab763507 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,85 +1,115 @@ - + + diff --git a/_includes/scripts.html b/_includes/scripts.html index cdc7e515..08fffe2a 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -2,17 +2,7 @@ - +