Adapt 'dvd' and 'vm' to the new download page

These two scenarios are kind of second-class citizens but that's on
purpose. Now that the download is removed from the pages we can actually
point directly to /doc/advanced_topics/virtualization and make /dvd a
plain documentation page, without the special styling from the
Installation Assistant.

wiki/src/install/debian.html

@@ -55,8 +55,8 @@
 
     You can also:
     <ul>
-      <li>[[Burn Tails on a DVD|dvd]]</li>
-      <li>[[Run Tails in a virtual machine|vm]]</li>
+      <li>[[Burn Tails on a DVD|dvd-download]]</li>
+      <li>[[Run Tails in a virtual machine|vm-download]]</li>
     </ul>
 
   </div>

wiki/src/install/dvd-download.mdwn

+[[!meta title="Burning Tails on a DVD"]]
+
+[[!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/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/dvd.mdwn

 [[!meta title="Burning Tails on a DVD"]]
 
-[[!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/dvd" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
-
-[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
-
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
-Burn a Tails DVD
-================
-
 For detailed instructions on how to burn an ISO image on a DVD from Windows,
 Ubuntu, or macOS, refer to the Ubuntu documentation:
 

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

@@ -80,6 +80,8 @@
           <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="dvd">[[Skip download|dvd]]</span>
+          <span class="vm">[[Skip download|doc/advanced_topics/virtualization]]</span>
           <span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
         </div>
         <div id="skip-verification-direct">
@@ -88,6 +90,8 @@
           <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="dvd">[[Skip verification|dvd]]</span>
+          <span class="vm">[[Skip verification|doc/advanced_topics/virtualization]]</span>
           <span class="upgrade-tails">[[Skip verification|upgrade/tails]]</span>
         </div>
         <div id="next-direct">
@@ -97,6 +101,8 @@
             <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="dvd">[[Next|dvd]]</span>
+            <span class="vm">[[Next|doc/advanced_topics/virtualization]]</span>
             <span class="upgrade-tails">[[Next|upgrade/tails]]</span>
           </div>
           <ul class="download-only">

wiki/src/install/linux.html

@@ -54,8 +54,8 @@
 
     You can also:
     <ul>
-      <li>[[Burn Tails on a DVD|dvd]]</li>
-      <li>[[Run Tails in a virtual machine|vm]]</li>
+      <li>[[Burn Tails on a DVD|dvd-download]]</li>
+      <li>[[Run Tails in a virtual machine|vm-download]]</li>
     </ul>
 
   </div>

wiki/src/install/vm.mdwn → wiki/src/install/vm-download.mdwn

@@ -2,18 +2,9 @@
 
 [[!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/dave_2" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/vm" rel="stylesheet" title=""]]
-[[!meta script="install/inc/js/dave"]]
+[[!meta script="install/inc/js/dave_2"]]
 
-[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
-
-[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
-
-<a id="next"></a>
-
-Introduction to virtual machines
-================================
-
-[[!inline pages="doc/advanced_topics/virtualization" raw="yes" sort="age"]]
+[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]

wiki/src/install/win.html

@@ -54,8 +54,8 @@
 
     You can also:
     <ul>
-      <li>[[Burn Tails on a DVD|dvd]]</li>
-      <li>[[Run Tails in a virtual machine|vm]]</li>
+      <li>[[Burn Tails on a DVD|dvd-download]]</li>
+      <li>[[Run Tails in a virtual machine|vm-download]]</li>
     </ul>
 
   </div>