From d0fb06a7b90b2e83b26538dfd604de9c536c29fd Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Mon, 7 Feb 2022 14:14:09 +0100
Subject: [PATCH 1/7] Tweak index, PM and SPN page
- insert missing hrefs
- remove buttons
- put in correct text
- add info banner
---
_includes/header.html | 2 +-
index.html | 26 +++++------
portmaster/index.html | 73 ++++++++++++++----------------
spn/index.html | 103 +++++++++++++++++++++++++-----------------
4 files changed, 110 insertions(+), 94 deletions(-)
diff --git a/_includes/header.html b/_includes/header.html
index 1c2ac7d..d6ac179 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -12,7 +12,7 @@
Without privacy there is no freedom of press, no freedom of speech,
not even freedom of thought.
</p>
- <a class="btn-secondary" href="#">Take back your freedom</a>
+ <a class="btn-secondary" href="{{ site.portmaster_url }}">Take back your freedom</a>
</div>
<div class="header-one-right">
<img class="max-w-2xl" src="{{ site.img_url }}freedom.gif" alt="">
diff --git a/index.html b/index.html
index 06b060c..c5f4509 100644
--- a/index.html
+++ b/index.html
@@ -19,11 +19,11 @@ title: Safing - Love Freedom
Monitor All Network Activity
</h2>
<p class="showcase-right-desc">
- Discover everything that is happening on your computer. Expose every
- connection your applications make and detect evil ones. Finally get
- the power to act accordingly.
+ Discover everything that is happening on your computer. Expose every
+ connection your applications make and detect evil ones. Finally get
+ the power to act accordingly.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
+ <a class="btn-secondary" href="{{ site.portmaster_url }}">Discover the portmaster</a>
</div>
</div>
<div class="showcase-container">
@@ -40,10 +40,10 @@ title: Safing - Love Freedom
</h2>
<p class="showcase-right-desc">
Protect your whole computer, not just your browser. Block all
- advertisements and trackers for every application. Easily add
- your own rules and block individual domains.
+ advertisements and trackers for every application. Easily add
+ your own rules and block individual domains.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
+ <a class="btn-secondary" href="{{ site.portmaster_url }}">Discover the portmaster</a>
</div>
</div>
<div class="showcase-container-reverse">
@@ -59,12 +59,12 @@ title: Safing - Love Freedom
Set Global & per‑App Settings
</h2>
<p class="showcase-right-desc">
- Make your own rules. Completely cut off applications from the
- Internet. Or block all p2p connections except for certain apps.
- Or never connect to specific countries. The Portmaster has you
- covered.
+ Make your own rules. Completely cut off applications from the
+ Internet. Or block all p2p connections except for certain apps.
+ Or never connect to specific countries. The Portmaster has you
+ covered.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
+ <a class="btn-secondary" href="{{ site.portmaster_url }}">Discover the portmaster</a>
</div>
</div>
@@ -96,4 +96,4 @@ title: Safing - Love Freedom
<a class="btn-secondary" href="{{ site.video_url }}">Videos</a>
</div>
</div>
-</section>
\ No newline at end of file
+</section>
diff --git a/portmaster/index.html b/portmaster/index.html
index d98a275..b623d98 100644
--- a/portmaster/index.html
+++ b/portmaster/index.html
@@ -7,7 +7,8 @@ redirect_from:
---
<div class="alert-primary rounded-none text-md">
- <span>Portmaster is Alpha Software - expect hickups here and there</span>
+ <i class="icon-info"></i>
+ <span>Portmaster is Alpha Software - expect hiccups here and there</span>
</div>
<header class="header-two-container">
<div class="header-two-top">
@@ -56,9 +57,9 @@ redirect_from:
Monitor All Network Activity
</h2>
<p class="showcase-right-desc">
- Discover everything that is happening on your computer. Expose every
- connection your applications make and detect evil ones. Finally get
- the power to act accordingly.
+ Discover everything that is happening on your computer. Expose every
+ connection your applications make and detect evil ones. Finally get
+ the power to act accordingly.
</p>
</div>
</div>
@@ -72,11 +73,11 @@ redirect_from:
<span>Alpha Software: Portmaster is in active development</span>
</div>
<h2 class="showcase-right-title" style="max-width: 350px;">
- Block Unwanted Connections
+ Block Unwanted Connections
</h2>
<p class="showcase-right-desc">
- Many programs connect to the Internet without your knowledge. When you
- find unwanted connections, you can now simply block them.
+ Many programs connect to the Internet without your knowledge. When you
+ find unwanted connections, you can now simply block them.
</p>
</div>
</div>
@@ -90,12 +91,12 @@ redirect_from:
<span>Alpha Software: Portmaster is in active development</span>
</div>
<h2 class="showcase-right-title" style="max-width: 450px;">
- Auto-Block via Selected Filter Lists
+ Auto-Block via Selected Filter Lists
</h2>
<p class="showcase-right-desc">
- Automatically block ads, trackers and malware hosts via trusted domain-lists,
- which are also used by Ad-Blockers, etc. Easily change the defaults to fit
- your needs.
+ Automatically block ads, trackers and malware hosts via trusted domain-lists,
+ which are also used by Ad-Blockers, etc. Easily change the defaults to fit
+ your needs.
</p>
</div>
</div>
@@ -109,12 +110,12 @@ redirect_from:
<span>Alpha Software: Portmaster is in active development</span>
</div>
<h2 class="showcase-right-title" style="max-width: 350px;">
- Enforce Secure DNS
+ Enforce Secure DNS
</h2>
<p class="showcase-right-desc">
- Even with invasive connections gone, you do not want to share your dns requests
- out in the open. With the Portmaster, you can easily re-route all your dns
- queries to a DNS-over-TLS provider of your choice.
+ Even with invasive connections gone, you do not want to share your dns requests
+ out in the open. With the Portmaster, you can easily re-route all your dns
+ queries to a DNS-over-TLS provider of your choice.
</p>
</div>
</div>
@@ -128,16 +129,16 @@ redirect_from:
<span>Alpha Software: Portmaster is in active development</span>
</div>
<h2 class="showcase-right-title" style="max-width: 350px;">
- Explore the Docs and Source Code
+ Explore the Docs and Source Code
</h2>
<p class="showcase-right-desc">
- In the age of Mass Surveillance, what good is a service when you cannot see what
- it is really doing? We believe in open source. We also document everything
- as good as we can.
+ In the age of Mass Surveillance, what good is a service when you cannot see what
+ it is really doing? We believe in open source. We also document everything
+ as good as we can.
</p>
<div class="col-container w-full text-left md:text-center lg:w-max lg:text-left">
- <a class="btn-secondary" href="#">Checkout the docs</a>
- <a class="btn-tertiary hover-opacity-out" href="#"><i class="icon-github text-md mr-2"></i>Inspect source code</a>
+ <a class="btn-secondary" href="{{ site.docs_url }}">Checkout the docs</a>
+ <a class="btn-tertiary hover-opacity-out" href="{{ site.github_url }}/portmaster"><i class="icon-github text-md mr-2"></i>Inspect source code</a>
</div>
</div>
</div>
@@ -151,14 +152,13 @@ redirect_from:
<span>Alpha Software: Portmaster is in active development</span>
</div>
<h2 class="showcase-right-title" style="max-width: 550px;">
- Configure Settings for Different Networks
+ Configure Settings for Different Networks
</h2>
<p class="showcase-right-desc">
- The Wi-Fi in your local coffee shop is riskier than yours at home. Set up your
- settings for different networks and then simply press a button when changing
+ The Wi-Fi in your local coffee shop is riskier than yours at home. Set up your
+ settings for different networks and then simply press a button when changing
location. All settings will adjust immediately
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
</div>
</div>
<div class="showcase-container-reverse">
@@ -174,16 +174,15 @@ redirect_from:
Set Global & per‑App Settings
</h2>
<p class="showcase-right-desc">
- Make your own rules. Completely cut off applications from the
- Internet. Or block all p2p connections except for certain apps.
- Or never connect to specific countries. The Portmaster has you
- covered.
+ Make your own rules. Completely cut off applications from the
+ Internet. Or block all p2p connections except for certain apps.
+ Or never connect to specific countries. The Portmaster has you
+ covered.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
</div>
</div>
<div class="download-container" id="download">
- <h2 class="download-container-title">
+ <h2 class="download-container-title" id="downloads">
Download
</h2>
<div class="alert-primary max-w-3xl mx-auto">
@@ -194,10 +193,10 @@ redirect_from:
<a class="btn-secondary" href="{{ site.download_windows_url }}"><i class="icon-windows text-md mr-2"></i>Windows 10 + 11</a>
<a class="btn-secondary" href="{{ site.download_linux_deb_url }}"><i class="icon-ubuntu text-md mr-2"></i>Ubuntu</a>
<a class="btn-secondary" href="{{ site.download_linux_rpm_url }}"><i class="icon-fedora text-md mr-2"></i>Fedora</a>
- <a disabled class="btn" href="#"><i class="icon-mac text-md mr-2"></i>Macos (Not supported)</a>
+ <a disabled class="btn"><i class="icon-mac text-md mr-2"></i>Macos (Not supported)</a>
</div>
<p class="download-container-extra">
- View guide and status for <a class="link-primary" href="{{ site.docs_install_windows_url }}">other Linux 2.4+ distributions</a>
+ View guide and status for <a class="link-primary" href="{{ site.docs_install_windows_url }}">Windows 7, 8</a> or <a class="link-primary" href="{{ site.docs_install_linux_url }}">other Linux 2.4+ distributions</a>
</p>
</div>
<div class="faq-container">
@@ -207,7 +206,7 @@ redirect_from:
</h2>
<p class="faq-container-top-desc">
You have a question? We answered some already, but you
- can always contact us at <a class="link-primary" href="">hello@safing.io</a>
+ can always contact us at <a class="link-primary" href="mailto:hello@safing.io">hello@safing.io</a>
</p>
</div>
<div class="faq-container-bottom">
@@ -257,13 +256,11 @@ redirect_from:
<input class="card-input-toggle" id="card-toggle-anchor-0" type="checkbox">
<div class="card-dropdown-toggle">
<div class="card-dropdown-content">
- You can find our code on <a class="link-primary" href="">Github. The Portmaster</a>, the <a class="link-primary" href="">Portmaster UI</a>, the <a class="link-primary" href="">SPN</a>, the <a class="link-primary" href="">docs</a>
- and <a class="link-primary" href="">this website</a> have their respective repositories. <a class="link-primary" href="">Jess</a>, the heart of the SPN, which
- got audited by Cure53, can also be found online.
+ You can find our code on <a href="{{ site.github_url }}" class="link-primary">Github</a>. <a href="{{ site.github_url }}/portmaster/" class="link-primary">The Portmaster</a>, the <a href="{{ site.github_url }}/portmaster-ui/" class="link-primary">Portmaster UI</a>, the <a href="{{ site.github_url }}/spn/" class="link-primary">SPN</a>, the <a href="{{ site.github_url }}/docs/" class="link-primary">docs</a> and <a href="{{ site.github_url }}/web/" class="link-primary">this website</a> have their respective repositories. <a href="{{ site.github_url }}/jess/" class="link-primary">Jess</a>, the heart of the SPN, which got <a href="https://cure53.de/pentest-report_safing-jess.pdf">audited by Cure53</a>, can also be found online.
</div>
</div>
</div>
</div>
</div>
</div>
-</section>
\ No newline at end of file
+</section>
diff --git a/spn/index.html b/spn/index.html
index 8a3e45c..b23730c 100644
--- a/spn/index.html
+++ b/spn/index.html
@@ -4,11 +4,16 @@ layout: page
---
<div class="alert-primary rounded-none text-md">
- <a data-method="get" href="https://account.safing.io/spn-reaches-alpha">
- <span class="w-auto text-sm">SPN reached "Alpha". To celebrate, all customers can <span class="underline">use the SPN for FREE</span> in December 🎉</span>
+ <a data-method="get" href="https://docs.safing.io/spn/alpha/status">
+ <i class="icon-info text-md"></i>
+ <span>
+ SPN is in "Alpha". View
+ <span class="underline">what to expect</span>
+ from current speeds and features
+ </span>
</a>
</div>
-<header class="header-one-container-reverse mt-40">
+<header class="header-one-container-reverse my-40">
<div class="header-one-left pl-12">
<h1 class="header-one-left-title lg:max-w-md">
Safing Privacy Network
@@ -27,8 +32,8 @@ layout: page
<span style="font-size: 12rem; font-weight: 800; margin-top: -5rem; margin-left: 6rem; z-index: -1;" class="absolute transform scale-50 lg:scale-125">
<img src="{{ site.img_url }}shapes/circle-md.png" alt="">
</span>
- <video class="max-w-2xl" preload="auto"
- src="{{ site.assets_server_url }}spn/feature-tour.mp4"
+ <video class="max-w-2xl" preload="auto"
+ src="{{ site.assets_server_url }}spn/feature-tour.mp4"
poster="{{ site.assets_server_url }}spn/feature-tour-poster.png"
controls>
</video>
@@ -36,7 +41,7 @@ layout: page
<img src="{{ site.img_url }}shapes/circle-sm.png" alt="">
</span>
</div>
-</header>
+</header>
<section class="section-container">
<div class="intro-container mt-32">
<h2 class="intro-container-title">
@@ -56,18 +61,21 @@ layout: page
<div class="showcase-right">
<div class="alert-tiny w-max pr-6 bg-safing-blue-600 ml-0 md:mx-auto">
<i class="icon-info text-md"></i>
- <span>Alpha Software: Portmaster is in active development</span>
+ <span>Alpha Software: the SPN is in active development </span>
</div>
<h2 class="showcase-right-title" style="max-width: 450px;">
- Onion Layer Encryption
+ Onion Layer Encryption
</h2>
<p class="showcase-right-desc">
- Re-route all your connections through our multi-hop network
+ Re-route all your connections through our multi-hop network
to decouple your identity from the destination. With onion-
- encryption, no single party knows who you are and where you
- are going to. Inspired by Tor.
+ encryption, no single party knows who you are and where you
+ are going to. Inspired by Tor.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
+ <a class="btn-secondary" href="{{ site.blog_url }}2020/01/22/how-the-spn-compares-to-tor/">Compare the SPN to Tor</a>
+ <a class="btn-tertiary hover-opacity-out" href="{{ site.img_url }}spn-labeled/spn-core.png">
+ View explainer-image
+ </a>
</div>
</div>
<div class="showcase-container">
@@ -77,18 +85,17 @@ layout: page
<div class="showcase-right">
<div class="alert-tiny w-max pr-6 bg-safing-blue-600 ml-0 md:mx-auto">
<i class="icon-info text-md"></i>
- <span>Alpha Software: Portmaster is in active development</span>
+ <span>Alpha Software: the SPN is in active development </span>
</div>
<h2 class="showcase-right-title" style="max-width: 450px;">
- Minimize Your Meta‑Data
+ Minimize Your Meta‑Data
</h2>
<p class="showcase-right-desc">
- With the SPN, your meta-data is stripped to a minimum.
- Abstracting even the size of outgoing packets to diminish
- what information third parties, like your ISP or the Wi-Fi
- operator of your local coffee place, can gather about you.
+ With the SPN, your meta-data is stripped to a minimum.
+ Abstracting even the size of outgoing packets to diminish
+ what information third parties, like your ISP or the Wi-Fi
+ operator of your local coffee place, can gather about you.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
</div>
</div>
<div class="showcase-container-reverse">
@@ -98,18 +105,23 @@ layout: page
<div class="showcase-right">
<div class="alert-tiny w-max pr-6 bg-safing-blue-600 ml-0 md:mx-auto">
<i class="icon-info text-md"></i>
- <span>Alpha Software: Portmaster is in active development</span>
+ <span>Alpha Software: the SPN is in active development </span>
</div>
<h2 class="showcase-right-title" style="max-width: 450px;">
Distributed Multi Identity Network
</h2>
<p class="showcase-right-desc">
- Instead of exiting all your traffic at one place, route every
- connection individually to spread your connections across the
- globe. Use vast amounts of identities (IP addresses) and limit
- your visibility in the "open" web.
+ Instead of exiting all your traffic at one place, route every
+ connection individually to spread your connections across the
+ globe. Use vast amounts of identities (IP addresses) and limit
+ your visibility in the "open" web.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
+ <a class="btn-secondary" href="{{ site.blog_url }}2020/01/22/how-the-spn-compares-to-vpns/">
+ Compare the SPN to VPNs
+ </a>
+ <a class="btn-tertiary hover-opacity-out" href="{{ site.img_url }}spn-labeled/spn-community.png">
+ View explainer-image
+ </a>
</div>
</div>
<div class="showcase-container">
@@ -119,30 +131,39 @@ layout: page
<div class="showcase-right">
<div class="alert-tiny w-max pr-6 bg-safing-blue-600 ml-0 md:mx-auto">
<i class="icon-info text-md"></i>
- <span>Alpha Software: Portmaster is in active development</span>
+ <span>Alpha Software: the SPN is in active development </span>
</div>
<h2 class="showcase-right-title" style="max-width: 450px;">
- No Kill Switch Needed
+ No Kill Switch Needed
</h2>
<p class="showcase-right-desc">
Get peace of mind instead of fearing data-leakage.
<br>
<br>
- With the open source Portmaster, all your network connections are
- intercepted at the kernel-level, putting an end to accidental data
- exposure.
+ With the open source Portmaster, all your network connections are
+ intercepted at the kernel-level, putting an end to accidental data
+ exposure.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
+ <a class="btn-secondary" href="{{ site.portmaster_url }}">Discover the portmaster</a>
</div>
</div>
- <div class="packages-container">
+ <div class="packages-container" id="pricing">
+ <div class="alert-primary">
+ <a data-method="get" href="{{ site.spn_alpha_status_page_url }}">
+ <span>
+ SPN is in "Alpha". View
+ <span class="underline">what to expect</span>
+ from current speeds and features
+ </span>
+ </a>
+ </div>
+
<div class="packages-container-top">
<h2 class="packages-container-top-title">
- Pre-Order the SPN
+ Protect Your Connections Today
</h2>
<p class="packages-container-top-desc">
- Lock in the lower prices forever and join the waitlist to
- become one of the first SPN users.
+ Subscribe to the SPN and lock in the lower Alpha prices forever.
</p>
</div>
<div class="packages-container-bottom">
@@ -162,7 +183,7 @@ layout: page
<span class="card-package-middle-includes-feature"> 17% off compared to Beta-Prices </span>
</div>
<div class="card-package-bottom">
- <a class="btn-secondary w-full justify-center" href="#">Pre-Order</a>
+ <a class="btn-secondary w-full justify-center" href="{{ site.account_server_url }}plans/1/subscribe">Subscribe</a>
</div>
</div>
<div class="card-package">
@@ -181,7 +202,7 @@ layout: page
<span class="card-package-middle-includes-feature"> 30% off compared to Beta-Prices </span>
</div>
<div class="card-package-bottom">
- <a class="btn-secondary w-full justify-center" href="#">Pre-Order</a>
+ <a class="btn-secondary w-full justify-center" href="{{ site.account_server_url }}plans/2/subscribe">Subscribe</a>
</div>
</div>
</div>
@@ -193,7 +214,7 @@ layout: page
</h2>
<p class="faq-container-top-desc">
You have a question? We answered some already, but you
- can always contact us at <a class="link-primary" href="">hello@safing.io</a>
+ can always contact us at <a class="link-primary" href="mailto:hello@safing.io">hello@safing.io</a>
</p>
</div>
<div class="faq-container-bottom">
@@ -243,13 +264,11 @@ layout: page
<input class="card-input-toggle" id="card-toggle-anchor-0" type="checkbox">
<div class="card-dropdown-toggle">
<div class="card-dropdown-content">
- You can find our code on <a class="link-primary" href="">Github. The Portmaster</a>, the <a class="link-primary" href="">Portmaster UI</a>, the <a class="link-primary" href="">SPN</a>, the <a class="link-primary" href="">docs</a>
- and <a class="link-primary" href="">this website</a> have their respective repositories. <a class="link-primary" href="">Jess</a>, the heart of the SPN, which
- got audited by Cure53, can also be found online.
+ You can find our code on <a href="{{ site.github_url }}" class="link-primary">Github</a>. <a href="{{ site.github_url }}/portmaster/" class="link-primary">The Portmaster</a>, the <a href="{{ site.github_url }}/portmaster-ui/" class="link-primary">Portmaster UI</a>, the <a href="{{ site.github_url }}/spn/" class="link-primary">SPN</a>, the <a href="{{ site.github_url }}/docs/" class="link-primary">docs</a> and <a href="{{ site.github_url }}/web/" class="link-primary">this website</a> have their respective repositories. <a href="{{ site.github_url }}/jess/" class="link-primary">Jess</a>, the heart of the SPN, which got <a href="https://cure53.de/pentest-report_safing-jess.pdf">audited by Cure53</a>, can also be found online.
</div>
</div>
</div>
</div>
</div>
</div>
-</section>
\ No newline at end of file
+</section>
From a235197b552d262c36fce2b9108209a01de3b0ca Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Mon, 7 Feb 2022 16:20:00 +0100
Subject: [PATCH 2/7] Outsource source code faq to shared file
gets repeated too often so it makes sense to DRY it up
---
_includes/source_code_faq.html | 28 ++++++++++++++++++++++++++++
portmaster/index.html | 23 +----------------------
spn/index.html | 22 +---------------------
support/index.html | 26 ++------------------------
4 files changed, 32 insertions(+), 67 deletions(-)
create mode 100644 _includes/source_code_faq.html
diff --git a/_includes/source_code_faq.html b/_includes/source_code_faq.html
new file mode 100644
index 0000000..8a1c5ea
--- /dev/null
+++ b/_includes/source_code_faq.html
@@ -0,0 +1,28 @@
+{% if include.faq_id %}
+ {% assign faq_id = include.faq_id %}
+{% else %}
+ {% assign faq_id = "0" %}
+{% endif %}
+
+<div class="faq-container-bottom-question">
+ <div class="card-faq hover-scale-out">
+ <label class="card-label" for="card-toggle-anchor-{{ faq_id }}">
+ <div class="wrapper-left">
+ <div class="card-title">
+ <h3 class="title">
+ Where can I find your source code?
+ </h3>
+ </div>
+ </div>
+ <div class="wrapper-right">
+ <i class="icon-arrow"></i>
+ </div>
+ </label>
+ <input class="card-input-toggle" id="card-toggle-anchor-{{ faq_id }}" type="checkbox">
+ <div class="card-dropdown-toggle">
+ <div class="card-dropdown-content">
+ You can find our code on <a href="{{ site.github_url }}" class="link-primary">Github</a>. <a href="{{ site.github_url }}/portmaster/" class="link-primary">The Portmaster</a>, the <a href="{{ site.github_url }}/portmaster-ui/" class="link-primary">Portmaster UI</a>, the <a href="{{ site.github_url }}/spn/" class="link-primary">SPN</a>, the <a href="{{ site.github_url }}/docs/" class="link-primary">docs</a> and <a href="{{ site.github_url }}/web/" class="link-primary">this website</a> have their respective repositories. <a href="{{ site.github_url }}/jess/" class="link-primary">Jess</a>, the heart of the SPN, which got <a href="https://cure53.de/pentest-report_safing-jess.pdf">audited by Cure53</a>, can also be found online.
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/portmaster/index.html b/portmaster/index.html
index b623d98..0ecb0f7 100644
--- a/portmaster/index.html
+++ b/portmaster/index.html
@@ -239,28 +239,7 @@ redirect_from:
</div>
</div>
{% endfor %}
- <div class="faq-container-bottom-question">
- <div class="card-faq hover-scale-out">
- <label class="card-label" for="card-toggle-anchor-0">
- <div class="wrapper-left">
- <div class="card-title">
- <h3 class="title">
- Where can I find your source code?
- </h3>
- </div>
- </div>
- <div class="wrapper-right">
- <i class="icon-arrow"></i>
- </div>
- </label>
- <input class="card-input-toggle" id="card-toggle-anchor-0" type="checkbox">
- <div class="card-dropdown-toggle">
- <div class="card-dropdown-content">
- You can find our code on <a href="{{ site.github_url }}" class="link-primary">Github</a>. <a href="{{ site.github_url }}/portmaster/" class="link-primary">The Portmaster</a>, the <a href="{{ site.github_url }}/portmaster-ui/" class="link-primary">Portmaster UI</a>, the <a href="{{ site.github_url }}/spn/" class="link-primary">SPN</a>, the <a href="{{ site.github_url }}/docs/" class="link-primary">docs</a> and <a href="{{ site.github_url }}/web/" class="link-primary">this website</a> have their respective repositories. <a href="{{ site.github_url }}/jess/" class="link-primary">Jess</a>, the heart of the SPN, which got <a href="https://cure53.de/pentest-report_safing-jess.pdf">audited by Cure53</a>, can also be found online.
- </div>
- </div>
- </div>
- </div>
+ {% include source_code_faq.html %}
</div>
</div>
</section>
diff --git a/spn/index.html b/spn/index.html
index b23730c..1035cc4 100644
--- a/spn/index.html
+++ b/spn/index.html
@@ -247,27 +247,7 @@ layout: page
</div>
</div>
{% endfor %}
- <div class="faq-container-bottom-question">
- <div class="card-faq hover-scale-out">
- <label class="card-label" for="card-toggle-anchor-0">
- <div class="wrapper-left">
- <div class="card-title">
- <h3 class="title">
- Where can I find your source code?
- </h3>
- </div>
- </div>
- <div class="wrapper-right">
- <i class="icon-arrow"></i>
- </div>
- </label>
- <input class="card-input-toggle" id="card-toggle-anchor-0" type="checkbox">
- <div class="card-dropdown-toggle">
- <div class="card-dropdown-content">
- You can find our code on <a href="{{ site.github_url }}" class="link-primary">Github</a>. <a href="{{ site.github_url }}/portmaster/" class="link-primary">The Portmaster</a>, the <a href="{{ site.github_url }}/portmaster-ui/" class="link-primary">Portmaster UI</a>, the <a href="{{ site.github_url }}/spn/" class="link-primary">SPN</a>, the <a href="{{ site.github_url }}/docs/" class="link-primary">docs</a> and <a href="{{ site.github_url }}/web/" class="link-primary">this website</a> have their respective repositories. <a href="{{ site.github_url }}/jess/" class="link-primary">Jess</a>, the heart of the SPN, which got <a href="https://cure53.de/pentest-report_safing-jess.pdf">audited by Cure53</a>, can also be found online.
- </div>
- </div>
- </div>
+ {% include source_code_faq.html %}
</div>
</div>
</div>
diff --git a/support/index.html b/support/index.html
index c5a37dd..2923c06 100644
--- a/support/index.html
+++ b/support/index.html
@@ -78,30 +78,7 @@ layout: page
</div>
</div>
{% endfor %}
- <div class="faq-container-bottom-question">
- <div class="card-faq hover-scale-out">
- <label class="card-label" for="card-toggle-anchor-portmaster-0">
- <div class="wrapper-left">
- <div class="card-title">
- <h3 class="title">
- Where can I find your source code?
- </h3>
- </div>
- </div>
- <div class="wrapper-right">
- <i class="icon-arrow"></i>
- </div>
- </label>
- <input class="card-input-toggle" id="card-toggle-anchor-portmaster-0" type="checkbox">
- <div class="card-dropdown-toggle">
- <div class="card-dropdown-content">
- You can find our code on <a class="link-primary" href="">Github. The Portmaster</a>, the <a class="link-primary" href="">Portmaster UI</a>, the <a class="link-primary" href="">SPN</a>, the <a class="link-primary" href="">docs</a>
- and <a class="link-primary" href="">this website</a> have their respective repositories. <a class="link-primary" href="">Jess</a>, the heart of the SPN, which
- got audited by Cure53, can also be found online.
- </div>
- </div>
- </div>
- </div>
+ {% include source_code_faq.html %}
</div>
</div>
<div class="space-y-36" id="portmaster">
@@ -166,6 +143,7 @@ layout: page
</div>
</div>
{% endfor %}
+ {% include source_code_faq.html faq_id='spn-0'%}
</div>
</div>
</section>
From 019e2022e4cd47f8ee27095aee487de59f04c873 Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Mon, 7 Feb 2022 16:33:59 +0100
Subject: [PATCH 3/7] Clean up support page
---
support/index.html | 54 ++++++++++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/support/index.html b/support/index.html
index 2923c06..2248e34 100644
--- a/support/index.html
+++ b/support/index.html
@@ -11,8 +11,8 @@ layout: page
What do you need help with?
</p>
<div class="col-container-center w-full md:w-max text-center md:text-left">
- <a class="btn-secondary" href="{{ site.download_windows_url }}"><i class="icon-windows text-md mr-2"></i>Windows 10 + 11</a>
- <a class="btn-secondary" href="{{ site.download_linux_deb_url }}"><i class="icon-ubuntu text-md mr-2"></i>Ubuntu</a>
+ <a class="btn-secondary" href="#portmaster">Portmaster</a>
+ <a class="btn-secondary" href="#spn">SPN</a>
</div>
</div>
<div class="space-y-36" id="portmaster">
@@ -28,15 +28,23 @@ layout: page
always ask for more help on our subreddit or via mail.
</p>
<div class="alert-primary">
- <i class="icon-twitter text-xs"></i>
- <span>Portmaster is Alpha Software, treat as such; expect bugs here and there. Early Adopters welcome.</span>
+ <i class="icon-info text-md"></i>
+ <span> Portmaster is Alpha Software, thanks for being an Early Adopter. Bug reports are appreciated.</span>
</div>
</div>
<div class="col-container-center w-full md:w-max text-center md:text-left">
- <a class="btn-secondary" href="{{ site.download_windows_url }}"><i class="icon-windows text-md mr-2"></i>Windows 10 + 11</a>
- <a class="btn-secondary" href="{{ site.download_linux_deb_url }}"><i class="icon-ubuntu text-md mr-2"></i>Ubuntu</a>
- <a class="btn-secondary" href="{{ site.download_linux_rpm_url }}"><i class="icon-fedora text-md mr-2"></i>Fedora</a>
- <a disabled class="btn" href="#"><i class="icon-mac text-md mr-2"></i>Macos (Not supported)</a>
+ <a class="btn-secondary" href="{{ site.docs_url }}"">
+ View Documentation
+ </a>
+ <a href="{{ site.docs_url }}portmaster/guides/contribute#report-bugs-suggest-features-and-improvements" class="btn-secondary"">
+ Report Issue
+ </a>
+ <a class="btn-secondary" href="{{ site.reddit_url }}"">
+ Ask On Reddit
+ </a>
+ <a class="btn-secondary" href="mailto:support@safing.io"">
+ Contact us
+ </a>
</div>
</div>
<div class="faq-container">
@@ -45,7 +53,7 @@ layout: page
FAQ
</h2>
<p class="faq-container-top-desc">
- Have a question? Check out some we already answered below. You can always reach out to us to find out more or just to say hi.
+ Have a question? Check out some we already answered below. You can always reach out to us to find out more or just to say hi.
</p>
</div>
<div class="faq-container-bottom">
@@ -81,27 +89,27 @@ layout: page
{% include source_code_faq.html %}
</div>
</div>
- <div class="space-y-36" id="portmaster">
+ <div class="space-y-36" id="spn">
<div class="download-container">
<h2 class="download-container-title">
- Safing Privacy Network
+ Safing Privacy Network
</h2>
<div class="alert-primary max-w-3xl mx-auto">
- <i class="icon-twitter text-xs"></i>
+ <i class="icon-info text-md"></i>
<span>
- If you want to know more about the technology, visit
- <a class="link" href="{{ site.spn_url }}">the SPN page</a>,
- <a class="link" href="{{ site.kickstarter_url }}">the Kickstarter</a>
- or
- <a class="link" href="{{ site.whitepaper_url }}">read our Whitepaper</a>.
- Otherwise, feel free to contact us with any matter or request you might have.
+ The SPN is Alpha Software, thanks for being an Early Supporter. Always feel free to reach out.
</span>
</div>
<div class="col-container-center w-full md:w-max text-center md:text-left">
- <a class="btn-secondary" href="{{ site.download_windows_url }}"><i class="icon-windows text-md mr-2"></i>Windows 10 + 11</a>
- <a class="btn-secondary" href="{{ site.download_linux_deb_url }}"><i class="icon-ubuntu text-md mr-2"></i>Ubuntu</a>
- <a class="btn-secondary" href="{{ site.download_linux_rpm_url }}"><i class="icon-fedora text-md mr-2"></i>Fedora</a>
- <a disabled class="btn" href="#"><i class="icon-mac text-md mr-2"></i>Macos (Not supported)</a>
+ <a class="btn-secondary" href="{{ site.github_url }}/spn">
+ View SPN Repository
+ </a>
+ <a class="btn-secondary" href="{{ site.reddit_url }}">
+ Ask on Reddit
+ </a>
+ <a class="btn-secondary" href="mailto:support@safing.io">
+ Contact us
+ </a>
</div>
</div>
<div class="faq-container">
@@ -110,7 +118,7 @@ layout: page
FAQ
</h2>
<p class="faq-container-top-desc">
- Have a question? Check out some we already answered below. You can always reach out to us to find out more or just to say hi.
+ Have a question? Check out some we already answered below. You can always reach out to us to find out more or just to say hi.
</p>
</div>
<div class="faq-container-bottom">
From 6079e4cac57b4a0685438e927bb584f6f8cd26e1 Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Thu, 10 Feb 2022 09:43:01 +0100
Subject: [PATCH 4/7] Correct links and some text
---
_layouts/blog.html | 2 +-
business-model/index.html | 2 +-
ownership/index.html | 7 ++++---
video/index.html | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/_layouts/blog.html b/_layouts/blog.html
index bc50a4a..2c11abe 100644
--- a/_layouts/blog.html
+++ b/_layouts/blog.html
@@ -10,7 +10,7 @@ layout: page_container
</p>
{% endif %}
<span class="header-four-container-title-author">
- May 6, 2021 • Written by <a class="link-primary" href="/team/#david">David</a>
+ {{ page.date | date: "%B %-d, %Y" }} • Written by <a class="link-primary" href="{{ site.team_url }}#{{ page.author | slugify }}">{{ page.author | capitalize }}</a>
</span>
<div class="header-four-container-social">
<a class="link hover-opacity-in" href="{{ site.twitter_url }}"><i class="icon-twitter text-lg"></i></a>
diff --git a/business-model/index.html b/business-model/index.html
index d4186d2..c199b8d 100644
--- a/business-model/index.html
+++ b/business-model/index.html
@@ -35,7 +35,7 @@ layout: page
for our powerful VPN alternative. You get an extra service,
we get to finance ourselves.
</p>
- <a class="btn-secondary" href="#">Discover the spn</a>
+ <a class="btn-secondary" href="{{ site.spn_url }}">Discover the SPN</a>
</div>
</div>
<div class="showcase-container-reverse">
diff --git a/ownership/index.html b/ownership/index.html
index 8266266..9e12a4c 100644
--- a/ownership/index.html
+++ b/ownership/index.html
@@ -42,16 +42,17 @@ redirect_from:
have to rely on the support and trust of our users. Help us get there by
using the Portmaster and later down the road, purchasing the SPN.
</p>
- <a class="btn-secondary" href="#">Discover the portmaster</a>
+ <a class="btn-secondary" href="#influences">Explore the Details</a>
+ <a class="btn-tertiary hover-opacity-out" href="{{ site.spn_url }}#pricing">Support with a Purchase</a>
</div>
</div>
- <div class="influence-container">
+ <div class="influence-container" id="influences">
<div class="influence-container-top">
<div class="influence-container-top-title-date">
<h2 class="influence-container-top-title">
Influences
</h2>
- <span class="influence-container-top-data">updated May 2021</span>
+ <span class="influence-container-top-data">updated November 2021</span>
</div>
<p class="influence-container-top-desc">
Through these partnerships we are not only receiving funding, but
diff --git a/video/index.html b/video/index.html
index 8c4fc80..7203d10 100644
--- a/video/index.html
+++ b/video/index.html
@@ -12,7 +12,7 @@ layout: page
</h2>
<div class="blogpod-container-top-extra">
<a class="link-secondary" href="{{ site.youtube_channel_url }}">YouTube</a>
- <a class="link-secondary" href="{{ site.invidious_channel_url }}">Invidious</i></a>
+ <a class="link-secondary" href="{{ site.invidious_channel_url }}">Invidious</a>
</div>
</div>
<div class="blogpod-container-bottom">
From 87d01f540a707c351de65fa007fb1d5a6f07bd15 Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Thu, 10 Feb 2022 09:44:03 +0100
Subject: [PATCH 5/7] Swap left/right elements for ownership page
---
ownership/index.html | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/ownership/index.html b/ownership/index.html
index 9e12a4c..c92f746 100644
--- a/ownership/index.html
+++ b/ownership/index.html
@@ -6,17 +6,17 @@ redirect_from:
---
<section class="section-container">
- <div class="showcase-container-reverse mt-32">
+ <div class="showcase-container mt-32">
<div class="showcase-left" style="max-width: 1050px;">
<img src="{{ site.img_url }}page-specific/ownership/ownership.png" alt="">
</div>
<div class="showcase-right">
<h1 class="showcase-right-title" style="max-width: 450px;">
- We own Safing
+ We own Safing
</h1>
<p class="showcase-right-desc">
- We do not want parties to gain influence which do not or might not stand
- behind our values. That is why in the initial funding phase we took more
+ We do not want parties to gain influence which do not or might not stand
+ behind our values. That is why in the initial funding phase we took more
personal risks instead of selling parts of our company for easy money.
<br>
<br>
@@ -25,7 +25,7 @@ redirect_from:
<a class="btn-secondary" href="{{ site.company_agreement_url }}">View public registry</a>
</div>
</div>
- <div class="showcase-container">
+ <div class="showcase-container-reverse">
<div class="showcase-left" style="max-width: 850px;">
<img src="{{ site.img_url }}page-specific/ownership/influences.png" alt="">
</div>
@@ -34,12 +34,12 @@ redirect_from:
Financed by Grants, Loans and <span style="color: #6188ff;">You</span>
</h2>
<p class="showcase-right-desc">
- We are thankful for all the partnerships & possibilities that are emerging
+ We are thankful for all the partnerships & possibilities that are emerging
from our R&D heavy years in which we are exploring new privacy frontiers.
<br>
<br>
- Slowly but surely we are migrating into our dream scenario where we only
- have to rely on the support and trust of our users. Help us get there by
+ Slowly but surely we are migrating into our dream scenario where we only
+ have to rely on the support and trust of our users. Help us get there by
using the Portmaster and later down the road, purchasing the SPN.
</p>
<a class="btn-secondary" href="#influences">Explore the Details</a>
@@ -104,4 +104,4 @@ redirect_from:
{% endfor %}
</div>
</div>
-</section>
\ No newline at end of file
+</section>
From 7fc0d07ecc9ef1f47de14d56dd1b7ce2e8822838 Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Thu, 10 Feb 2022 09:44:42 +0100
Subject: [PATCH 6/7] Configure top/bottom padding for section containers
---
_includes/header.html | 2 +-
_sass/prebuilt/section-container/default.scss | 10 +++----
business-model/index.html | 26 +++++++++----------
portmaster/index.html | 2 +-
spn/index.html | 4 +--
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/_includes/header.html b/_includes/header.html
index d6ac179..a4c4c65 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,4 +1,4 @@
-<header class="header-one-container">
+<header class="header-one-container mb-64">
<div class="header-one-left">
<span style="margin-top: -8rem; margin-left: 14rem; z-index: -1;" class="absolute">
<img src="{{ site.img_url }}/shapes/circle-md-2.png" alt="">
diff --git a/_sass/prebuilt/section-container/default.scss b/_sass/prebuilt/section-container/default.scss
index 07476f3..327b994 100644
--- a/_sass/prebuilt/section-container/default.scss
+++ b/_sass/prebuilt/section-container/default.scss
@@ -1,11 +1,11 @@
.section-container {
- margin-top: 5rem;
- margin-bottom: 5rem;
-}
+ margin-top: 10rem;
+ margin-bottom: 16rem;
+}
.section-container > div:first-child {
margin-top: 0;
-}
+}
.section-container > div {
margin-top: 15rem;
-}
\ No newline at end of file
+}
diff --git a/business-model/index.html b/business-model/index.html
index c199b8d..ad74462 100644
--- a/business-model/index.html
+++ b/business-model/index.html
@@ -4,7 +4,7 @@ layout: page
---
<section class="space-y-80">
- <div class="showcase-container-reverse mt-32">
+ <div class="showcase-container-reverse">
<div class="showcase-left" style="max-width: 1050px;">
<img src="{{ site.img_url }}page-specific/business-model/provide-local-value-for-free-forever.png" alt="">
</div>
@@ -13,9 +13,9 @@ layout: page
Provide Local Value for Free, Forever
</h2>
<p class="showcase-right-desc">
- Everybody deserves privacy, not only the wealthy. That is why
- all local privacy features are free, and will remain so forever.
- This fits perfectly into the Freemium business model as well as
+ Everybody deserves privacy, not only the wealthy. That is why
+ all local privacy features are free, and will remain so forever.
+ This fits perfectly into the Freemium business model as well as
into FOSS, free and open source software.
</p>
<a class="btn-secondary" href="{{ site.portmaster_url }}">Discover the portmaster</a>
@@ -30,9 +30,9 @@ layout: page
Sell Protection in Transit
</h2>
<p class="showcase-right-desc">
- There is privacy that comes with a cost because it requires
- additional server bandwidth. Naturally, this is where we charge
- for our powerful VPN alternative. You get an extra service,
+ There is privacy that comes with a cost because it requires
+ additional server bandwidth. Naturally, this is where we charge
+ for our powerful VPN alternative. You get an extra service,
we get to finance ourselves.
</p>
<a class="btn-secondary" href="{{ site.spn_url }}">Discover the SPN</a>
@@ -47,13 +47,13 @@ layout: page
Reinvest Earnings into Privacy
</h2>
<p class="showcase-right-desc">
- All our income is invested into the privacy cycle: Finance amazing
- talent. Develop great, open source software - both free and paid.
+ All our income is invested into the privacy cycle: Finance amazing
+ talent. Develop great, open source software - both free and paid.
Delight users so more people join and support the cycle.
<br>
<br>
- Repeat endlessly to spread privacy to the masses; strengthening
- the Freedom of our societies.
+ Repeat endlessly to spread privacy to the masses; strengthening
+ the Freedom of our societies.
</p>
</div>
</div>
@@ -66,8 +66,8 @@ layout: page
Clear Ownership & Transparent Funding
</h2>
<p class="showcase-right-desc">
- Taking money always means opening up to influences. Therefore, we see it as
- our duty to not only be open about our ownership, but also about how we
+ Taking money always means opening up to influences. Therefore, we see it as
+ our duty to not only be open about our ownership, but also about how we
financed our journey so far.
</p>
<a class="btn-secondary" href="{{ site.ownership_url }}">Explore our influences</a>
diff --git a/portmaster/index.html b/portmaster/index.html
index 0ecb0f7..5403efe 100644
--- a/portmaster/index.html
+++ b/portmaster/index.html
@@ -10,7 +10,7 @@ redirect_from:
<i class="icon-info"></i>
<span>Portmaster is Alpha Software - expect hiccups here and there</span>
</div>
-<header class="header-two-container">
+<header class="header-two-container mb-64">
<div class="header-two-top">
<h1 class="header-two-top-title">
Take Back Control of Your Computer
diff --git a/spn/index.html b/spn/index.html
index 1035cc4..11eb3f7 100644
--- a/spn/index.html
+++ b/spn/index.html
@@ -13,7 +13,7 @@ layout: page
</span>
</a>
</div>
-<header class="header-one-container-reverse my-40">
+<header class="header-one-container-reverse mb-64">
<div class="header-one-left pl-12">
<h1 class="header-one-left-title lg:max-w-md">
Safing Privacy Network
@@ -148,7 +148,7 @@ layout: page
</div>
</div>
<div class="packages-container" id="pricing">
- <div class="alert-primary">
+ <div class="alert-primary mb-20">
<a data-method="get" href="{{ site.spn_alpha_status_page_url }}">
<span>
SPN is in "Alpha". View
From f5effaf1f67b30164d77f33d03ab9e12d37b2b22 Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Thu, 10 Feb 2022 09:45:05 +0100
Subject: [PATCH 7/7] Improve link in faq
---
_data/faq.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_data/faq.yml b/_data/faq.yml
index b43887a..6ce8278 100644
--- a/_data/faq.yml
+++ b/_data/faq.yml
@@ -13,7 +13,7 @@ spn:
a: The SPN is heavily inspired by Tor, but the mission is different. Next to tightly integrating with other privacy modules, the main focus of the SPN is easy protection for your whole computer, not just your browser. Additionally it spreads your connections across the globe instead of routing everything through the same circuit.
link:
text: Read our comparison blog to find out more.
- url: https://safing.io/blog/2020/01/22/how-the-spn-compares-to-tor/
+ url: /blog/2020/01/22/how-the-spn-compares-to-tor/
- q: How does the SPN compare to VPNs?
a: The VPN technology was built to securely connect two company locations. However, the SPN was developed from the ground up to protect user privacy. As a result the SPN can easily outperform VPNs in every aspect.
link: