Skip to content

GitLab

Commit ddf1ab3a authored by sajolida's avatar sajolida
Browse files
Options

Create two different 'Download only' pages for the ISO image and USB image

parent 096bbbfb
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 21 deletions
wiki/src/contribute/design/installation_assistant.mdwn
View file @ ddf1ab3a
......@@ -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]]
......
wiki/src/install.html
View file @ ddf1ab3a
......@@ -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>
wiki/src/install/download-iso.mdwn 0 → 100644
View file @ ddf1ab3a
[[!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"]]
wiki/src/install/download.mdwn
View file @ ddf1ab3a
[[!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"]]
......
wiki/src/install/inc/steps/download.inline.html
View file @ ddf1ab3a
......@@ -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>
......
wiki/src/install/inc/stylesheets/assistant.css
View file @ ddf1ab3a
......@@ -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,
......
wiki/src/install/inc/stylesheets/download-only-img.css 0 → 100644
View file @ ddf1ab3a
span.download-only-img, ul.download-only-img {
display: inline;
}
div.download-only-img, p.download-only-img {
display: block;
}
#pagebody h1 {
display: none;
}
wiki/src/install/inc/stylesheets/download-only-iso.css
View file @ ddf1ab3a
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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment