Merge branch 'web/8568-extension-in-assistant'

Conflicts:
	wiki/src/install/inc/stylesheets/download.css

wiki/src/download.inline.mdwn

+Download and verify
+===================
+
+<div class="step-image">[[!img install/inc/infography/download-and-verify.png link="no"]]</div>
+
 <div id="download-and-verify">
   <div id="extension-version">0.2.5</div>
 
@@ -161,9 +166,17 @@
   </div>
     </div>
     <div id="verify-text-success" class="bg-success">
-      <p>If you are knowledgeable about OpenPGP, you can do additional verification using the <a href='[[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]'>OpenPGP signature</a>.
-      <a href="">Learn how to do that</a></p>
-      <a href="" class="btn btn-lg btn-primary">Next <span>Copy ISO image on first USB stick</span></a>
+      <p>If you are knowledgeable about OpenPGP, you can do additional verification using the <a href='[[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]'>OpenPGP signature.</a>.
+      <a href="">Learn how to do that.</a></p>
+      <span class="btn btn-lg btn-primary install-clone">[[Next <span>Open these instructions on another device</span>|install/clone]]</span>
+      <span class="btn btn-lg btn-primary debian-usb">[[Next <span>Install <span class="application">Tails Installer</span></span>|install/debian/usb]]</span>
+      <span class="btn btn-lg btn-primary windows-usb">[[Next <span>Install a temporary Tails</span>|install/win/usb]]</span>
+      <span class="btn btn-lg btn-primary linux-usb">[[Next <span>Install a temporary Tails</span>|install/linux/usb]]</span>
+      <span class="btn btn-lg btn-primary mac-dvd">[[Next <span>Burn a Tails DVD</span>|install/mac/dvd]]</span>
+      <span class="btn btn-lg btn-primary mac-usb">[[Next <span>Install a temporary Tails</span>|install/mac/usb]]</span>
+      <span class="btn btn-lg btn-primary mac-clone">[[Next <span>Open these instructions on another device</span>|install/mac/clone]]</span>
+      <span class="btn btn-lg btn-primary upgrade-clone">[[Next <span>Open these instructions on another device</span>|upgrade/clone]]</span>
+      <span class="btn btn-lg btn-primary upgrade-tails">[[Next <span>Install a temporary Tails</span>|upgrade/tails]]</span>
       <a href="" class="btn btn-lg btn-link">Download again</a>
     </div>
 

wiki/src/install/clone.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Install from another Tails"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave"]]
+
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 [[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
 

wiki/src/install/debian/usb.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Installing Tails on a USB stick from Debian or Ubuntu"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/debian-usb" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave"]]
 
-[[Back|install/debian]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 [[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
 
@@ -13,6 +20,4 @@
 
 [[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes"]]
 
-[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
-
 [[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]

wiki/src/install/inc/router/clone.mdwn

@@ -17,4 +17,4 @@ Tails is up-to-date.</p>
       <h3 class="panel-title">Install from another Tails</h3>
     </div>
   </div>
-|install/clone]]
+|clone]]

wiki/src/install/inc/stylesheets/scenarios.css

+/* Hide all scenario-dependent bits by default. */
+
+.clone, .usb, .dvd,
+.install-clone,
+.windows, .windows-usb,
+.mac, .mac-usb, .mac-dvd, .mac-clone,
+.debian, .debian-usb,
+.expert, .expert-usb,
+.linux, .linux-usb,
+.upgrade, .upgrade-clone, .upgrade-tails {
+  display: none;
+}

wiki/src/install/inc/stylesheets/steps.css

-.sidebar {
-  display: none;
+@import url("scenarios.css");
+span.title {
+  display: block;
 }
 
 #content {
@@ -20,16 +21,3 @@
 .state-image {
   text-align: center;
 }
-
-/* Hide all scenario-dependent bits by default. */
-
-.clone, .usb, .dvd,
-.install-clone,
-.windows, .windows-usb,
-.mac, .mac-usb, .mac-dvd, .mac-clone,
-.debian, .debian-usb,
-.expert, .expert-usb,
-.linux, .linux-usb,
-.upgrade, .upgrade-clone, .upgrade-tails {
-  display: none;
-}

wiki/src/install/linux/usb.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Installing Tails on a USB stick from Linux"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/linux-usb" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave"]]
 
-[[Back|install/linux]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 [[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]]
 

wiki/src/install/mac/clone.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Install from another Tails"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/mac-clone" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave"]]
 
-[[Back|install/mac]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 [[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
 

wiki/src/install/mac/dvd.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Installing Tails on a USB stick from Mac by burning a DVD first"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" 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"]]
 
-[[Back|install/mac]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 Burn a Tails DVD
 ================

wiki/src/install/mac/usb.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Installing Tails on a USB stick from Mac using the command line"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" 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"]]
 
-[[Back|install/mac]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 [[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]]
 

wiki/src/install/win.mdwn

@@ -30,10 +30,10 @@
     [[
       <div class="panel panel-primary">
         <div class="panel-heading">
-          <h3 class="panel-title">Install from another Tails</h3>
+          <h3 class="panel-title">Install from Windows</h3>
         </div>
       </div>
-    |install/win/usb]]
+    |win/usb]]
 
   </div>
 </div>

wiki/src/install/win/usb.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Installing Tails on a USB stick from Windows"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/download" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/windows-usb" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave"]]
 
-[[Back|install/win]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 [[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]]
 

wiki/src/upgrade/clone.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Clone from another Tails"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download" 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-clone" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/dave"]]
 
-[[Back|upgrade]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 [[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
 

wiki/src/upgrade/tails.mdwn

 [[!meta robots="noindex"]]
 [[!meta title="Upgrade inside Tails"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download" 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"]]
 
-[[Back|upgrade]]
+[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
+
+[[!inline pages="download.inline" raw="yes"]]
 
 Install a temporary Tails
 =========================