Skip to content

GitLab

Commit b62e0735 authored by sajolida's avatar sajolida
Browse files

Simplify

parent d4e7cc76
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 49 deletions
wiki/src/install/inc/js/download.js
View file @ b62e0735
......@@ -142,6 +142,7 @@ document.addEventListener("DOMContentLoaded", function() {
document.getElementById("filename").textContent = filename;
}
show(document.getElementById("verifying-download"));
toggleContinueLink("skip-verification");
}
function showVerificationProgress(percentage) {
......@@ -198,6 +199,7 @@ document.addEventListener("DOMContentLoaded", function() {
document.getElementById("bittorrent-download").onclick = function(e) {
hide(document.getElementById("javascript-verification-tip"));
show(document.getElementById("bittorrent-verification-tip"));
toggleContinueLink("next");
}
// Reset verification when downloading again after failure
......
wiki/src/install/inc/steps/download.inline.html
View file @ b62e0735
......@@ -17,23 +17,23 @@ were solved, and known issues that have already been identified.</p>
<div class="supported-browser no-js">
<div id="step-download">
<h3><span class="step-number"><span class="usb upgrade">1.</span>1</span>Download Tails</h3>
<div class="usb upgrade download-only-img">
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool button 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 button 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 class="usb upgrade download-only-img indent">
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool button">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 button">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="dvd vm download-only-iso">
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool 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>
<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 class="dvd vm download-only-iso indent">
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool button">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 button">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">
<div id="download-minor" class="indent">
<p id="bittorrent">
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
<p id="try-another-mirror">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>
</p>
......@@ -72,19 +72,21 @@ were solved, and known issues that have already been identified.</p>
please allow all this page:</p>
[[!img screenshots/allow_js.png link="no"]]
</div>
<label id="verify-download-wrapper" class="button inline-block">
<label id="verify-download-wrapper" class="button block">
Verify Tails <span class="remove-extra-space">&nbsp;[[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</span>&hellip;
<input id="verify-download" type="file"/>
</label>
<div id="verifying-download" class="indent block">
<div id="verifying-download" class="block">
<p>Verifying <span id="filename">$FILENAME</span>&hellip;</p>
<div class="progress">
<div id="progress-bar" class="progress-bar" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
</div>
</div>
<p id="verification-successful" class="block">Verification successful!</p>
<div id="verification-successful" class="block">
<p>[[!img lib/check.png class="icon" link="no" alt=""]]Verification successful!</p>
</div>
<div id="verification-failed" class="block">
<p><b>Verification failed!</b></p>
<p>[[!img lib/cross.png class="icon" link="no" alt=""]]<b>Verification failed!</b></p>
<p class="floating-toggleable-link why-failed-link">[[!toggle id="why-failed" text="Why?"]]</p>
<div id="why-failed" class="floating-toggleable">
[[!toggleable id="why-failed" text="""
......@@ -109,7 +111,7 @@ were solved, and known issues that have already been identified.</p>
<p class="dvd vm download-only-iso"><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>
<p>[[!img lib/cross.png class="icon" link="no" alt=""]]<b>Verification failed again!</b></p>
<p class="floating-toggleable-link why-failed-again-link">[[!toggle id="why-failed-again" text="Why?"]]</p>
<div id="why-failed-again" class="floating-toggleable">
[[!toggleable id="why-failed-again" text="""
......@@ -147,28 +149,30 @@ were solved, and known issues that have already been identified.</p>
<span class="upgrade-linux">[[Skip download|upgrade/linux]]</span>
<span class="download-only-img download-only-iso">[[Skip download|doc#install]]</span>
</div>
<div id="skip-verification" class="block">
<div class="windows">[[Skip verification!|win/usb]]</div>
<div class="linux">[[Skip verification!|linux/usb]]</div>
<div class="mac">[[Skip verification!|mac/usb]]</div>
<div class="dvd">[[Skip verification!|dvd]]</div>
<div class="vm">[[Skip verification!|doc/advanced_topics/virtualization]]</div>
<div class="upgrade-tails">[[Skip verification!|upgrade/tails]]</div>
<div class="upgrade-windows">[[Skip verification!|upgrade/win]]</div>
<div class="upgrade-mac">[[Skip verification!|upgrade/mac]]</div>
<div class="upgrade-linux">[[Skip verification!|upgrade/linux]]</div>
<div class="download-only-img download-only-iso">[[Skip verification|doc#install]]</div>
<div id="skip-verification">
<p>[[!img icons/dialog-warning-small.png class="icon" link="no" alt=""]]
<span class="windows">[[Skip verification!|win/usb]]</span>
<span class="linux">[[Skip verification!|linux/usb]]</span>
<span class="mac">[[Skip verification!|mac/usb]]</span>
<span class="dvd">[[Skip verification!|dvd]]</span>
<span class="vm">[[Skip verification!|doc/advanced_topics/virtualization]]</span>
<span class="upgrade-tails">[[Skip verification!|upgrade/tails]]</span>
<span class="upgrade-windows">[[Skip verification!|upgrade/win]]</span>
<span class="upgrade-mac">[[Skip verification!|upgrade/mac]]</span>
<span class="upgrade-linux">[[Skip verification!|upgrade/linux]]</span>
<span class="download-only-img download-only-iso">[[Skip verification|doc#install]]</span>
</p>
</div>
<div id="next">
<div class="windows">[[<div class="button inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
<div class="linux">[[<div class="button inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
<div class="mac">[[<div class="button inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
<div class="upgrade-tails">[[<div class="button inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="upgrade-windows">[[<div class="button inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</div>
<div class="upgrade-mac">[[<div class="button inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/mac]]</div>
<div class="upgrade-linux">[[<div class="button inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/linux]]</div>
<div class="dvd">[[<div class="button inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="button inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
<div id="next" class="inline-block">
<div class="windows">[[<div class="button">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
<div class="linux">[[<div class="button">Next: Install Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
<div class="mac">[[<div class="button">Next: Install Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
<div class="upgrade-tails">[[<div class="button">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="upgrade-windows">[[<div class="button">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</div>
<div class="upgrade-mac">[[<div class="button">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/mac]]</div>
<div class="upgrade-linux">[[<div class="button">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/linux]]</div>
<div class="dvd">[[<div class="button">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="button">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
<div class="download-only-img">
<p>Upgrade your Tails USB stick and keep your Persistent Storage:</p>
<ul>
......
wiki/src/install/inc/stylesheets/download.css
View file @ b62e0735
......@@ -119,12 +119,6 @@ span.step-number {
/* Skip verification */
#skip-verification div {
background: url(../icons/dialog-warning-small.png) no-repeat;
height: 2em;
padding-left: 30px;
}
#skip-verification a {
color: #e8112d;
border-color: #e8112f;
......@@ -145,14 +139,9 @@ span.step-number {
/* Verification results */
#verification-successful {
background: url(../../../lib/check.png) no-repeat;
padding-left: 35px;
}
#verification-failed, #verification-failed-again {
background: url(../../../lib/cross.png) no-repeat;
padding-left: 35px;
img.icon {
margin-right: 15px;
vertical-align: bottom;
}
#continue-link li {
......
Markdown is supported
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