From 0e44c767fdb0d232a3cf2774adf28a74c31034f9 Mon Sep 17 00:00:00 2001 From: sajolida Date: Fri, 27 Nov 2015 21:51:57 +0000 Subject: [PATCH] Move download.inline into inc/steps At the moment we are not considering having a replacement of the /download page, so since we are renaming this file anyway let's move it where it belongs: next to the other steps. --- wiki/src/install/debian/usb.mdwn | 2 +- wiki/src/install/download.mdwn | 2 +- .../install/inc/steps/download.inline.html | 193 ++++++++++++++++++ wiki/src/install/linux/usb.mdwn | 2 +- wiki/src/install/mac/dvd.mdwn | 2 +- wiki/src/install/mac/usb.mdwn | 2 +- wiki/src/install/win/usb.mdwn | 2 +- wiki/src/upgrade/tails.mdwn | 2 +- 8 files changed, 200 insertions(+), 7 deletions(-) create mode 100644 wiki/src/install/inc/steps/download.inline.html diff --git a/wiki/src/install/debian/usb.mdwn b/wiki/src/install/debian/usb.mdwn index fe8ba2ad09..4bc758f0e8 100644 --- a/wiki/src/install/debian/usb.mdwn +++ b/wiki/src/install/debian/usb.mdwn @@ -9,7 +9,7 @@ [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]] -[[!inline pages="download.inline" raw="yes"]] +[[!inline pages="install/inc/steps/download.inline" raw="yes"]] diff --git a/wiki/src/install/download.mdwn b/wiki/src/install/download.mdwn index 81fbf691fd..facf477f52 100644 --- a/wiki/src/install/download.mdwn +++ b/wiki/src/install/download.mdwn @@ -5,4 +5,4 @@ [[!meta stylesheet="install/inc/stylesheets/dave" rel="stylesheet" title=""]] [[!meta script="install/inc/js/dave"]] -[[!inline pages="download.inline" raw="yes"]] +[[!inline pages="install/inc/steps/download.inline" raw="yes"]] diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html new file mode 100644 index 0000000000..bc754d495e --- /dev/null +++ b/wiki/src/install/inc/steps/download.inline.html @@ -0,0 +1,193 @@ +Download and verify +=================== + +
[[!img install/inc/infography/download-and-verify.png link="no"]]
+ +
+
0.2.5
+ +
+

We failed to detect your browser vendor, maybe because JavaScript is disabled.

+

You can download and verify the ISO image via:

+
+
+

Browser extension

+

for Firefox 38.0.1+ or + Tor Browser 5+

+

Copy and paste this link in Firefox or Tor Browser:

+ https://tails.boum.org/download + I'm already in Firefox 38.0.1+ or Tor Browser 5+. +
+
+

BitTorrent

+ Download Torrent file +
+
+
+ +
+

You seem to be using an unsupported browser.

+

You can download and verify the ISO image via:

+
+
+

Browser extension

+

for Firefox 38.0.1+ or + Tor Browser 5+

+

You are running Firefox 1.0. + Please update to Firefox 38.0.1, Tor Browser 5, or newer and visit this link:

+

Copy and paste this link in Firefox or Tor Browser:

+ https://tails.boum.org/download + I'm already in Firefox 38.0.1+ or Tor Browser 5+. +
+
+

BitTorrent

+ Download Torrent file +
+
+
+ +
+
+

We detected that you are running Firefox or Tor Browser and already have our Firefox extension installed.

+ + Use Firefox extension +
+ Already installed +
+ +
+ Use Firefox extension +
+ Done +
+
+
+
+

We detected that you are running Firefox of Tor Browser but have an outdated version of our Firefox extension.

+ + Update Firefox extension +
+ No restart +
+ +
+ Update Firefox extension +
+ Done +
+
+
+
+

We detected that you are running Firefox or Tor Browser.

+

You can download and verify the ISO image via our Firefox extension.

+ + Install Firefox extension +
+ No restart +
+ +
+ Install Firefox extension +
+ Done +
+
+
+

or Download via BitTorrent

+
+ + I already have an ISO image. + +
+ + Download Tails [[!inline pages="inc/stable_i386_version" raw="yes"]] ISO image + ($SIZE MiB) + + +
+
+
Download Tails [[!inline pages="inc/stable_i386_version" raw="yes"]] ISO image + + $SPEED KB/s — $DOWNLOADED/$SIZE MiB, + + ??? + minutes + minute + + + ??? + seconds + second + + +
+
+
+ $PROGRESS complete + $PROGRESS +
+
+ Downloading to $PATH +
+
+ Retry + Pause + Resume + Cancel +
+
+ + Paused + Done + Failed +
+
+
+
+

The download has been paused. Click "resume" to go on.

+
+
+

The download of the ISO image failed! Please check your network connection and try to resume...

+
+
+
+ +
+
+
+
Verify ISO image
+ Computing SHA-256 checksum… +
+
+ $PROGRESS + Done + Failed +
+
+
+
+

You downloaded and verified the ISO image successfully!

+

You can now continue with the next step and + [[Open these instructions on another device|install/clone#next]]. + [[Install Tails Installer|install/debian/usb#next]]. + [[Install a temporary Tails|install/win/usb#next]]. + [[Install a temporary Tails|install/linux/usb#next]]. + [[Burn a Tails DVD|install/mac/dvd#next]]. + [[Install a temporary Tails|install/mac/usb#next]]. + [[Open these instructions on another device|install/mac/clone#next]]. + [[Open these instructions on another device|upgrade/clone#next]]. + [[Install a temporary Tails|upgrade/tails#next]]. +

+

If you are knowledgeable about OpenPGP, you can do additional verification using the OpenPGP signature.

+
+ Download again +
+ +
+

The verification of the ISO image failed! Please try to download again…

+
+
+

The verification of the ISO image failed again! Please try to download again from a different place or a different computer…

+
+
+
diff --git a/wiki/src/install/linux/usb.mdwn b/wiki/src/install/linux/usb.mdwn index fb281d9575..ba74824244 100644 --- a/wiki/src/install/linux/usb.mdwn +++ b/wiki/src/install/linux/usb.mdwn @@ -9,7 +9,7 @@ [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]] -[[!inline pages="download.inline" raw="yes"]] +[[!inline pages="install/inc/steps/download.inline" raw="yes"]] [[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]] diff --git a/wiki/src/install/mac/dvd.mdwn b/wiki/src/install/mac/dvd.mdwn index 9a35d4b1d0..09f27e9b7d 100644 --- a/wiki/src/install/mac/dvd.mdwn +++ b/wiki/src/install/mac/dvd.mdwn @@ -9,7 +9,7 @@ [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]] -[[!inline pages="download.inline" raw="yes"]] +[[!inline pages="install/inc/steps/download.inline" raw="yes"]] Burn a Tails DVD ================ diff --git a/wiki/src/install/mac/usb.mdwn b/wiki/src/install/mac/usb.mdwn index 06af6bfce2..cc63743984 100644 --- a/wiki/src/install/mac/usb.mdwn +++ b/wiki/src/install/mac/usb.mdwn @@ -9,7 +9,7 @@ [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]] -[[!inline pages="download.inline" raw="yes"]] +[[!inline pages="install/inc/steps/download.inline" raw="yes"]] [[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]] diff --git a/wiki/src/install/win/usb.mdwn b/wiki/src/install/win/usb.mdwn index abaad80fc3..30d3661d0f 100644 --- a/wiki/src/install/win/usb.mdwn +++ b/wiki/src/install/win/usb.mdwn @@ -9,7 +9,7 @@ [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]] -[[!inline pages="download.inline" raw="yes"]] +[[!inline pages="install/inc/steps/download.inline" raw="yes"]] [[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]] diff --git a/wiki/src/upgrade/tails.mdwn b/wiki/src/upgrade/tails.mdwn index e28e567643..09daa3a431 100644 --- a/wiki/src/upgrade/tails.mdwn +++ b/wiki/src/upgrade/tails.mdwn @@ -9,7 +9,7 @@ [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]] -[[!inline pages="download.inline" raw="yes"]] +[[!inline pages="install/inc/steps/download.inline" raw="yes"]] Install a temporary Tails ========================= -- GitLab