Split download as a separate step to introduce the new download page

wiki/src/install/debian/usb-download.mdwn

+[[!meta title="Install from Debian, Ubuntu, or Mint"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave_2"]]
+
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]

wiki/src/install/debian/usb-overview.html

@@ -15,6 +15,6 @@
     <h3 class="panel-title text-center">Let's go!</h3>
   </div>
 </div>
-|install/debian/usb]]
+|install/debian/usb-download]]
 
 <div class="clearfix"></div>

wiki/src/install/debian/usb.mdwn

@@ -2,10 +2,8 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
 
@@ -15,8 +13,6 @@ Start in Debian, Ubuntu, or Linux Mint.
 
 [[!inline pages="install/inc/steps/debian_requirements.inline" raw="yes" sort="age"]]
 
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
 Install <span class="application">Tails Installer</span>
 ========================================================
 

wiki/src/install/inc/steps/download_2.inline.html

@@ -74,9 +74,30 @@
         <h3><span class="step-number">3.</span>Continue installing</h3>
       </div>
       <div id="continue-link-direct" class="indent">
-        <a id="skip-download-direct">Skip download</a>
-        <a id="skip-verification-direct">Skip verification</a>
-        <a id="next-direct" class="btn btn-primary">Next</a>
+        <div id="skip-download-direct">
+          <span class="debian">[[Skip download|debian/usb]]</span>
+          <span class="windows">[[Skip download|win/usb]]</span>
+          <span class="linux">[[Skip download|linux/usb]]</span>
+          <span class="mac-usb">[[Skip download|mac/usb]]</span>
+          <span class="mac-dvd">[[Skip download|mac/dvd]]</span>
+          <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
+        </div>
+        <div id="skip-verification-direct">
+          <span class="debian">[[Skip verification|debian/usb]]</span>
+          <span class="windows">[[Skip verification|win/usb]]</span>
+          <span class="linux">[[Skip verification|linux/usb]]</span>
+          <span class="mac-usb">[[Skip verification|mac/usb]]</span>
+          <span class="mac-dvd">[[Skip verification|mac/dvd]]</span>
+          <span class="upgrade-tails">[[Skip verification|upgrade/tails]]</span>
+        </div>
+        <div id="next-direct" class="btn btn-primary">
+          <span class="debian">[[Next|debian/usb]]</span>
+          <span class="windows">[[Next|win/usb]]</span>
+          <span class="linux">[[Next|linux/usb]]</span>
+          <span class="mac-usb">[[Next|mac/usb]]</span>
+          <span class="mac-dvd">[[Next|mac/dvd]]</span>
+          <span class="upgrade-tails">[[Next|upgrade/tails]]</span>
+        </div>
       </div>
     </div> <!-- Supported browser & No JS -->
 
@@ -119,8 +140,22 @@
       <h3><span class="step-number">3.</span>Continue installing</h3>
     </div>
     <div id="continue-link-bittorrent" class="indent">
-      <a id="skip-download-bittorrent">Skip download</a>
-      <a id="next-bittorrent" class="btn btn-primary">Next</a>
+      <div id="skip-download-bittorrent">
+        <span class="debian">[[Skip download|debian/usb]]</span>
+        <span class="windows">[[Skip download|win/usb]]</span>
+        <span class="linux">[[Skip download|linux/usb]]</span>
+        <span class="mac-usb">[[Skip download|mac/usb]]</span>
+        <span class="mac-dvd">[[Skip download|mac/dvd]]</span>
+        <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
+      </div>
+      <div id="next-bittorrent" class="btn btn-primary">
+        <span class="debian">[[Next|debian/usb]]</span>
+        <span class="windows">[[Next|win/usb]]</span>
+        <span class="linux">[[Next|linux/usb]]</span>
+        <span class="mac-usb">[[Next|mac/usb]]</span>
+        <span class="mac-dvd">[[Next|mac/dvd]]</span>
+        <span class="upgrade-tails">[[Next|upgrade/tails]]</span>
+      </div>
     </div>
   </div> <!-- BitTorrent download -->
 

wiki/src/install/linux/usb-download.mdwn

+[[!meta title="Install from Linux"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/linux" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave_2"]]
+
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]

wiki/src/install/linux/usb-overview.html

@@ -15,6 +15,6 @@
     <h3 class="panel-title text-center">Let's go!</h3>
   </div>
 </div>
-|install/linux/usb]]
+|install/linux/usb-download]]
 
 <div class="clearfix"></div>

wiki/src/install/linux/usb.mdwn

@@ -2,10 +2,8 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/linux" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
 
@@ -13,8 +11,6 @@
 
 <p class="start">Start in Linux.</p>
 
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
 [[!inline pages="install/inc/steps/install_intermediary_intro.inline" raw="yes" sort="age"]]
 
 1. Install <span class="application">GNOME Disks</span>.

wiki/src/install/mac/dvd-download.mdwn

+[[!meta title="Install from Mac by burning a DVD first"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/mac-dvd" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave_2"]]
+
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]

wiki/src/install/mac/dvd-overview.html

@@ -15,6 +15,6 @@
     <h3 class="panel-title text-center">Let's go!</h3>
   </div>
 </div>
-|install/mac/dvd]]
+|install/mac/dvd-download]]
 
 <div class="clearfix"></div>

wiki/src/install/mac/dvd.mdwn

@@ -2,10 +2,8 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/mac-dvd" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
 
@@ -13,8 +11,6 @@
 
 <p class="start">Start in macOS.</p>
 
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
 <h1 id="burn-dvd">Burn a Tails DVD</h1>
 
 In this step, you will create an intermediary Tails by burning the Tails ISO

wiki/src/install/mac/usb-download.mdwn

+[[!meta title="Install from Mac using the command line"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/mac-usb" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave_2"]]
+
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]

wiki/src/install/mac/usb-overview.html

@@ -15,6 +15,6 @@
     <h3 class="panel-title text-center">Let's go!</h3>
   </div>
 </div>
-|install/mac/usb]]
+|install/mac/usb-download]]
 
 <div class="clearfix"></div>

wiki/src/install/mac/usb.mdwn

@@ -2,10 +2,8 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/mac-usb" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
 
 <div class="step-image">[[!img install/inc/infography/os-mac.png link="no" alt=""]]</div>
 
@@ -13,8 +11,6 @@
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
 
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
 [[!inline pages="install/inc/steps/install_intermediary_intro.inline" raw="yes" sort="age"]]
 
   1. Open <span class="application">Terminal</span> from

wiki/src/install/win/usb-download.mdwn

+[[!meta title="Install from Windows"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/windows" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave_2"]]
+
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]

wiki/src/install/win/usb-overview.html

@@ -15,6 +15,6 @@
     <h3 class="panel-title text-center">Let's go!</h3>
   </div>
 </div>
-|install/win/usb]]
+|install/win/usb-download]]
 
 <div class="clearfix"></div>

wiki/src/install/win/usb.mdwn

@@ -2,10 +2,8 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/windows" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
 
@@ -13,8 +11,6 @@
 
 <p class="start">Start in Windows.</p>
 
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
 [[!inline pages="install/inc/steps/install_intermediary_intro.inline" raw="yes" sort="age"]]
 
 <div class="step-image">[[!img install/inc/infography/plug-first-usb.png link="no" alt=""]]</div>

wiki/src/upgrade/tails-download.mdwn

+[[!meta title="Manually upgrade inside Tails"]]
+
+[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/dave_2" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/upgrade-tails" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave_2"]]
+
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]

wiki/src/upgrade/tails-overview.html

@@ -15,6 +15,6 @@
     <h3 class="panel-title text-center">Let's go!</h3>
   </div>
 </div>
-|upgrade/tails]]
+|upgrade/tails-download]]
 
 <div class="clearfix"></div>

wiki/src/upgrade/tails.mdwn

@@ -2,10 +2,8 @@
 
 [[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="install/inc/stylesheets/upgrade-tails" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
 
@@ -13,8 +11,6 @@
 
 <p class="start">Start in Tails.</p>
 
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
 Install an intermediary Tails
 =============================