[tor-commits] [tpo/staging] Update download pages

[hiro at torproject.org]

commit 8accf15649b9572eb24dd43a7aa503e923ca4df5
Author: hiro <hiro at torproject.org>
Date:   Mon Feb 11 13:45:36 2019 +0100

    Update download pages
---
 templates/download-languages.html | 5 +++++
 templates/download-options.html   | 2 +-
 templates/download.html           | 4 ++--
 templates/home.html               | 4 ++--
 templates/homepage.html           | 8 +++++---
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/templates/download-languages.html b/templates/download-languages.html
index c882774..1a412bf 100644
--- a/templates/download-languages.html
+++ b/templates/download-languages.html
@@ -1,3 +1,8 @@
+<div class="container py-3 mt-5">
+  <div class="row">
+    <p>{{ this.body }}</p>
+  </div>
+</div>
 <div class="container py-3">
   <div class="row">
     <table class="table">
diff --git a/templates/download-options.html b/templates/download-options.html
index e8c79a7..0634f0e 100644
--- a/templates/download-options.html
+++ b/templates/download-options.html
@@ -1,6 +1,6 @@
 <div class="container py-3 mt-5">
   <div class="row">
-    <p>{{ _('Before we release a stable version of our software, we release an alpha version to test features and find bugs. Please only download an alpha if you are okay with some things not working properly, want to help us find and report bugs, and are not putting yourself at risk.') }}</p>
+    <p>{{ this.body }}</p>
   </div>
 </div>
 <div class="container py-3">
diff --git a/templates/download.html b/templates/download.html
index 2965aba..897565b 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -32,7 +32,7 @@
 </div>
 <div class="container justify-content-center mt-4">
   <div class="row justify-content-center">
-          <i class="far fa-file-alt display-5 text-primary pr-3"></i><p class="text-primary text-tpo">{{ _('Check out the <a class="mx-auto" href="https://manual.torproject.org" target="_blank"><u>manual</u></a> for more troubleshooting tips.')|safe  }}</p>
+    <i class="far fa-file-alt display-5 text-primary pr-3"></i><p class="text-primary text-tpo">{{ _('Check out the <a class="mx-auto" href="https://manual.torproject.org" target="_blank"><u>manual</u></a> for more troubleshooting tips.')|safe  }}</p>
   </div>
 </div>
 <div class="container">
@@ -40,7 +40,7 @@
 </div>
 <div class="container justify-content-center mt-4">
   <div class="row justify-content-center">
-          <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo">{{ _('Verify Tor Browser signature <a class="mx-auto" href="https://support.torproject.org/how-to-verify-signature" target="_blank"><u>here</u></a>.')|safe }}</p>
+    <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo">{{ _('Verify Tor Browser signature <a class="mx-auto" href="https://support.torproject.org/how-to-verify-signature" target="_blank"><u>here</u></a>.')|safe }}</p>
   </div>
 </div>
 <div class="container">
diff --git a/templates/home.html b/templates/home.html
index 7b04dd8..f3cebc0 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -42,8 +42,8 @@
           </div>
           <div class="col-md-8 px-3 order-2">
             <div class="card-block px-3">
-                    <h6 class="pt-3 card-title">{{ _("RESIST FINGERPRINTING") }}</h6>
-                    <p class="card-text">{{ _("Tor aims to make all users look the same making it difficult for you to be fingerprinted based on your browser and device information.") }}</p>
+              <h6 class="pt-3 card-title">{{ _("RESIST FINGERPRINTING") }}</h6>
+              <p class="card-text">{{ _("Tor aims to make all users look the same making it difficult for you to be fingerprinted based on your browser and device information.") }}</p>
             </div>
           </div>
         </div>
diff --git a/templates/homepage.html b/templates/homepage.html
index 0cf56f1..e998929 100644
--- a/templates/homepage.html
+++ b/templates/homepage.html
@@ -20,9 +20,11 @@
       <div class="row flex-xl-nowrap">
         <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
           {% include this.html %}
-          <div class="container py-3 hero">
-            {% block body %}{% endblock %}
-          </div>
+          {% if this.parent.path != "/download" %}
+            <div class="container py-3 hero">
+              {% block body %}{% endblock %}
+            </div>
+          {% endif %}
         </main>
       </div>
     </div>