From ddf1ab3a94d85af1c13c041ca45b0e5753351da1 Mon Sep 17 00:00:00 2001
From: sajolida <sajolida@pimienta.org>
Date: Mon, 20 Aug 2018 11:44:55 +0000
Subject: [PATCH] Create two different 'Download only' pages for the ISO image
 and USB image

---
 .../design/installation_assistant.mdwn        |  6 ++--
 wiki/src/install.html                         |  5 ++-
 wiki/src/install/download-iso.mdwn            | 12 +++++++
 wiki/src/install/download.mdwn                |  4 +--
 .../install/inc/steps/download.inline.html    | 31 +++++++++++--------
 .../src/install/inc/stylesheets/assistant.css |  2 +-
 .../inc/stylesheets/download-only-img.css     | 11 +++++++
 .../inc/stylesheets/download-only-iso.css     |  4 +--
 8 files changed, 54 insertions(+), 21 deletions(-)
 create mode 100644 wiki/src/install/download-iso.mdwn
 create mode 100644 wiki/src/install/inc/stylesheets/download-only-img.css

diff --git a/wiki/src/contribute/design/installation_assistant.mdwn b/wiki/src/contribute/design/installation_assistant.mdwn
index 0a66ea8c8a..62fb9be41e 100644
--- a/wiki/src/contribute/design/installation_assistant.mdwn
+++ b/wiki/src/contribute/design/installation_assistant.mdwn
@@ -30,7 +30,8 @@ The following scenarios are proposed:
   - [[Install from macOS by burning a DVD first|install/mac/dvd-overview]]
   - [[Install from macOS and the command line|install/mac/usb-overview]]
   - [[Burn a DVD|install/dvd]]
-  - [[Download without installing|install/download]]
+  - [[Download only for USB sticks|install/download]]
+  - [[Download only for DVDs and virtual machines|install/download-iso]]
 
 The installation assistant is also adapted to cover two [[manual upgrade
 scenarios|upgrade]]:
@@ -102,7 +103,8 @@ scenario and elements with the
 - Classes for elements displayed only on one scenario:
   - `dvd` for [[/install/dvd-download|/install/dvd-download]]
   - `vm` for [[/doc/advanced_topics/virtualization|/doc/advanced_topics/virtualization]]
-  - `download-only` for [[/install/download|/install/download]]
+  - `download-only-img` for [[/install/download|/install/download]]
+  - `download-only-iso` for [[/install/download|/install/download-iso]]
   - `install-clone` for [[/install/clone|/install/clone]]
   - `windows-usb` for [[/install/win/usb|/install/win/usb]]
   - `mac-usb` for [[/install/mac/usb|/install/mac/usb]]
diff --git a/wiki/src/install.html b/wiki/src/install.html
index 8a1055b206..637795a351 100644
--- a/wiki/src/install.html
+++ b/wiki/src/install.html
@@ -45,4 +45,7 @@
   </div>
 </div>
 
-<p>[[Download only|install/download]]</p>
+<ul>
+  <li>[[Download only for USB sticks|install/download]]</li>
+  <li>[[Download only for DVDs and virtual machines|install/download-iso]]</li>
+</ul>
diff --git a/wiki/src/install/download-iso.mdwn b/wiki/src/install/download-iso.mdwn
new file mode 100644
index 0000000000..2799f62709
--- /dev/null
+++ b/wiki/src/install/download-iso.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="Download and verify (for DVDs and virtual machines)"]]
+
+[[!meta robots="noindex"]]
+[[!meta stylesheet="bootstrap.min" 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/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download-only-iso" rel="stylesheet" title=""]]
+[[!meta script="install/inc/js/download"]]
+[[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
+
+[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/install/download.mdwn b/wiki/src/install/download.mdwn
index 1acb68da20..4c8541d28a 100644
--- a/wiki/src/install/download.mdwn
+++ b/wiki/src/install/download.mdwn
@@ -1,11 +1,11 @@
-[[!meta title="Download and verify"]]
+[[!meta title="Download and verify (for USB sticks)"]]
 
 [[!meta robots="noindex"]]
 [[!meta stylesheet="bootstrap.min" 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/steps" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/download-only-img" rel="stylesheet" title=""]]
 [[!meta script="install/inc/js/download"]]
 [[!meta link="https://chrome.google.com/webstore/detail/gaghffbplpialpoeclgjkkbknblfajdl" rel="chrome-webstore-item"]]
 
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index 12a0ba12c8..153cb0cda9 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -11,11 +11,11 @@
     <div class="supported-browser no-js">
       <div id="step-download-direct">
         <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails</h3>
-        <div class="debian windows linux mac-usb upgrade-tails">
+        <div class="debian windows linux mac-usb upgrade-tails 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>
-        <div class="mac-dvd dvd vm">
+        <div class="mac-dvd dvd vm download-only-iso">
           <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
           <a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
         </div>
@@ -93,8 +93,8 @@
             <p>[[How does the extension work?|contribute/design/verification_extension]]</p>
             """]]
             </div>
-            <p class="debian windows linux mac-usb upgrade-tails"><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="mac-dvd dvd vm"><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>
+            <p class="debian windows linux mac-usb upgrade-tails 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="mac-dvd 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">
             <p><b>Verification failed again!</b></p>
@@ -120,7 +120,7 @@
         <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>3</span>Continue
           <span class="debian windows linux mac-usb mac-dvd">installing</span>
           <span class="upgrade-tails">upgrading</span>
-          <span class="download-only">installing or upgrading</span></h3>
+          <span class="download-only-img download-only-iso">installing or upgrading</span></h3>
       </div>
       <div id="continue-link-direct" class="indent">
         <div id="skip-download-direct">
@@ -152,15 +152,17 @@
           <div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
           <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
           <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
-          <ul class="download-only">
+          <ul class="download-only-img">
             <li>[[Install from Windows|install/win/usb]]</li>
             <li>[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]</li>
             <li>[[Install from other Linux distributions|install/linux/usb]]</li>
             <li>[[Install from macOS by burning a DVD first|install/mac/dvd]]</li>
             <li>[[Install from macOS and the command line|install/mac/usb]]</li>
+            <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+          </ul>
+          <ul class="download-only-iso">
             <li>[[Burn on a DVD|dvd]]</li>
             <li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
-            <li>[[Upgrade inside Tails|upgrade/tails]]</li>
           </ul>
         </div>
       </div>
@@ -208,7 +210,8 @@
       <p class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails-download/</code></p>
       <p class="dvd"><code>https://tails.boum.org/install/dvd-download/</code></p>
       <p class="vm"><code>https://tails.boum.org/install/vm-download/</code></p>
-      <p class="download-only"><code>https://tails.boum.org/install/download/</code></p>
+      <p class="download-only-img"><code>https://tails.boum.org/install/download/</code></p>
+      <p class="download-only-iso"><code>https://tails.boum.org/install/download-iso/</code></p>
     </div> <!-- Outdated browser -->
   </div> <!-- Direct download -->
 
@@ -231,10 +234,10 @@
 
     <div id="step-download-torrent">
       <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
-      <div class="debian windows linux mac-usb upgrade-tails">
+      <div class="debian windows linux mac-usb upgrade-tails 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="mac-dvd dvd vm">
+      <div class="mac-dvd dvd vm download-only-iso">
         <a href="[[!inline pages="inc/stable_amd64_iso_torrent_url" raw="yes" sort="age"]]" id="download-iso-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for ISO image</a>
       </div>
     </div>
@@ -248,7 +251,7 @@
       <h3><span class="step-number"><span class="debian windows linux mac-usb mac-dvd dvd vm upgrade-tails">1.</span>3</span>Continue
           <span class="debian windows linux mac-usb mac-dvd">installing</span>
           <span class="upgrade-tails">upgrading</span>
-          <span class="download-only">installing or upgrading</span></h3>
+          <span class="download-only-img download-only-iso">installing or upgrading</span></h3>
       <p class="debian windows linux mac-usb mac-dvd dvd vm upgrade-tails 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"]]
@@ -276,15 +279,17 @@
         <div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
         <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
         <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
-        <ul class="download-only">
+        <ul class="download-only-img">
           <li>[[Install from Windows|install/win/usb]]</li>
           <li>[[Install from Debian, Ubuntu, or Mint|install/debian/usb]]</li>
           <li>[[Install from other Linux distributions|install/linux/usb]]</li>
           <li>[[Install from macOS by burning a DVD first|install/mac/dvd]]</li>
           <li>[[Install from macOS and the command line|install/mac/usb]]</li>
+          <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+        </ul>
+        <ul class="download-only-iso">
           <li>[[Burn on a DVD|dvd]]</li>
           <li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
-          <li>[[Upgrade inside Tails|upgrade/tails]]</li>
         </ul>
       </div>
     </div>
diff --git a/wiki/src/install/inc/stylesheets/assistant.css b/wiki/src/install/inc/stylesheets/assistant.css
index 88eb0b3b89..f49256b6b2 100644
--- a/wiki/src/install/inc/stylesheets/assistant.css
+++ b/wiki/src/install/inc/stylesheets/assistant.css
@@ -118,7 +118,7 @@ td, th {
 
 /* Hide all scenario-dependent bits by default. */
 
-.clone, .usb, .dvd, .vm, .download-only,
+.clone, .usb, .dvd, .vm, .download-only-img, .download-only-iso,
 .install-clone,
 .windows, .windows-usb,
 .mac, .mac-usb, .mac-dvd, .mac-clone,
diff --git a/wiki/src/install/inc/stylesheets/download-only-img.css b/wiki/src/install/inc/stylesheets/download-only-img.css
new file mode 100644
index 0000000000..efdf7257e7
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/download-only-img.css
@@ -0,0 +1,11 @@
+span.download-only-img, ul.download-only-img {
+  display: inline;
+}
+
+div.download-only-img, p.download-only-img {
+  display: block;
+}
+
+#pagebody h1 {
+  display: none;
+}
diff --git a/wiki/src/install/inc/stylesheets/download-only-iso.css b/wiki/src/install/inc/stylesheets/download-only-iso.css
index c58a3ab854..4457760fd7 100644
--- a/wiki/src/install/inc/stylesheets/download-only-iso.css
+++ b/wiki/src/install/inc/stylesheets/download-only-iso.css
@@ -1,8 +1,8 @@
-span.download-only, ul.download-only {
+span.download-only-iso, ul.download-only-iso {
   display: inline;
 }
 
-p.download-only {
+div.download-only-iso, p.download-only-iso {
   display: block;
 }
 
-- 
GitLab