Split All Services into Individual Pages #807

Merged
jonah merged 17 commits from split-pages into master 2019-04-02 00:42:35 +00:00
6 changed files with 141 additions and 117 deletions
Showing only changes of commit e58c2b9649 - Show all commits

View File

@ -6,12 +6,8 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
{% assign prefix = "" %}
{% if page.active_page %}
{% assign prefix = "index.html" %}
{% endif %}
<li class="nav-item">
<a class="nav-link" href="{{prefix}}#top"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
<a class="nav-link" href="index.html"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -28,15 +24,15 @@
Provider
</a>
<div class="dropdown-menu" aria-labelledby="providerDropdown">
<a class="dropdown-item" href="{{prefix}}#ukusa"><i class="fab fa-creative-commons-nc"></i> Avoid all US and UK based services</a>
<a class="dropdown-item" href="{{prefix}}#vpn"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a>
<a class="dropdown-item" href="{{prefix}}#email"><i class="fas fa-mail-bulk"></i> Privacy Email</a>
<a class="dropdown-item" href="{{prefix}}#wc"><i class="fa fa-exclamation-circle"></i> Warrant Canaries</a>
<a class="dropdown-item" href="{{prefix}}#cloud"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a>
<a class="dropdown-item" href="{{prefix}}#social"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a>
<a class="dropdown-item" href="{{prefix}}#dns"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a>
<a class="dropdown-item" href="{{prefix}}#search"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a>
<a class="dropdown-item" href="{{prefix}}#host"><i class="fas fa-database"></i> Secure Hosting Providers</a>
<a class="dropdown-item" href="/providers.html#ukusa"><i class="fab fa-creative-commons-nc"></i> Avoid all US and UK based services</a>
<a class="dropdown-item" href="/providers.html#vpn"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a>
<a class="dropdown-item" href="/providers.html#email"><i class="fas fa-mail-bulk"></i> Privacy Email</a>
<a class="dropdown-item" href="/providers.html#wc"><i class="fa fa-exclamation-circle"></i> Warrant Canaries</a>
<a class="dropdown-item" href="/providers.html#cloud"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a>
<a class="dropdown-item" href="/providers.html#social"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a>
<a class="dropdown-item" href="/providers.html#dns"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a>
<a class="dropdown-item" href="/providers.html#search"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a>
<a class="dropdown-item" href="/providers.html#host"><i class="fas fa-database"></i> Secure Hosting Providers</a>
</div>
</li>
<li class="nav-item dropdown">
@ -44,11 +40,11 @@
Browser
</a>
<div class="dropdown-menu" aria-labelledby="browserDropdown">
<a class="dropdown-item" href="{{prefix}}#browser"><i class="fas fa-check"></i> Recommendation</a>
<a class="dropdown-item" href="{{prefix}}#fingerprint"><i class="fas fa-fingerprint"></i> Fingerprint</a>
<a class="dropdown-item" href="{{prefix}}#webrtc"><i class="far fa-eye"></i> WebRTC IP Leak</a>
<a class="dropdown-item" href="{{prefix}}#addons"><i class="far fa-list-alt"></i> Firefox Privacy Add-ons</a>
<a class="dropdown-item" href="{{prefix}}#about_config"><i class="fas fa-wrench"></i> Privacy Related Tweaks</a>
<a class="dropdown-item" href="/browsers.html#browser"><i class="fas fa-check"></i> Recommendation</a>
<a class="dropdown-item" href="/browsers.html#fingerprint"><i class="fas fa-fingerprint"></i> Fingerprint</a>
<a class="dropdown-item" href="/browsers.html#webrtc"><i class="far fa-eye"></i> WebRTC IP Leak</a>
<a class="dropdown-item" href="/browsers.html#addons"><i class="far fa-list-alt"></i> Firefox Privacy Add-ons</a>
<a class="dropdown-item" href="/browsers.html#about_config"><i class="fas fa-wrench"></i> Privacy Related Tweaks</a>
</div>
</li>
<li class="nav-item dropdown">
@ -56,20 +52,20 @@
Software
</a>
<div class="dropdown-menu" aria-labelledby="softwareDropdown">
<a class="dropdown-item" href="{{prefix}}#clients"><i class="fas fa-envelope"></i> Email Clients</a>
<a class="dropdown-item" href="{{prefix}}#messaging"><i class="fas fa-random"></i> Email Alternatives</a>
<a class="dropdown-item" href="{{prefix}}#im"><i class="fab fa-telegram-plane"></i> Instant Messenger</a>
<a class="dropdown-item" href="{{prefix}}#voip"><i class="fas fa-phone"></i> Video & Voice Messenger</a>
<a class="dropdown-item" href="{{prefix}}#filesharing"><i class="fas fa-file-export"></i> File Sharing</a>
<a class="dropdown-item" href="{{prefix}}#mycloud"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a>
<a class="dropdown-item" href="{{prefix}}#sync"><i class="fas fa-copy"></i> Secure File Sync</a>
<a class="dropdown-item" href="{{prefix}}#pw"><i class="fas fa-user-lock"></i> Password Manager</a>
<a class="dropdown-item" href="{{prefix}}#calendar_contacts"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a>
<a class="dropdown-item" href="{{prefix}}#encrypt"><i class="fas fa-lock"></i> File Encryption</a>
<a class="dropdown-item" href="{{prefix}}#darknets"><i class="fas fa-user-secret"></i> Self-contained Networks</a>
<a class="dropdown-item" href="{{prefix}}#notebook"><i class="far fa-sticky-note"></i> Digital Notebook</a>
<a class="dropdown-item" href="{{prefix}}#paste"><i class="fas fa-paste"></i> Paste Services</a>
<a class="dropdown-item" href="{{prefix}}#productivity"><i class="fas fa-briefcase"></i> Productivity Tools</a>
<a class="dropdown-item" href="/software.html#clients"><i class="fas fa-envelope"></i> Email Clients</a>
<a class="dropdown-item" href="/software.html#messaging"><i class="fas fa-random"></i> Email Alternatives</a>
<a class="dropdown-item" href="/software.html#im"><i class="fab fa-telegram-plane"></i> Instant Messenger</a>
<a class="dropdown-item" href="/software.html#voip"><i class="fas fa-phone"></i> Video & Voice Messenger</a>
<a class="dropdown-item" href="/software.html#filesharing"><i class="fas fa-file-export"></i> File Sharing</a>
<a class="dropdown-item" href="/software.html#mycloud"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a>
<a class="dropdown-item" href="/software.html#sync"><i class="fas fa-copy"></i> Secure File Sync</a>
<a class="dropdown-item" href="/software.html#pw"><i class="fas fa-user-lock"></i> Password Manager</a>
<a class="dropdown-item" href="/software.html#calendar_contacts"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a>
<a class="dropdown-item" href="/software.html#encrypt"><i class="fas fa-lock"></i> File Encryption</a>
<a class="dropdown-item" href="/software.html#darknets"><i class="fas fa-user-secret"></i> Self-contained Networks</a>
<a class="dropdown-item" href="/software.html#notebook"><i class="far fa-sticky-note"></i> Digital Notebook</a>
<a class="dropdown-item" href="/software.html#paste"><i class="fas fa-paste"></i> Paste Services</a>
<a class="dropdown-item" href="/software.html#productivity"><i class="fas fa-briefcase"></i> Productivity Tools</a>
</div>
</li>
<li class="nav-item dropdown">
@ -77,31 +73,25 @@
OS
</a>
<div class="dropdown-menu" aria-labelledby="osDropdown">
<a class="dropdown-item" href="{{prefix}}#os"><i class="fas fa-th-large"></i> PC OS</a>
<a class="dropdown-item" href="{{prefix}}#live_os"><i class="fas fa-compact-disc"></i> Live CD OS</a>
<a class="dropdown-item" href="{{prefix}}#mobile_os"><i class="fas fa-mobile-alt"></i> Mobile OS</a>
<a class="dropdown-item" href="{{prefix}}#aaddons"><i class="fas fa-th"></i> Android Privacy Add-ons</a>
<a class="dropdown-item" href="{{prefix}}#firmware"><i class="fas fa-signal"></i> Router Firmware</a>
<a class="dropdown-item" href="{{prefix}}#win10"><i class="far fa-thumbs-down"></i> Don't use Windows 10</a>
<a class="dropdown-item" href="/os.html#os"><i class="fas fa-th-large"></i> PC OS</a>
<a class="dropdown-item" href="/os.html#live_os"><i class="fas fa-compact-disc"></i> Live CD OS</a>
<a class="dropdown-item" href="/os.html#mobile_os"><i class="fas fa-mobile-alt"></i> Mobile OS</a>
<a class="dropdown-item" href="/os.html#aaddons"><i class="fas fa-th"></i> Android Privacy Add-ons</a>
<a class="dropdown-item" href="/os.html#firmware"><i class="fas fa-signal"></i> Router Firmware</a>
<a class="dropdown-item" href="/os.html#win10"><i class="far fa-thumbs-down"></i> Don't use Windows 10</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="{{prefix}}#participate">Participate</a>
<a class="nav-link" href="/index.html#participate">Participate</a>
</li>
</ul>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="https://social.privacytools.io/"><i class="fas fa-retweet text-danger"></i> Mastodon</a>
</li>
{% if page.active_page == "donate" %}
<li class="nav-item active">
<a class="nav-link" href="#">Donate <i class="fas fa-heart text-danger"></i></a>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="donate.html">Donate <i class="fas fa-heart text-danger"></i></a>
<a class="nav-link" href="/donate.html">Donate <i class="fas fa-heart text-danger"></i></a>
</li>
{% endif %}
</ul>
</div>
</div>

17
browsers.html Normal file
View File

@ -0,0 +1,17 @@
---
layout: default
---
<div class="container" role="main">
{% 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 %}
</div>

View File

@ -3,78 +3,14 @@ layout: default
---
<div class="container" role="main">
<script>
if (window.location == 'http://localhost:4000/#vpn-test') {
window.location = 'http://localhost:4000/donate.html';
}
</script>
{% 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 %}

19
os.html Normal file
View File

@ -0,0 +1,19 @@
---
layout: default
---
<div class="container" role="main">
{% 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 %}
</div>

27
providers.html Normal file
View File

@ -0,0 +1,27 @@
---
layout: default
---
<div class="container" role="main">
{% 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 %}
</div>

35
software.html Normal file
View File

@ -0,0 +1,35 @@
---
layout: default
---
<div class="container" role="main">
{% 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 %}
</div>