From 818ce9e4716d9fe32df6828589755b97d70e5d89 Mon Sep 17 00:00:00 2001
From: sajolida <sajolida@pimienta.org>
Date: Sat, 12 Sep 2020 17:57:15 +0000
Subject: [PATCH] Add back BitTorrent as alternative download

---
 wiki/src/install/inc/js/download.js             |  7 +++++++
 wiki/src/install/inc/steps/download.inline.html | 13 ++++++++++++-
 wiki/src/install/inc/stylesheets/download.css   |  9 +++------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/wiki/src/install/inc/js/download.js b/wiki/src/install/inc/js/download.js
index 5e75f03127..20fb0e82bb 100644
--- a/wiki/src/install/inc/js/download.js
+++ b/wiki/src/install/inc/js/download.js
@@ -123,6 +123,7 @@ document.addEventListener("DOMContentLoaded", function() {
   }
 
   function showAnotherMirror() {
+    hide(document.getElementById("bittorrent"));
     show(document.getElementById("try-another-mirror"));
   }
 
@@ -193,6 +194,12 @@ document.addEventListener("DOMContentLoaded", function() {
     }
   }
 
+  // Display BitTorrent verification tip when BitTorrent download is clicked
+  document.getElementById("bittorrent-download").onclick = function(e) {
+    hide(document.getElementById("javascript-verification-tip"));
+    show(document.getElementById("bittorrent-verification-tip"));
+  }
+
   // Reset verification when downloading again after failure
   document.getElementById("download-img-again").onclick = function(e) { downloadAgain(e, this); }
   document.getElementById("download-iso-again").onclick = function(e) { downloadAgain(e, this); }
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index acf08294dc..975bb31276 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -26,6 +26,13 @@ were solved, and known issues that have already been identified.</p>
       <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry button inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
     </div>
     <div id="download-minor">
+      <p id="bittorrent" class="indent inline-block">
+        or download using
+        <span id="bittorrent-download">
+          <a href="[[!inline pages="inc/stable_amd64_img_torrent_url" raw="yes" sort="age"]]" class="usb upgrade download-only-img">BitTorrent</a>
+          <a href="[[!inline pages="inc/stable_amd64_iso_torrent_url" raw="yes" sort="age"]]" class="dvd vm download-only-iso">BitTorrent</a>
+        </span>
+      </p>
       <p id="try-another-mirror" class="indent">If the download fails, try to
         <a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" class="usb upgrade download-only-img">download from another mirror.</a>
         <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" class="dvd vm download-only-iso">download from another mirror.</a>
@@ -35,7 +42,7 @@ were solved, and known issues that have already been identified.</p>
 
   <div id="step-verify">
     <h3><span class="step-number"><span class="usb upgrade">1.</span>2</span>Verify your download using your browser</h3>
-    <div class="caution indent">
+    <div id="javascript-verification-tip" class="caution indent">
       <p><b>For your security,<br/>always verify your download!</b></p>
       <p class="floating-toggleable-link why-verify-link">[[!toggle id="why-verify-supported" text="Why?"]]</p>
       <div id="why-verify-supported" class="floating-toggleable">
@@ -54,6 +61,10 @@ were solved, and known issues that have already been identified.</p>
       """]]
       </div>
     </div>
+    <div id="bittorrent-verification-tip" class="indent block">
+      <p>Your BitTorrent client will automatically verify your download when it completes.</p>
+      <p>The verification below is optional for a BitTorrent download.</p>
+    </div>
     <div id="verification" class="indent block">
       <div class="no-js">
         <p>You seem to have JavaScript disabled. To use the
diff --git a/wiki/src/install/inc/stylesheets/download.css b/wiki/src/install/inc/stylesheets/download.css
index 04b95ae152..e59436b98b 100644
--- a/wiki/src/install/inc/stylesheets/download.css
+++ b/wiki/src/install/inc/stylesheets/download.css
@@ -123,15 +123,12 @@ span.step-number {
   right: 1em;
 }
 
-.what-is-bittorrent-link {
-  position: absolute;
-  top: 2.4em;
-  right: 1em;
+#bittorrent-verification-tip {
+  display: none;
 }
-html[dir="rtl"] .what-is-bittorrent-link { left: 1em; }
 
 #download-minor {
-  margin-top: 0.5em;
+  margin-top: 1.5em;
 }
 
 #try-another-mirror {
-- 
GitLab