re-write the /https page

1 files changed, 32 insertions, 21 deletions

diff --git a/templates/public/https.html b/templates/public/https.html
index 0d54c6c0..df3e2c73 100644
--- a/templates/public/https.html
+++ b/templates/public/https.html
@@ -3,36 +3,47 @@
 {% block title %}{{ BRANDING_DISTRONAME }} - HTTPS Only site{% endblock %}
 {% block content %}
 <div class="box">
-    <h2 class="title">{{ BRANDING_DISTRONAME }}</h2>
+    <h2 class="title">This is the unsecure version of the website</h2>
 
     <p>Hi! This is not the main site. You're seeing this message because you
     entered our website without using a secure connection. We like privacy for
-    all so we've decided to serve our website only through secure channels.</p>
+    all so we've decided to serve our website only through secure channels. This
+    is the <em>only</em> page on the whole site that can be accessed without a
+    secure connection, all other pages will redirect to the secure version.</p>
 
-    <p>The website uses SSL certificates issued by <a
-    href="http://cacert.org">CACert</a>. Some web browsers or systems still
-    don't provide CACert's root certificate, so if you find a huge error
-    message telling you're about to do something bad, come back here and keep
-    reading.</p>
+    <h2><a href="https://parabolagnulinux.org">Enter the secure site</a></h2>
 
-    <p><a href="https://parabolagnulinux.org">Parabola GNU/Linux-libre</a></p>
+    <h3>But my browser says the secure site is untrusted</h3>
 
-    <h3>I just want to get the ISOs</h3>
+    <p>This website's certificate issued by
+    <a href="http://cacert.org">CAcert</a>. Some web browsers or operating
+    systems still don't provide CAcert's root certificate, so if you find a huge
+    error message telling you're about to do something bad, come back here and
+    keep reading.</p>
 
-    <p>You can proceed to our <a
-    href="{% wiki_url 'get' %}">ISOs download page</a> on <a
-    href="{% wiki_url %}">our wiki</a>.</p>
+    <h4>Installing CAcert's root certificate</h4>
 
-    <h3>I want to do this the right way</h3>
-
-    <p>Ask your distribution to <a
-    href="http://wiki.cacert.org/InclusionStatus" title="CACert's inclusion
-    status">include</a> CACert's root certificates.</p>
+    <p>You should ask your web browser or operating system to
+    <a href="http://wiki.cacert.org/InclusionStatus">include</a> CAcert's root
+    certificates.</p>
     
-    <p>Alternatively, <a
-    href="http://www.cacert.org/index.php?id=3">install</a> the root
-    certificate in your browser. <a
-    href="http://wiki.cacert.org/BrowserClients">(more details here.)</a></p>
+    <p>You can install CAcert's root certificates yourself by
+    <a href="http://www.cacert.org/index.php?id=3">downloading</a> them and
+    following <a href="http://wiki.cacert.org/BrowserClients">these
+    instructions</a> on how to install them in your browser.</p>
+
+    <h4>But installing the certificate sounds hard/complicated/boring</h4>
+
+    <p>You could just click "Ignore", or "Add Exception", or however your
+    browser words it. But then, you wouldn't know that the site is actually
+    coming from us; there could be someone in the middle tricking you, or
+    spying on you and looking at which webpages you visit.</p>
+
+    <h2>I just want to get the installer ISOs</h2>
+
+    <p>You can proceed to our
+    <a href="{% wiki_url 'get' %}">ISOs download page</a> on
+    <a href="{% wiki_url %}">our wiki</a>.</p>
 
 </div>
 {% endblock %}