Commit 51ee8fff authored by sajolida's avatar sajolida
Browse files

Download either the ISO image or the USB image depending on the scenario

parent 016ec410
https://tails.boum.org/torrents/files/tails-amd64-3.8.img.sig
http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.8/tails-amd64-3.8.img
......@@ -257,8 +257,11 @@ document.addEventListener("DOMContentLoaded", function() {
opaque(document.getElementById("continue-link-direct"));
opaque(document.getElementById("continue-link-bittorrent"));
// Display "Verify with your browser" when ISO image is clicked
document.getElementById("download-iso").onclick = function() {
// Display "Verify with your browser" when image is clicked
document.getElementById("download-img").onclick = function() { displayVerificationExtension(); }
document.getElementById("download-iso").onclick = function() { displayVerificationExtension(); }
function displayVerificationExtension() {
toggleDirectBitTorrent("direct");
resetVerificationResult();
}
......@@ -270,7 +273,10 @@ document.addEventListener("DOMContentLoaded", function() {
}
// Reset verification when downloading again after failure
document.getElementById("download-iso-again").onclick = function() {
document.getElementById("download-img-again").onclick = function() { resetVerification(); }
document.getElementById("download-iso-again").onclick = function() { resetVerification(); }
function resetVerification() {
toggleDirectBitTorrent("direct");
resetVerificationResult();
}
......
......@@ -9,10 +9,16 @@
<h2>Direct download</h2>
<div class="supported-browser no-js">
<div id="step-download-iso">
<div id="step-download-direct">
<h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails</h3>
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool btn btn-primary 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>
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry btn btn-primary 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 class="debian windows linux mac-usb upgrade-tails">
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
</div>
<div class="mac-dvd dvd vm">
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool btn btn-primary 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>
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry btn btn-primary 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>
<p id="already-downloaded" class="indent"><a>I already downloaded Tails <span class="remove-extra-space">&nbsp;[[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</span>.</a></p>
</div>
......@@ -87,7 +93,8 @@
<p>[[How does the extension work?|contribute/design/verification_extension]]</p>
"""]]
</div>
<p><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
<p class="debian windows linux mac-usb upgrade-tails"><a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
<p class="mac-dvd dvd vm"><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
</div>
<div id="verification-failed-again" class="block">
<p><b>Verification failed again!</b></p>
......
......@@ -74,7 +74,7 @@ span.step-number {
margin-left: 35px !important;
}
#step-download-iso, #step-download-torrent {
#step-download-direct, #step-download-torrent {
min-height: 7em;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment