Commit 49332c22 authored by sajolida's avatar sajolida
Browse files

Simplify classes

On the download page:

- 'windows linux mac' is equivalent to 'usb'
- 'upgrade-tails upgrade-windows' is equivalent to 'upgrade'
parent f6742aef
......@@ -2,7 +2,7 @@
<div id="extension-version">2.4</div> <!-- Minimum version of the extension -->
<div id="tails-version">[[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</div>
<h1 class="windows linux mac dvd vm upgrade-tails upgrade-windows">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
<h1 class="usb upgrade dvd vm">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
<div class="row">
......@@ -11,8 +11,8 @@
<div class="supported-browser no-js">
<div id="step-download-direct">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>1</span>Download Tails</h3>
<div class="windows linux mac upgrade-tails upgrade-windows download-only-img">
<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 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>
......@@ -24,7 +24,7 @@
</div>
<div id="step-verify-direct">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>2</span>Verify your download using your browser</h3>
<h3><span class="step-number"><span class="usb upgrade">1.</span>2</span>Verify your download using your browser</h3>
<div 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>
......@@ -94,7 +94,7 @@
<p>[[How does the extension work?|contribute/design/verification_extension]]</p>
"""]]
</div>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img"><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="usb upgrade download-only-img"><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="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">
......@@ -118,9 +118,9 @@
</div>
<div id="step-continue-direct">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>3</span>Continue
<span class="windows linux mac">installing</span>
<span class="upgrade-tails upgrade-windows">upgrading</span>
<h3><span class="step-number"><span class="usb upgrade">1.</span>3</span>Continue
<span class="usb">installing</span>
<span class="upgrade">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
</div>
<div id="continue-link-direct" class="indent">
......@@ -235,8 +235,8 @@
</div>
<div id="step-download-torrent">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>1</span>Download Tails (Torrent file)</h3>
<div class="windows linux mac upgrade-tails upgrade-windows download-only-img">
<h3><span class="step-number"><span class="usb upgrade">1.</span>1</span>Download Tails (Torrent file)</h3>
<div class="usb upgrade download-only-img">
<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="dvd vm download-only-iso">
......@@ -245,21 +245,21 @@
</div>
<div id="step-verify-bittorrent">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>2</span>Verify your download using BitTorrent</h3>
<h3><span class="step-number"><span class="usb upgrade">1.</span>2</span>Verify your download using BitTorrent</h3>
<p class="indent">Your BitTorrent client will automatically verify your download when it is complete.</p>
</div>
<div id="step-continue-bittorrent">
<h3><span class="step-number"><span class="windows linux mac dvd vm upgrade-tails upgrade-windows">1.</span>3</span>Continue
<span class="windows linux mac">installing</span>
<span class="upgrade-tails upgrade-windows">upgrading</span>
<h3><span class="step-number"><span class="usb upgrade">1.</span>3</span>Continue
<span class="usb">installing</span>
<span class="upgrade">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
<p class="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"]]
<span class="windows linux mac upgrade-tails upgrade-windows download-only-img">USB</span>
<span class="usb upgrade download-only-img">USB</span>
<span class="dvd vm download-only-iso">ISO</span>
<span class="windows linux mac dvd vm upgrade-tails upgrade-windows">image that you will use in the next step.</span>
<span class="usb dvd vm upgrade">image that you will use in the next step.</span>
<span class="download-only-img download-only-iso">image.</span>
</div>
<div id="continue-link-bittorrent" class="indent">
......@@ -312,7 +312,7 @@ OpenPGP signature instead of, or in addition to, our browser extension or
BitTorrent.</p>
<p>Download the
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="usb upgrade download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -340,7 +340,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="usb upgrade download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -384,7 +384,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="usb upgrade download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -418,7 +418,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="usb upgrade download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -444,7 +444,7 @@ you saved the image.</p>
<p>After the verification finishes, you should see a notification that the
signature is good:</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_good.png link="no"]]</p>
<p class="usb upgrade download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_good.png link="no"]]</p>
<p class="dvd vm download-only-iso">[[!img install/inc/screenshots/verifying_in_tails_iso_good.png link="no"]]</p>
<p>Verify that the date of the signature is at most five days earlier
......@@ -452,7 +452,7 @@ you saved the image.</p>
<p>If instead, you see a notification that the signature is valid but untrusted:</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_untrusted.png link="no"]]</p>
<p class="usb upgrade download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_untrusted.png link="no"]]</p>
<p class="dvd vm download-only-iso">[[!img install/inc/screenshots/verifying_in_tails_iso_untrusted.png link="no"]]</p>
<p>Then the image is still correct according to the signing key that you
......@@ -469,7 +469,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="usb upgrade download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -495,12 +495,12 @@ you saved the image.</p>
<li>
<p>Execute:</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
<p class="usb upgrade download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
<p class="dvd vm download-only-iso pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
<p>The output of this command should be the following:</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
<p class="usb upgrade download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
<p class="dvd vm download-only-iso pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
<p>Verify that the date of the signature is at most five days
......
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