summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-08-20 10:53:29 +0000
committersajolida <sajolida@pimienta.org>2018-08-20 11:41:50 +0000
commit096bbbfbe2a0494abca5b1910e486a17ec965cdc (patch)
tree6b7926ccc0bd4e995986a835daecbad306f0f214
parent4d0a6303e1094947316cdcd10621a871216d7875 (diff)
Download the torrent file for either the ISO image or the USB image
-rw-r--r--wiki/src/inc/stable_amd64_img_torrent_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_iso_torrent_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_torrent_url.html1
-rw-r--r--wiki/src/install/inc/js/download.js5
-rw-r--r--wiki/src/install/inc/steps/download.inline.html13
-rw-r--r--wiki/src/install/inc/stylesheets/download-only-iso.css (renamed from wiki/src/install/inc/stylesheets/download-only.css)0
6 files changed, 16 insertions, 5 deletions
diff --git a/wiki/src/inc/stable_amd64_img_torrent_url.html b/wiki/src/inc/stable_amd64_img_torrent_url.html
new file mode 100644
index 0000000..f79555a
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_img_torrent_url.html
@@ -0,0 +1 @@
+https://tails.boum.org/torrents/files/tails-amd64-3.8.img.torrent
diff --git a/wiki/src/inc/stable_amd64_iso_torrent_url.html b/wiki/src/inc/stable_amd64_iso_torrent_url.html
new file mode 100644
index 0000000..51c25c8
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_iso_torrent_url.html
@@ -0,0 +1 @@
+https://tails.boum.org/torrents/files/tails-amd64-3.8.iso.torrent
diff --git a/wiki/src/inc/stable_amd64_torrent_url.html b/wiki/src/inc/stable_amd64_torrent_url.html
deleted file mode 100644
index 593d3ea..0000000
--- a/wiki/src/inc/stable_amd64_torrent_url.html
+++ /dev/null
@@ -1 +0,0 @@
-https://tails.boum.org/torrents/files/tails-amd64-3.8.torrent
diff --git a/wiki/src/install/inc/js/download.js b/wiki/src/install/inc/js/download.js
index b575230..0bee729 100644
--- a/wiki/src/install/inc/js/download.js
+++ b/wiki/src/install/inc/js/download.js
@@ -282,7 +282,10 @@ document.addEventListener("DOMContentLoaded", function() {
}
// Display "Verify with BitTorrent" when Torrent file is clicked
- document.getElementById("download-torrent").onclick = function() {
+ document.getElementById("download-img-torrent").onclick = function() { displayBitTorrentVerification(); }
+ document.getElementById("download-iso-torrent").onclick = function() { displayBitTorrentVerification(); }
+
+ function displayBitTorrentVerification() {
toggleDirectBitTorrent("bittorrent");
}
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index b8c879b..12a0ba1 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -231,7 +231,12 @@
<div id="step-download-torrent">
<h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
- <a href="[[!inline pages="inc/stable_amd64_torrent_url" raw="yes" sort="age"]]" id="download-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file</a>
+ <div class="debian windows linux mac-usb upgrade-tails">
+ <a href="[[!inline pages="inc/stable_amd64_img_torrent_url" raw="yes" sort="age"]]" id="download-img-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for USB image</a>
+ </div>
+ <div class="mac-dvd dvd vm">
+ <a href="[[!inline pages="inc/stable_amd64_iso_torrent_url" raw="yes" sort="age"]]" id="download-iso-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for ISO image</a>
+ </div>
</div>
<div id="step-verify-bittorrent">
@@ -246,8 +251,10 @@
<span class="download-only">installing or upgrading</span></h3>
<p class="debian windows linux mac-usb mac-dvd dvd vm upgrade-tails indent">Open and download
the Torrent file with your BitTorrent client. It contains the
- Tails [[!inline pages="inc/stable_amd64_version" raw="yes"
- sort="age"]] ISO image that you will use in the next step.</p>
+ Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]
+ <span class="debian windows linux mac-usb mac-dvd upgrade-tails">USB</span>
+ <span class="debian windows linux mac-usb mac-dvd upgrade-tails">ISO</span>
+ image that you will use in the next step.</p>
</div>
<div id="continue-link-bittorrent" class="indent">
<div id="skip-download-bittorrent">
diff --git a/wiki/src/install/inc/stylesheets/download-only.css b/wiki/src/install/inc/stylesheets/download-only-iso.css
index c58a3ab..c58a3ab 100644
--- a/wiki/src/install/inc/stylesheets/download-only.css
+++ b/wiki/src/install/inc/stylesheets/download-only-iso.css