From 64d59ba2e614b62b0aeb5f9d47456ce2c4a33f99 Mon Sep 17 00:00:00 2001 From: BurungHantu1605 Date: Mon, 1 Apr 2019 11:09:05 +0800 Subject: [PATCH 01/19] #701 --- _includes/sections/search-engines.html | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index fbb219f3..b079d91a 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -43,13 +43,8 @@

Worth Mentioning

-- 2.47.2 From e58c2b964984a068ad33bfb10c4360e41c84cf7a Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 31 Mar 2019 23:00:26 -0500 Subject: [PATCH 02/19] Split sections into pages Preliminary work --- _includes/nav.html | 84 ++++++++++++++++++++-------------------------- browsers.html | 17 ++++++++++ index.html | 76 ++++------------------------------------- os.html | 19 +++++++++++ providers.html | 27 +++++++++++++++ software.html | 35 +++++++++++++++++++ 6 files changed, 141 insertions(+), 117 deletions(-) create mode 100644 browsers.html create mode 100644 os.html create mode 100644 providers.html create mode 100644 software.html diff --git a/_includes/nav.html b/_includes/nav.html index b588ebe8..6b18f689 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -6,12 +6,8 @@ diff --git a/browsers.html b/browsers.html new file mode 100644 index 00000000..c1d44a64 --- /dev/null +++ b/browsers.html @@ -0,0 +1,17 @@ +--- +layout: default +--- + +
+ +{% include sections/browser-recommendation.html %} + +{% include sections/browser-fingerprint.html %} + +{% include sections/browser-webrtc.html %} + +{% include sections/browser-addons.html %} + +{% include sections/browser-tweaks.html %} + +
diff --git a/index.html b/index.html index 49eadc01..62490547 100644 --- a/index.html +++ b/index.html @@ -3,78 +3,14 @@ layout: default ---
+ + {% include sections/header.html %} - {% include sections/fourteen-eyes.html %} - - {% include sections/key-disclosure-law.html %} - - {% include sections/vpn.html %} - - {% include sections/warrant-canary.html %} - - {% include sections/browser-recommendation.html %} - - {% include sections/browser-fingerprint.html %} - - {% include sections/browser-webrtc.html %} - - {% include sections/browser-addons.html %} - - {% include sections/browser-tweaks.html %} - - {% include sections/email-providers.html %} - - {% include sections/email-clients.html %} - - {% include sections/email-alternatives.html %} - - {% include sections/search-engines.html %} - - {% include sections/instant-messenger.html %} - - {% include sections/voice-video-messenger.html %} - - {% include sections/file-sharing.html %} - - {% include sections/cloud-storage.html %} - - {% include sections/selfhosted-cloud.html %} - - {% include sections/hosting-provider.html %} - - {% include sections/file-sync.html %} - - {% include sections/password-managers.html %} - - {% include sections/calendar-contacts-sync.html %} - - {% include sections/file-encryption.html %} - - {% include sections/self-contained-networks.html %} - - {% include sections/social-networks.html %} - - {% include sections/dns.html %} - - {% include sections/notebooks.html %} - - {% include sections/paste-services.html %} - - {% include sections/productivity-tools.html %} - - {% include sections/operating-systems.html %} - - {% include sections/live-operating-systems.html %} - - {% include sections/mobile-operating-systems.html %} - - {% include sections/android-addons.html %} - - {% include sections/router-firmware.html %} - - {% include sections/windows10.html %} - {% include sections/quotes.html %} {% include sections/privacy-resources.html %} diff --git a/os.html b/os.html new file mode 100644 index 00000000..5a90f1b2 --- /dev/null +++ b/os.html @@ -0,0 +1,19 @@ +--- +layout: default +--- + +
+ +{% include sections/operating-systems.html %} + +{% include sections/live-operating-systems.html %} + +{% include sections/mobile-operating-systems.html %} + +{% include sections/android-addons.html %} + +{% include sections/router-firmware.html %} + +{% include sections/windows10.html %} + +
diff --git a/providers.html b/providers.html new file mode 100644 index 00000000..69fb0fca --- /dev/null +++ b/providers.html @@ -0,0 +1,27 @@ +--- +layout: default +--- + +
+ +{% include sections/fourteen-eyes.html %} + +{% include sections/key-disclosure-law.html %} + +{% include sections/vpn.html %} + +{% include sections/email-providers.html %} + +{% include sections/warrant-canary.html %} + +{% include sections/cloud-storage.html %} + +{% include sections/social-networks.html %} + +{% include sections/dns.html %} + +{% include sections/search-engines.html %} + +{% include sections/hosting-provider.html %} + +
diff --git a/software.html b/software.html new file mode 100644 index 00000000..8399fd05 --- /dev/null +++ b/software.html @@ -0,0 +1,35 @@ +--- +layout: default +--- + +
+ +{% include sections/email-clients.html %} + +{% include sections/email-alternatives.html %} + +{% include sections/instant-messenger.html %} + +{% include sections/voice-video-messenger.html %} + +{% include sections/file-sharing.html %} + +{% include sections/selfhosted-cloud.html %} + +{% include sections/file-sync.html %} + +{% include sections/password-managers.html %} + +{% include sections/calendar-contacts-sync.html %} + +{% include sections/file-encryption.html %} + +{% include sections/self-contained-networks.html %} + +{% include sections/notebooks.html %} + +{% include sections/paste-services.html %} + +{% include sections/productivity-tools.html %} + +
-- 2.47.2 From efd25a6259e20bd0846ed2e930f6041bbd2a70cd Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 31 Mar 2019 23:23:30 -0500 Subject: [PATCH 03/19] Separate everything into their own pages + Permalinks! --- _config.yml | 2 +- _layouts/default.html | 32 ++++++++++++------------- index.html | 2 ++ browsers.html => pages/browsers.html | 1 + os.html => pages/os.html | 1 + pages/providers/dns.html | 10 ++++++++ pages/providers/email.html | 10 ++++++++ pages/providers/hosting.html | 10 ++++++++ pages/providers/jurisdiction.html | 12 ++++++++++ pages/providers/paste.html | 10 ++++++++ pages/providers/search-engines.html | 10 ++++++++ pages/providers/social-networks.html | 10 ++++++++ pages/providers/storage.html | 10 ++++++++ pages/providers/vpn.html | 10 ++++++++ pages/software/cal-card.html | 10 ++++++++ pages/software/cloud.html | 10 ++++++++ pages/software/email.html | 12 ++++++++++ pages/software/encryption.html | 10 ++++++++ pages/software/file-sharing.html | 10 ++++++++ pages/software/file-sync.html | 10 ++++++++ pages/software/im.html | 10 ++++++++ pages/software/networks.html | 10 ++++++++ pages/software/notebooks.html | 10 ++++++++ pages/software/passwords.html | 10 ++++++++ pages/software/productivity.html | 10 ++++++++ pages/software/video-voice.html | 10 ++++++++ providers.html | 27 --------------------- software.html | 35 ---------------------------- 28 files changed, 235 insertions(+), 79 deletions(-) rename browsers.html => pages/browsers.html (93%) rename os.html => pages/os.html (91%) create mode 100644 pages/providers/dns.html create mode 100644 pages/providers/email.html create mode 100644 pages/providers/hosting.html create mode 100644 pages/providers/jurisdiction.html create mode 100644 pages/providers/paste.html create mode 100644 pages/providers/search-engines.html create mode 100644 pages/providers/social-networks.html create mode 100644 pages/providers/storage.html create mode 100644 pages/providers/vpn.html create mode 100644 pages/software/cal-card.html create mode 100644 pages/software/cloud.html create mode 100644 pages/software/email.html create mode 100644 pages/software/encryption.html create mode 100644 pages/software/file-sharing.html create mode 100644 pages/software/file-sync.html create mode 100644 pages/software/im.html create mode 100644 pages/software/networks.html create mode 100644 pages/software/notebooks.html create mode 100644 pages/software/passwords.html create mode 100644 pages/software/productivity.html create mode 100644 pages/software/video-voice.html delete mode 100644 providers.html delete mode 100644 software.html diff --git a/_config.yml b/_config.yml index ce7b8c2c..9132e0aa 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ title: Privacy Tools - Encryption Against Global Mass Surveillance description: You are being watched! Knowledge, encryption and privacy tools to protect you against global mass surveillance. -url: "https://privacytools.io" +url: "https://www.privacytools.io" sass: style: compressed plugins: diff --git a/_layouts/default.html b/_layouts/default.html index 9e58cc40..e442d2b2 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -27,24 +27,24 @@ {% endif %} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + diff --git a/index.html b/index.html index 62490547..1f260caa 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,8 @@ layout: default {% include sections/quotes.html %} + {% include sections/warrant-canary.html %} + {% include sections/privacy-resources.html %} {% include sections/participate.html %} diff --git a/browsers.html b/pages/browsers.html similarity index 93% rename from browsers.html rename to pages/browsers.html index c1d44a64..f54e9f8e 100644 --- a/browsers.html +++ b/pages/browsers.html @@ -1,5 +1,6 @@ --- layout: default +permalink: /browsers/ ---
diff --git a/os.html b/pages/os.html similarity index 91% rename from os.html rename to pages/os.html index 5a90f1b2..8ab52d5b 100644 --- a/os.html +++ b/pages/os.html @@ -1,5 +1,6 @@ --- layout: default +permalink: /operating-systems/ ---
diff --git a/pages/providers/dns.html b/pages/providers/dns.html new file mode 100644 index 00000000..4b3e216a --- /dev/null +++ b/pages/providers/dns.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/dns/ +--- + +
+ +{% include sections/dns.html %} + +
diff --git a/pages/providers/email.html b/pages/providers/email.html new file mode 100644 index 00000000..e1ef33f3 --- /dev/null +++ b/pages/providers/email.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/email/ +--- + +
+ +{% include sections/email-providers.html %} + +
diff --git a/pages/providers/hosting.html b/pages/providers/hosting.html new file mode 100644 index 00000000..bc304008 --- /dev/null +++ b/pages/providers/hosting.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/hosting/ +--- + +
+ +{% include sections/hosting-provider.html %} + +
diff --git a/pages/providers/jurisdiction.html b/pages/providers/jurisdiction.html new file mode 100644 index 00000000..4e4e3dc5 --- /dev/null +++ b/pages/providers/jurisdiction.html @@ -0,0 +1,12 @@ +--- +layout: default +permalink: /providers/jurisdictions/ +--- + +
+ +{% include sections/fourteen-eyes.html %} + +{% include sections/key-disclosure-law.html %} + +
diff --git a/pages/providers/paste.html b/pages/providers/paste.html new file mode 100644 index 00000000..1690ae24 --- /dev/null +++ b/pages/providers/paste.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/paste/ +--- + +
+ +{% include sections/paste-services.html %} + +
diff --git a/pages/providers/search-engines.html b/pages/providers/search-engines.html new file mode 100644 index 00000000..cb31a635 --- /dev/null +++ b/pages/providers/search-engines.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/search-engines/ +--- + +
+ +{% include sections/search-engines.html %} + +
diff --git a/pages/providers/social-networks.html b/pages/providers/social-networks.html new file mode 100644 index 00000000..7cf474ad --- /dev/null +++ b/pages/providers/social-networks.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/social-networks/ +--- + +
+ +{% include sections/social-networks.html %} + +
diff --git a/pages/providers/storage.html b/pages/providers/storage.html new file mode 100644 index 00000000..d8370edd --- /dev/null +++ b/pages/providers/storage.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/cloud-storage/ +--- + +
+ +{% include sections/cloud-storage.html %} + +
diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html new file mode 100644 index 00000000..baab331d --- /dev/null +++ b/pages/providers/vpn.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /providers/vpn/ +--- + +
+ +{% include sections/vpn.html %} + +
diff --git a/pages/software/cal-card.html b/pages/software/cal-card.html new file mode 100644 index 00000000..ed0d3f50 --- /dev/null +++ b/pages/software/cal-card.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/calendar-contacts/ +--- + +
+ +{% include sections/calendar-contacts-sync.html %} + +
diff --git a/pages/software/cloud.html b/pages/software/cloud.html new file mode 100644 index 00000000..931820c0 --- /dev/null +++ b/pages/software/cloud.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/cloud/ +--- + +
+ +{% include sections/selfhosted-cloud.html %} + +
diff --git a/pages/software/email.html b/pages/software/email.html new file mode 100644 index 00000000..22b4b8c2 --- /dev/null +++ b/pages/software/email.html @@ -0,0 +1,12 @@ +--- +layout: default +permalink: /software/email/ +--- + +
+ +{% include sections/email-clients.html %} + +{% include sections/email-alternatives.html %} + +
diff --git a/pages/software/encryption.html b/pages/software/encryption.html new file mode 100644 index 00000000..1a95c7e3 --- /dev/null +++ b/pages/software/encryption.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/encryption-tools/ +--- + +
+ +{% include sections/file-encryption.html %} + +
diff --git a/pages/software/file-sharing.html b/pages/software/file-sharing.html new file mode 100644 index 00000000..4062eaf5 --- /dev/null +++ b/pages/software/file-sharing.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/file-sharing/ +--- + +
+ +{% include sections/file-sharing.html %} + +
diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html new file mode 100644 index 00000000..a96043f6 --- /dev/null +++ b/pages/software/file-sync.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/file-sync/ +--- + +
+ +{% include sections/file-sync.html %} + +
diff --git a/pages/software/im.html b/pages/software/im.html new file mode 100644 index 00000000..4be25845 --- /dev/null +++ b/pages/software/im.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/im/ +--- + +
+ +{% include sections/instant-messenger.html %} + +
diff --git a/pages/software/networks.html b/pages/software/networks.html new file mode 100644 index 00000000..315c08eb --- /dev/null +++ b/pages/software/networks.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/networks/ +--- + +
+ +{% include sections/self-contained-networks.html %} + +
diff --git a/pages/software/notebooks.html b/pages/software/notebooks.html new file mode 100644 index 00000000..ef0d484a --- /dev/null +++ b/pages/software/notebooks.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/notebooks/ +--- + +
+ +{% include sections/notebooks.html %} + +
diff --git a/pages/software/passwords.html b/pages/software/passwords.html new file mode 100644 index 00000000..df109e78 --- /dev/null +++ b/pages/software/passwords.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/passwords/ +--- + +
+ +{% include sections/password-managers.html %} + +
diff --git a/pages/software/productivity.html b/pages/software/productivity.html new file mode 100644 index 00000000..4e6d0c79 --- /dev/null +++ b/pages/software/productivity.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/productivity/ +--- + +
+ +{% include sections/productivity-tools.html %} + +
diff --git a/pages/software/video-voice.html b/pages/software/video-voice.html new file mode 100644 index 00000000..3d74f012 --- /dev/null +++ b/pages/software/video-voice.html @@ -0,0 +1,10 @@ +--- +layout: default +permalink: /software/voip/ +--- + +
+ +{% include sections/voice-video-messenger.html %} + +
diff --git a/providers.html b/providers.html deleted file mode 100644 index 69fb0fca..00000000 --- a/providers.html +++ /dev/null @@ -1,27 +0,0 @@ ---- -layout: default ---- - -
- -{% include sections/fourteen-eyes.html %} - -{% include sections/key-disclosure-law.html %} - -{% include sections/vpn.html %} - -{% include sections/email-providers.html %} - -{% include sections/warrant-canary.html %} - -{% include sections/cloud-storage.html %} - -{% include sections/social-networks.html %} - -{% include sections/dns.html %} - -{% include sections/search-engines.html %} - -{% include sections/hosting-provider.html %} - -
diff --git a/software.html b/software.html deleted file mode 100644 index 8399fd05..00000000 --- a/software.html +++ /dev/null @@ -1,35 +0,0 @@ ---- -layout: default ---- - -
- -{% include sections/email-clients.html %} - -{% include sections/email-alternatives.html %} - -{% include sections/instant-messenger.html %} - -{% include sections/voice-video-messenger.html %} - -{% include sections/file-sharing.html %} - -{% include sections/selfhosted-cloud.html %} - -{% include sections/file-sync.html %} - -{% include sections/password-managers.html %} - -{% include sections/calendar-contacts-sync.html %} - -{% include sections/file-encryption.html %} - -{% include sections/self-contained-networks.html %} - -{% include sections/notebooks.html %} - -{% include sections/paste-services.html %} - -{% include sections/productivity-tools.html %} - -
-- 2.47.2 From de1a70b5dd00c04f003d6c03bb5fd323f3932bb1 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 31 Mar 2019 23:27:29 -0500 Subject: [PATCH 04/19] Navbar Link Updates --- _includes/card.html | 2 +- _includes/nav.html | 22 +++++++++++----------- _includes/scripts.html | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/_includes/card.html b/_includes/card.html index c678d677..369a7229 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -37,7 +37,7 @@ {% endif %} {% if include.tor %} - Tor + Tor {% endif %} {% if include.extra_button %} diff --git a/_includes/nav.html b/_includes/nav.html index 6b18f689..b86a839d 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -40,11 +40,11 @@ Browser
- Recommendation - Fingerprint - WebRTC IP Leak - Firefox Privacy Add-ons - Privacy Related Tweaks + Recommendation + Fingerprint + WebRTC IP Leak + Firefox Privacy Add-ons + Privacy Related Tweaks
  • @@ -73,12 +73,12 @@ OS
    - PC OS - Live CD OS - Mobile OS - Android Privacy Add-ons - Router Firmware - Don't use Windows 10 + PC OS + Live CD OS + Mobile OS + Android Privacy Add-ons + Router Firmware + Don't use Windows 10
  • diff --git a/_includes/scripts.html b/_includes/scripts.html index 2a6cb563..cdc7e515 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,7 +1,7 @@ - - - - + + + + + - {% include sections/header.html %} - - {% include sections/quotes.html %} - - {% include sections/warrant-canary.html %} - - {% include sections/privacy-resources.html %} - - {% include sections/participate.html %} - - {% include sections/footer.html %} - -
    • +{% include sections/header.html %} +{% include sections/quotes.html %} +{% include sections/warrant-canary.html %} +{% include sections/privacy-resources.html %} +{% include sections/participate.html %} diff --git a/privacy-policy.html b/privacy-policy.html index dc164949..3461bb2a 100644 --- a/privacy-policy.html +++ b/privacy-policy.html @@ -90,6 +90,6 @@ active_page: privacy_policy

    - {% include sections/footer.html %} + {% include footer.html %}
    -- 2.47.2 From ae7b1361fd5570f9bb87d970bfbc5c5f1d3df005 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 14:18:35 -0500 Subject: [PATCH 09/19] Remove unnecessary div containers --- pages/browsers.html | 4 ---- pages/os.html | 4 ---- pages/providers/dns.html | 4 ---- pages/providers/email.html | 4 ---- pages/providers/hosting.html | 4 ---- pages/providers/jurisdiction.html | 4 ---- pages/providers/paste.html | 4 ---- pages/providers/search-engines.html | 4 ---- pages/providers/social-networks.html | 4 ---- pages/providers/storage.html | 4 ---- pages/providers/vpn.html | 4 ---- pages/software/cal-card.html | 4 ---- pages/software/cloud.html | 4 ---- pages/software/email.html | 4 ---- pages/software/encryption.html | 4 ---- pages/software/file-sharing.html | 4 ---- pages/software/file-sync.html | 4 ---- pages/software/im.html | 4 ---- pages/software/networks.html | 4 ---- pages/software/notebooks.html | 4 ---- pages/software/passwords.html | 4 ---- pages/software/productivity.html | 4 ---- pages/software/video-voice.html | 4 ---- 23 files changed, 92 deletions(-) diff --git a/pages/browsers.html b/pages/browsers.html index f54e9f8e..4455879f 100644 --- a/pages/browsers.html +++ b/pages/browsers.html @@ -3,8 +3,6 @@ layout: default permalink: /browsers/ --- -
    - {% include sections/browser-recommendation.html %} {% include sections/browser-fingerprint.html %} @@ -14,5 +12,3 @@ permalink: /browsers/ {% include sections/browser-addons.html %} {% include sections/browser-tweaks.html %} - -
    diff --git a/pages/os.html b/pages/os.html index 8ab52d5b..aeb54387 100644 --- a/pages/os.html +++ b/pages/os.html @@ -3,8 +3,6 @@ layout: default permalink: /operating-systems/ --- -
    - {% include sections/operating-systems.html %} {% include sections/live-operating-systems.html %} @@ -16,5 +14,3 @@ permalink: /operating-systems/ {% include sections/router-firmware.html %} {% include sections/windows10.html %} - -
    diff --git a/pages/providers/dns.html b/pages/providers/dns.html index 4b3e216a..af9079f4 100644 --- a/pages/providers/dns.html +++ b/pages/providers/dns.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/dns/ --- -
    - {% include sections/dns.html %} - -
    diff --git a/pages/providers/email.html b/pages/providers/email.html index e1ef33f3..97671466 100644 --- a/pages/providers/email.html +++ b/pages/providers/email.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/email/ --- -
    - {% include sections/email-providers.html %} - -
    diff --git a/pages/providers/hosting.html b/pages/providers/hosting.html index bc304008..3d72dd42 100644 --- a/pages/providers/hosting.html +++ b/pages/providers/hosting.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/hosting/ --- -
    - {% include sections/hosting-provider.html %} - -
    diff --git a/pages/providers/jurisdiction.html b/pages/providers/jurisdiction.html index 4e4e3dc5..9f5d5393 100644 --- a/pages/providers/jurisdiction.html +++ b/pages/providers/jurisdiction.html @@ -3,10 +3,6 @@ layout: default permalink: /providers/jurisdictions/ --- -
    - {% include sections/fourteen-eyes.html %} {% include sections/key-disclosure-law.html %} - -
    diff --git a/pages/providers/paste.html b/pages/providers/paste.html index 1690ae24..0f70ceff 100644 --- a/pages/providers/paste.html +++ b/pages/providers/paste.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/paste/ --- -
    - {% include sections/paste-services.html %} - -
    diff --git a/pages/providers/search-engines.html b/pages/providers/search-engines.html index cb31a635..bf750631 100644 --- a/pages/providers/search-engines.html +++ b/pages/providers/search-engines.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/search-engines/ --- -
    - {% include sections/search-engines.html %} - -
    diff --git a/pages/providers/social-networks.html b/pages/providers/social-networks.html index 7cf474ad..ffb51a84 100644 --- a/pages/providers/social-networks.html +++ b/pages/providers/social-networks.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/social-networks/ --- -
    - {% include sections/social-networks.html %} - -
    diff --git a/pages/providers/storage.html b/pages/providers/storage.html index d8370edd..1fb1bb4f 100644 --- a/pages/providers/storage.html +++ b/pages/providers/storage.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/cloud-storage/ --- -
    - {% include sections/cloud-storage.html %} - -
    diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html index baab331d..ebe25cc0 100644 --- a/pages/providers/vpn.html +++ b/pages/providers/vpn.html @@ -3,8 +3,4 @@ layout: default permalink: /providers/vpn/ --- -
    - {% include sections/vpn.html %} - -
    diff --git a/pages/software/cal-card.html b/pages/software/cal-card.html index ed0d3f50..e5230a18 100644 --- a/pages/software/cal-card.html +++ b/pages/software/cal-card.html @@ -3,8 +3,4 @@ layout: default permalink: /software/calendar-contacts/ --- -
    - {% include sections/calendar-contacts-sync.html %} - -
    diff --git a/pages/software/cloud.html b/pages/software/cloud.html index 931820c0..5aece3aa 100644 --- a/pages/software/cloud.html +++ b/pages/software/cloud.html @@ -3,8 +3,4 @@ layout: default permalink: /software/cloud/ --- -
    - {% include sections/selfhosted-cloud.html %} - -
    diff --git a/pages/software/email.html b/pages/software/email.html index 22b4b8c2..e6d88eae 100644 --- a/pages/software/email.html +++ b/pages/software/email.html @@ -3,10 +3,6 @@ layout: default permalink: /software/email/ --- -
    - {% include sections/email-clients.html %} {% include sections/email-alternatives.html %} - -
    diff --git a/pages/software/encryption.html b/pages/software/encryption.html index 1a95c7e3..095de253 100644 --- a/pages/software/encryption.html +++ b/pages/software/encryption.html @@ -3,8 +3,4 @@ layout: default permalink: /software/encryption-tools/ --- -
    - {% include sections/file-encryption.html %} - -
    diff --git a/pages/software/file-sharing.html b/pages/software/file-sharing.html index 4062eaf5..7d0b359e 100644 --- a/pages/software/file-sharing.html +++ b/pages/software/file-sharing.html @@ -3,8 +3,4 @@ layout: default permalink: /software/file-sharing/ --- -
    - {% include sections/file-sharing.html %} - -
    diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html index a96043f6..3a575d65 100644 --- a/pages/software/file-sync.html +++ b/pages/software/file-sync.html @@ -3,8 +3,4 @@ layout: default permalink: /software/file-sync/ --- -
    - {% include sections/file-sync.html %} - -
    diff --git a/pages/software/im.html b/pages/software/im.html index 4be25845..9e448943 100644 --- a/pages/software/im.html +++ b/pages/software/im.html @@ -3,8 +3,4 @@ layout: default permalink: /software/im/ --- -
    - {% include sections/instant-messenger.html %} - -
    diff --git a/pages/software/networks.html b/pages/software/networks.html index 315c08eb..6bac4a7e 100644 --- a/pages/software/networks.html +++ b/pages/software/networks.html @@ -3,8 +3,4 @@ layout: default permalink: /software/networks/ --- -
    - {% include sections/self-contained-networks.html %} - -
    diff --git a/pages/software/notebooks.html b/pages/software/notebooks.html index ef0d484a..4d3c85d6 100644 --- a/pages/software/notebooks.html +++ b/pages/software/notebooks.html @@ -3,8 +3,4 @@ layout: default permalink: /software/notebooks/ --- -
    - {% include sections/notebooks.html %} - -
    diff --git a/pages/software/passwords.html b/pages/software/passwords.html index df109e78..d3fcdb5c 100644 --- a/pages/software/passwords.html +++ b/pages/software/passwords.html @@ -3,8 +3,4 @@ layout: default permalink: /software/passwords/ --- -
    - {% include sections/password-managers.html %} - -
    diff --git a/pages/software/productivity.html b/pages/software/productivity.html index 4e6d0c79..a7758a63 100644 --- a/pages/software/productivity.html +++ b/pages/software/productivity.html @@ -3,8 +3,4 @@ layout: default permalink: /software/productivity/ --- -
    - {% include sections/productivity-tools.html %} - -
    diff --git a/pages/software/video-voice.html b/pages/software/video-voice.html index 3d74f012..e7d888f3 100644 --- a/pages/software/video-voice.html +++ b/pages/software/video-voice.html @@ -3,8 +3,4 @@ layout: default permalink: /software/voip/ --- -
    - {% include sections/voice-video-messenger.html %} - -
    -- 2.47.2 From 6dbf30403a3965502cd5908a66145c8da594da95 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 14:36:10 -0500 Subject: [PATCH 10/19] Adjust footer and headers layout --- _includes/footer.html | 8 +++----- assets/css/style.scss | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 14608edd..6cba2961 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,8 +1,6 @@
    -
    -

    No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests

    -
    +
    @@ -14,7 +12,7 @@
    - BitcoinDonate BTC + BitcoinDonate BTC
    @@ -22,6 +20,6 @@
    -

    privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. never trust any company with your privacy, always encrypt. view our privacy policy.

    +

    No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. View our privacy policy.

    diff --git a/assets/css/style.scss b/assets/css/style.scss index ab469286..b23e063f 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -78,9 +78,10 @@ a, } .anchor { + margin-top: 4rem; &:target { margin-top: -4rem; - padding-top: 4rem; + padding-top: 8rem; } } @@ -130,6 +131,20 @@ a, .email { background: $email; } .diaspora { background: $diaspora; } +.footer-divider { + margin-top: 3em; + margin-bottom: 3em; + border: none; + height: 1px; + background-color: #343A40; +} + +.copyright-text { + margin-top: 1em; + margin-bottom: 3em; + text-align: justify; +} + footer { img, i { -- 2.47.2 From e2a827bf1645697cca9d11c5b62d102e7688b96e Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 15:42:27 -0500 Subject: [PATCH 11/19] Add link to various privacy subpages to homepage --- _includes/card.html | 19 +++++++- _includes/sections/privacy-resources.html | 2 +- _includes/sections/resources.html | 53 +++++++++++++++++++++++ assets/css/style.scss | 11 ++++- index.html | 1 + 5 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 _includes/sections/resources.html diff --git a/_includes/card.html b/_includes/card.html index 369a7229..b7c5d609 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -26,9 +26,17 @@ {% endfor %}
    {% endif %} -

    {{include.title}}{{include.description}}

    +

    + {% if include.image %} + {{include.title}} + {% elsif include.icon %} + + {% endif %} + {{include.description}} +

    + {% if include.url %} Website: {% if include.website %} {{include.website}} @@ -36,6 +44,15 @@ {{ include.url | remove: "https://" | remove: "http://" | remove: "www." | remove: "/" | remove: "github.com" }} {% endif %} + {% elsif include.page %} + + {% if include.moretext %} + {{include.moretext}} + {% else %} + Learn More + {% endif %} + + {% endif %} {% if include.tor %} Tor {% endif %} diff --git a/_includes/sections/privacy-resources.html b/_includes/sections/privacy-resources.html index e332c017..91db1677 100644 --- a/_includes/sections/privacy-resources.html +++ b/_includes/sections/privacy-resources.html @@ -1,4 +1,4 @@ -

    Recommended Privacy Resources

    +

    More Privacy Resources

    Guides

    diff --git a/_includes/sections/resources.html b/_includes/sections/resources.html new file mode 100644 index 00000000..86cc61f9 --- /dev/null +++ b/_includes/sections/resources.html @@ -0,0 +1,53 @@ +

    Privacy Tools

    + +
    + + {% include card.html color="success" + title="Service Providers" + icon="fas fa-server" + iconcolor="dark" + page="/providers/" + description="Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!" + %} + + {% include card.html color="primary" + title="Web Browsers" + icon="far fa-compass" + iconcolor="dark" + page="/browsers/" + description="Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks." + %} + + {% include card.html color="warning" + title="Software" + icon="far fa-window-restore" + iconcolor="dark" + page="/software/" + description="Discover a variety of open source software built to protect your privacy and keep your digital data secure." + %} + + {% include card.html color="info" + title="Operating Systems" + icon="fas fa-desktop" + iconcolor="dark" + page="/os/" + description="Find out how your operating system is comprimising your privacy, and what simple alternatives exist." + %} + + {% include card.html color="secondary" + title="privacytoolsIO Services" + icon="far fa-eye-slash" + iconcolor="dark" + page="/services/" + description="The privacytools.io team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!" + %} + + {% include card.html color="danger" + title="Donate" + icon="fas fa-donate" + iconcolor="dark" + page="https://github.com/privacytoolsIO/privacytools.io" + description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating." + %} + +
    diff --git a/assets/css/style.scss b/assets/css/style.scss index b23e063f..8ebc109b 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -78,10 +78,11 @@ a, } .anchor { - margin-top: 4rem; + margin-top: 3.5rem; + margin-bottom: 2rem; &:target { margin-top: -4rem; - padding-top: 8rem; + padding-top: 7.5rem; } } @@ -94,6 +95,12 @@ a, margin-left: 5px; } +.panel-icon { + float: right; + margin: 15px; + font-size: 5.5em; +} + .share-btn { border: 0; box-shadow: $share-btn-shadow; diff --git a/index.html b/index.html index 5d79f5b6..6282f040 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,7 @@ layout: default {% include sections/header.html %} +{% include sections/resources.html %} {% include sections/quotes.html %} {% include sections/warrant-canary.html %} {% include sections/privacy-resources.html %} -- 2.47.2 From f63d75ca9a105c323dd6e2443e3a216e919f7560 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 15:45:21 -0500 Subject: [PATCH 12/19] Remove test script --- index.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/index.html b/index.html index 6282f040..90f91d40 100644 --- a/index.html +++ b/index.html @@ -2,12 +2,6 @@ layout: default --- - - {% include sections/header.html %} {% include sections/resources.html %} {% include sections/quotes.html %} -- 2.47.2 From 81b6c6c15601a95c5f2b1cdbabcd3f9f9422e61b Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 16:24:16 -0500 Subject: [PATCH 13/19] Add titles and descriptions to all pages --- _layouts/page.html | 10 ++++++++++ pages/browsers.html | 4 +++- pages/os.html | 4 +++- pages/providers/dns.html | 4 +++- pages/providers/email.html | 4 +++- pages/providers/hosting.html | 4 +++- pages/providers/jurisdiction.html | 4 +++- pages/providers/paste.html | 4 +++- pages/providers/search-engines.html | 4 +++- pages/providers/social-networks.html | 4 +++- pages/providers/storage.html | 4 +++- pages/providers/vpn.html | 4 +++- pages/software/cal-card.html | 4 +++- pages/software/cloud.html | 4 +++- pages/software/email.html | 4 +++- pages/software/encryption.html | 4 +++- pages/software/file-sharing.html | 4 +++- pages/software/file-sync.html | 4 +++- pages/software/im.html | 4 +++- pages/software/networks.html | 5 ++++- pages/software/notebooks.html | 4 +++- pages/software/passwords.html | 4 +++- pages/software/productivity.html | 4 +++- pages/software/video-voice.html | 4 +++- 24 files changed, 80 insertions(+), 23 deletions(-) create mode 100644 _layouts/page.html diff --git a/_layouts/page.html b/_layouts/page.html new file mode 100644 index 00000000..4a137c66 --- /dev/null +++ b/_layouts/page.html @@ -0,0 +1,10 @@ +--- +layout: default +--- + +
    +

    {{ page.title }}

    + {% if page.description and page.hidedesc != true %}

    {{ page.description }}

    {% endif %} +
    + +{{ content }} diff --git a/pages/browsers.html b/pages/browsers.html index 4455879f..17f98cec 100644 --- a/pages/browsers.html +++ b/pages/browsers.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /browsers/ +title: "Web Browsers" +description: "These are our current web browser recommendations and some tweaks you can use to preserve your privacy." --- {% include sections/browser-recommendation.html %} diff --git a/pages/os.html b/pages/os.html index aeb54387..924ebc33 100644 --- a/pages/os.html +++ b/pages/os.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /operating-systems/ +title: "Operating Systems" +description: "Even your own computer could be compromising your privacy. Discover our recommended OS choices for all the devices you use." --- {% include sections/operating-systems.html %} diff --git a/pages/providers/dns.html b/pages/providers/dns.html index af9079f4..9c68315f 100644 --- a/pages/providers/dns.html +++ b/pages/providers/dns.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/dns/ +title: "Web Browsers" +description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers." --- {% include sections/dns.html %} diff --git a/pages/providers/email.html b/pages/providers/email.html index 97671466..b05f5785 100644 --- a/pages/providers/email.html +++ b/pages/providers/email.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/email/ +title: "Email" +description: "Find an email provider that will keep your privacy in mind. Don't settle for ad-supported platforms." --- {% include sections/email-providers.html %} diff --git a/pages/providers/hosting.html b/pages/providers/hosting.html index 3d72dd42..29d1d407 100644 --- a/pages/providers/hosting.html +++ b/pages/providers/hosting.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/hosting/ +title: "Web Hosting" +description: "Find a web hosting provider that won't track your visitors or give into government data requests." --- {% include sections/hosting-provider.html %} diff --git a/pages/providers/jurisdiction.html b/pages/providers/jurisdiction.html index 9f5d5393..ff593e98 100644 --- a/pages/providers/jurisdiction.html +++ b/pages/providers/jurisdiction.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/jurisdictions/ +title: "Jurisdictions" +description: "Learn about how certain governments track their citizens and foreigners, and which places to avoid to preserve your privacy online." --- {% include sections/fourteen-eyes.html %} diff --git a/pages/providers/paste.html b/pages/providers/paste.html index 0f70ceff..e312623b 100644 --- a/pages/providers/paste.html +++ b/pages/providers/paste.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/paste/ +title: "Paste" +description: "Find a pastebin provider that won't read your content to share sensitive code or other information." --- {% include sections/paste-services.html %} diff --git a/pages/providers/search-engines.html b/pages/providers/search-engines.html index bf750631..f466421a 100644 --- a/pages/providers/search-engines.html +++ b/pages/providers/search-engines.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/search-engines/ +title: "Search Engines" +description: "Find a search engine that doesn't track your queries or build an advertising profile based on your searches." --- {% include sections/search-engines.html %} diff --git a/pages/providers/social-networks.html b/pages/providers/social-networks.html index ffb51a84..b9ef5d77 100644 --- a/pages/providers/social-networks.html +++ b/pages/providers/social-networks.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/social-networks/ +title: "Social Networks" +description: "Find a social network that doesn't pry into your data or monetize your profile." --- {% include sections/social-networks.html %} diff --git a/pages/providers/storage.html b/pages/providers/storage.html index 1fb1bb4f..a71ec8dc 100644 --- a/pages/providers/storage.html +++ b/pages/providers/storage.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/cloud-storage/ +title: "Cloud Storage" +description: "Find a cloud storage provider that won't look through your files." --- {% include sections/cloud-storage.html %} diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html index ebe25cc0..8f2e9f9e 100644 --- a/pages/providers/vpn.html +++ b/pages/providers/vpn.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /providers/vpn/ +title: "VPN Providers" +description: "Find a no-logging VPN operator who isn't out to sell or read your web traffic." --- {% include sections/vpn.html %} diff --git a/pages/software/cal-card.html b/pages/software/cal-card.html index e5230a18..d102b7e7 100644 --- a/pages/software/cal-card.html +++ b/pages/software/cal-card.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/calendar-contacts/ +title: "Calendar/Contacts Sync Tools" +description: "Discover free, open source, and secure ways to sync your contacts and calendars across your devices." --- {% include sections/calendar-contacts-sync.html %} diff --git a/pages/software/cloud.html b/pages/software/cloud.html index 5aece3aa..a5b35e20 100644 --- a/pages/software/cloud.html +++ b/pages/software/cloud.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/cloud/ +title: "Self Hosted \"Cloud\"" +description: "Discover how to securely and privately self-host your cloud with open source software." --- {% include sections/selfhosted-cloud.html %} diff --git a/pages/software/email.html b/pages/software/email.html index e6d88eae..57e1f3a7 100644 --- a/pages/software/email.html +++ b/pages/software/email.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/email/ +title: "Email Clients" +description: "Discover free, open source, and secure ways email clients, and some email alternatives you may not have considered." --- {% include sections/email-clients.html %} diff --git a/pages/software/encryption.html b/pages/software/encryption.html index 095de253..028ea587 100644 --- a/pages/software/encryption.html +++ b/pages/software/encryption.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/encryption-tools/ +title: "Encryption Tools" +description: "Discover free, open source, and secure ways to encrypt your sensitive data to keep it from prying eyes." --- {% include sections/file-encryption.html %} diff --git a/pages/software/file-sharing.html b/pages/software/file-sharing.html index 7d0b359e..cd3e83db 100644 --- a/pages/software/file-sharing.html +++ b/pages/software/file-sharing.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/file-sharing/ +title: "File Sharing" +description: "Discover how to share your files with your friends and family or anonymously, without a middleman." --- {% include sections/file-sharing.html %} diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html index 3a575d65..61d260aa 100644 --- a/pages/software/file-sync.html +++ b/pages/software/file-sync.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/file-sync/ +title: "File Sync Tools" +description: "Discover free, open source, and secure ways to sync your files across your devices." --- {% include sections/file-sync.html %} diff --git a/pages/software/im.html b/pages/software/im.html index 9e448943..a7d77066 100644 --- a/pages/software/im.html +++ b/pages/software/im.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/im/ +title: "Instant Messaging" +description: "Discover secure and private ways to message others online without letting any third parties read your messages." --- {% include sections/instant-messenger.html %} diff --git a/pages/software/networks.html b/pages/software/networks.html index 6bac4a7e..882cbbb7 100644 --- a/pages/software/networks.html +++ b/pages/software/networks.html @@ -1,6 +1,9 @@ --- -layout: default +layout: page permalink: /software/networks/ +title: "Self-Contained Networks" +description: "If you are currently browsing clearnet and want to access the dark web, this section is for you." +hidedesc: true --- {% include sections/self-contained-networks.html %} diff --git a/pages/software/notebooks.html b/pages/software/notebooks.html index 4d3c85d6..e883fe0f 100644 --- a/pages/software/notebooks.html +++ b/pages/software/notebooks.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/notebooks/ +title: "Notebooks" +description: "Keep track of your notes and journalings without giving them to a third-party." --- {% include sections/notebooks.html %} diff --git a/pages/software/passwords.html b/pages/software/passwords.html index d3fcdb5c..eeed2e5f 100644 --- a/pages/software/passwords.html +++ b/pages/software/passwords.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/passwords/ +title: "Password Managers" +description: "Stay safe and secure online with an encrypted and open-source password manager." --- {% include sections/password-managers.html %} diff --git a/pages/software/productivity.html b/pages/software/productivity.html index a7758a63..d9f2f913 100644 --- a/pages/software/productivity.html +++ b/pages/software/productivity.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/productivity/ +title: "Productivity Tools" +description: "Get working and collaborating without sharing your documents with a middleman or trusting a cloud provider." --- {% include sections/productivity-tools.html %} diff --git a/pages/software/video-voice.html b/pages/software/video-voice.html index e7d888f3..f2b9e575 100644 --- a/pages/software/video-voice.html +++ b/pages/software/video-voice.html @@ -1,6 +1,8 @@ --- -layout: default +layout: page permalink: /software/voip/ +title: "VoIP" +description: "Find a voice and video messenger that supports completely End-to-End encrypted calls." --- {% include sections/voice-video-messenger.html %} -- 2.47.2 From f42871f1df004994b82643cd109efa8b965fc3ec Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 16:27:54 -0500 Subject: [PATCH 14/19] Fix links and layouts --- _includes/footer.html | 2 +- _includes/sections/resources.html | 2 +- donate.html | 1 + privacy-policy.html | 18 ++++-------------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 6cba2961..308a8f48 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -20,6 +20,6 @@
    -

    No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. View our privacy policy.

    +

    No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. View our privacy policy.

    diff --git a/_includes/sections/resources.html b/_includes/sections/resources.html index 86cc61f9..9d9137e8 100644 --- a/_includes/sections/resources.html +++ b/_includes/sections/resources.html @@ -46,7 +46,7 @@ title="Donate" icon="fas fa-donate" iconcolor="dark" - page="https://github.com/privacytoolsIO/privacytools.io" + page="/donate/" description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating." %} diff --git a/donate.html b/donate.html index 49442f33..ef9e3411 100644 --- a/donate.html +++ b/donate.html @@ -1,6 +1,7 @@ --- layout: default active_page: donate +permalink: /donate/ ---
    diff --git a/privacy-policy.html b/privacy-policy.html index 3461bb2a..a0a5b32f 100644 --- a/privacy-policy.html +++ b/privacy-policy.html @@ -1,13 +1,9 @@ --- -layout: default -active_page: privacy_policy +layout: page +permalink: /privacy-policy/ +title: "Privacy Policy" +description: "This Privacy Policy explains what information privacytoolsIO and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services." --- -
    -
    -

    Privacy Policy

    -

    This Privacy Policy explains what information privacytoolsIO and its related entities collect about its users, - what we do with that information, and how we handle the content you place in our products and services.

    -

    Scope of Privacy Policy

    @@ -87,9 +83,3 @@ active_page: privacy_policy

    Contact Us

    If you have any questions or concerns about this privacy policy or the data we collect, you are free to open an issue on our issue tracker at GitHub.

    - -

    - - {% include footer.html %} - -
    -- 2.47.2 From e2a0d953be9e5afeea04cb598c0b6b6bcf283b1c Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 16:45:54 -0500 Subject: [PATCH 15/19] Adjust header margins --- _includes/sections/resources.html | 4 ++-- assets/css/style.scss | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/_includes/sections/resources.html b/_includes/sections/resources.html index 9d9137e8..bd0dd4e4 100644 --- a/_includes/sections/resources.html +++ b/_includes/sections/resources.html @@ -3,7 +3,7 @@
    {% include card.html color="success" - title="Service Providers" + title="Providers" icon="fas fa-server" iconcolor="dark" page="/providers/" @@ -30,7 +30,7 @@ title="Operating Systems" icon="fas fa-desktop" iconcolor="dark" - page="/os/" + page="/operating-systems/" description="Find out how your operating system is comprimising your privacy, and what simple alternatives exist." %} diff --git a/assets/css/style.scss b/assets/css/style.scss index 8ebc109b..ff03f1b1 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -77,7 +77,7 @@ a, } } -.anchor { +.anchor, .page-header h1 { margin-top: 3.5rem; margin-bottom: 2rem; &:target { @@ -86,6 +86,11 @@ a, } } +h2, h3:not(.h5), h4, h5 { + margin-top: 1.5rem; + margin-bottom: 1rem; +} + .anchor-icon { font-size: .8em; } -- 2.47.2 From b0a471b3a6672c688a34a700206b4d5dcf9fb040 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 16:46:06 -0500 Subject: [PATCH 16/19] Create master pages --- pages/providers.html | 6 ++++++ pages/software.html | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 pages/providers.html create mode 100644 pages/software.html diff --git a/pages/providers.html b/pages/providers.html new file mode 100644 index 00000000..bad7dc33 --- /dev/null +++ b/pages/providers.html @@ -0,0 +1,6 @@ +--- +layout: page +permalink: /providers/ +title: "Providers" +description: "Discover online providers that offer a variety of privacy-centric services." +--- diff --git a/pages/software.html b/pages/software.html new file mode 100644 index 00000000..5fb73650 --- /dev/null +++ b/pages/software.html @@ -0,0 +1,6 @@ +--- +layout: page +permalink: /software/ +title: "Software" +description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure." +--- -- 2.47.2 From a476e1a40bba17e88190937d3c45a194d01b64e6 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 16:59:28 -0500 Subject: [PATCH 17/19] Finalize master pages --- _includes/nav.html | 2 +- pages/providers.html | 23 ++++++++++++++++++++++- pages/providers/dns.html | 2 +- pages/providers/jurisdiction.html | 10 ---------- pages/software.html | 22 ++++++++++++++++++++++ 5 files changed, 46 insertions(+), 13 deletions(-) delete mode 100644 pages/providers/jurisdiction.html diff --git a/_includes/nav.html b/_includes/nav.html index 76897234..d4e3c35e 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -24,7 +24,7 @@ Provider
    - Avoid all US and UK based services + Avoid all US and UK based services Virtual Private Network (VPN) Privacy Email Encrypted Cloud Storage Services diff --git a/pages/providers.html b/pages/providers.html index bad7dc33..24e7ee21 100644 --- a/pages/providers.html +++ b/pages/providers.html @@ -2,5 +2,26 @@ layout: page permalink: /providers/ title: "Providers" -description: "Discover online providers that offer a variety of privacy-centric services." +description: "There's a ton of people providing services online. Discover which ones you should avoid and our recommendations for a variety of services." --- + +{% include sections/fourteen-eyes.html %} + +{% include sections/key-disclosure-law.html %} + +

    Services

    + +

    Click on whatever service you need to view our recommendations.

    + +
    + +
    diff --git a/pages/providers/dns.html b/pages/providers/dns.html index 9c68315f..a04f2fc1 100644 --- a/pages/providers/dns.html +++ b/pages/providers/dns.html @@ -1,7 +1,7 @@ --- layout: page permalink: /providers/dns/ -title: "Web Browsers" +title: "DNS" description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers." --- diff --git a/pages/providers/jurisdiction.html b/pages/providers/jurisdiction.html deleted file mode 100644 index ff593e98..00000000 --- a/pages/providers/jurisdiction.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: page -permalink: /providers/jurisdictions/ -title: "Jurisdictions" -description: "Learn about how certain governments track their citizens and foreigners, and which places to avoid to preserve your privacy online." ---- - -{% include sections/fourteen-eyes.html %} - -{% include sections/key-disclosure-law.html %} diff --git a/pages/software.html b/pages/software.html index 5fb73650..21ed21f9 100644 --- a/pages/software.html +++ b/pages/software.html @@ -4,3 +4,25 @@ permalink: /software/ title: "Software" description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure." --- + +

    Software

    + +

    Click on whatever software you need to view our recommendations.

    + +
    + +
    -- 2.47.2 From 970516fc6783ba55c816cf9e1ac31a1c8493e40c Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 17:12:47 -0500 Subject: [PATCH 18/19] Add services page --- _includes/nav.html | 31 ++++++++++++++----------------- assets/css/style.scss | 7 +++++++ pages/providers.html | 2 +- pages/services.html | 18 ++++++++++++++++++ pages/software.html | 4 +--- 5 files changed, 41 insertions(+), 21 deletions(-) create mode 100644 pages/services.html diff --git a/_includes/nav.html b/_includes/nav.html index d4e3c35e..1cd5a695 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -10,17 +10,7 @@ Home
  • - -
    - Mastodon - Social Network - PrivateBin - Encrypted Pastebin - Searx - Privacy Friendly Search -
    -
    • -
  • -
    @@ -36,7 +26,7 @@
  • -
    @@ -48,7 +38,7 @@
  • -
    @@ -68,7 +58,7 @@
  • -
    @@ -85,11 +75,18 @@
    • diff --git a/assets/css/style.scss b/assets/css/style.scss index ff03f1b1..50d26ad6 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -50,6 +50,13 @@ a, } } +.card-list { + margin-top: 2em; + margin-bottom: 2em; + margin-left: 1em; + margin-right: 1em; +} + .blockquote { border-left: 5px solid $blockquote-border; font-size: 1.2rem; diff --git a/pages/providers.html b/pages/providers.html index 24e7ee21..19fd31ad 100644 --- a/pages/providers.html +++ b/pages/providers.html @@ -13,7 +13,7 @@ description: "There's a ton of people providing services online. Discover which

    Click on whatever service you need to view our recommendations.

    -
    +
    • Virtual Private Network (VPN)
    • Privacy Email
      • diff --git a/pages/services.html b/pages/services.html new file mode 100644 index 00000000..c2c0c574 --- /dev/null +++ b/pages/services.html @@ -0,0 +1,18 @@ +--- +layout: page +permalink: /services/ +title: "Services from privacytools.io" +description: "The privacytools.io team is proud to introduce a suite of privacy-centric online services to connect you with other privacy-minded individuals and stay safe and secure online. No advertisers, no Google Analytics, no tracking, no third party requests of any kind." +--- + +

      We currently have the following free-to-use services online now.

      + +
      + +
      + +

      More services are on the way! If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask! And of course, if you like our services, please consider donating to support our server costs, any donation helps!

      diff --git a/pages/software.html b/pages/software.html index 21ed21f9..4386be18 100644 --- a/pages/software.html +++ b/pages/software.html @@ -5,11 +5,9 @@ title: "Software" description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure." --- -

      Software

      -

      Click on whatever software you need to view our recommendations.

      -
      +
      • Email Clients
      • Email Alternatives
        • -- 2.47.2 From 4cd28249f988eaccb66ac39331fcd74d10ef0d9a Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Mon, 1 Apr 2019 17:31:45 -0500 Subject: [PATCH 19/19] Add Javascript redirects Okay I'm pretty garbage at Javascript so this is basically hacked together. If someone who knows what they're doing wants to do this, be my guest. --- assets/js/redirects.js | 33 +++++++++++++++++++++++++++++++++ index.html | 1 + 2 files changed, 34 insertions(+) create mode 100644 assets/js/redirects.js diff --git a/assets/js/redirects.js b/assets/js/redirects.js new file mode 100644 index 00000000..ef9ebca8 --- /dev/null +++ b/assets/js/redirects.js @@ -0,0 +1,33 @@ +if (window.location == 'https://www.privacytools.io/#ukusa') { window.location = 'https://www.privacytools.io/providers/';} +if (window.location == 'https://www.privacytools.io/#vpn') { window.location = 'https://www.privacytools.io/providers/vpn/';} +if (window.location == 'https://www.privacytools.io/#email') { window.location = 'https://www.privacytools.io/providers/email/';} +if (window.location == 'https://www.privacytools.io/#cloud') { window.location = 'https://www.privacytools.io/providers/cloud-storage/';} +if (window.location == 'https://www.privacytools.io/#social') { window.location = 'https://www.privacytools.io/providers/social-networks/';} +if (window.location == 'https://www.privacytools.io/#dns') { window.location = 'https://www.privacytools.io/providers/dns/';} +if (window.location == 'https://www.privacytools.io/#search') { window.location = 'https://www.privacytools.io/providers/search-engines/';} +if (window.location == 'https://www.privacytools.io/#host') { window.location = 'https://www.privacytools.io/providers/hosting/';} +if (window.location == 'https://www.privacytools.io/#paste') { window.location = 'https://www.privacytools.io/providers/paste';} +if (window.location == 'https://www.privacytools.io/#browser') { window.location = 'https://www.privacytools.io/browsers/';} +if (window.location == 'https://www.privacytools.io/#fingerprint') { window.location = 'https://www.privacytools.io/browsers/#fingerprint';} +if (window.location == 'https://www.privacytools.io/#webrtc') { window.location = 'https://www.privacytools.io/browsers/#webrtc';} +if (window.location == 'https://www.privacytools.io/#addons') { window.location = 'https://www.privacytools.io/browsers/#addons';} +if (window.location == 'https://www.privacytools.io/#about_config') { window.location = 'https://www.privacytools.io/browsers/#about_config';} +if (window.location == 'https://www.privacytools.io/#clients') { window.location = 'https://www.privacytools.io/software/email/';} +if (window.location == 'https://www.privacytools.io/#messaging') { window.location = 'https://www.privacytools.io/software/email/#messaging';} +if (window.location == 'https://www.privacytools.io/#im') { window.location = 'https://www.privacytools.io/software/im/';} +if (window.location == 'https://www.privacytools.io/#voip') { window.location = 'https://www.privacytools.io/software/voip/';} +if (window.location == 'https://www.privacytools.io/#filesharing') { window.location = 'https://www.privacytools.io/software/file-sharing/';} +if (window.location == 'https://www.privacytools.io/#mycloud') { window.location = 'https://www.privacytools.io/software/cloud/';} +if (window.location == 'https://www.privacytools.io/#sync') { window.location = 'https://www.privacytools.io/software/file-sync/';} +if (window.location == 'https://www.privacytools.io/#pw') { window.location = 'https://www.privacytools.io/software/passwords/';} +if (window.location == 'https://www.privacytools.io/#calendar_contacts') { window.location = 'https://www.privacytools.io/software/calendar-contacts/';} +if (window.location == 'https://www.privacytools.io/#encrypt') { window.location = 'https://www.privacytools.io/software/encryption-tools/';} +if (window.location == 'https://www.privacytools.io/#darknets') { window.location = 'https://www.privacytools.io/software/networks/';} +if (window.location == 'https://www.privacytools.io/#notebook') { window.location = 'https://www.privacytools.io/software/notebooks/';} +if (window.location == 'https://www.privacytools.io/#productivity') { window.location = 'https://www.privacytools.io/software/productivity/';} +if (window.location == 'https://www.privacytools.io/#os') { window.location = 'https://www.privacytools.io/operating-systems/';} +if (window.location == 'https://www.privacytools.io/#live_os') { window.location = 'https://www.privacytools.io/operating-systems/#live_os';} +if (window.location == 'https://www.privacytools.io/#mobile_os') { window.location = 'https://www.privacytools.io/operating-systems/#mobile_os';} +if (window.location == 'https://www.privacytools.io/#aaddons') { window.location = 'https://www.privacytools.io/operating-systems/#aaddons';} +if (window.location == 'https://www.privacytools.io/#firmware') { window.location = 'https://www.privacytools.io/operating-systems/#firmware';} +if (window.location == 'https://www.privacytools.io/#win10') { window.location = 'https://www.privacytools.io/operating-systems/#win10';} diff --git a/index.html b/index.html index 90f91d40..0e38620f 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,7 @@ layout: default --- + {% include sections/header.html %} {% include sections/resources.html %} {% include sections/quotes.html %} -- 2.47.2