Commit 51d9a2c2 authored by sajolida's avatar sajolida
Browse files

Adjust /install/download to the new download page

It won't have a "Skip download" and "Skip verification" because people
arrived on this page after clicking "Download only".

So "3. Continue installing" will be empty at first. But I still made it
point to the full installation scenario once the verification is done.
That was easier than removing "3. " and might be useful for some people
who might have landed here partly by mistake.
parent 3012836f
......@@ -2,9 +2,9 @@
[[!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/dave_2" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/dave"]]
[[!meta script="install/inc/js/dave_2"]]
[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/download_2.inline" raw="yes" sort="age"]]
......@@ -90,13 +90,22 @@
<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 id="next-direct">
<div class="btn btn-primary debian windows linux mac-usb mac-dvd upgrade-tails">
<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>
<ul class="download-only">
<li>[[From Windows|install/win/usb]]</li>
<li>[[From Debian, Ubuntu, or Mint|install/debian/usb]]</li>
<li>[[From other Linux distributions|install/linux/usb]]</li>
<li>[[From macOS by burning a DVD first|install/mac/dvd]]</li>
<li>[[From macOS and the command line|install/mac/usb]]</li>
</ul>
</div>
</div>
</div> <!-- Supported browser & No JS -->
......@@ -148,13 +157,22 @@
<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 id="next-bittorrent">
<div class="btn btn-primary debian windows linux mac-usb mac-dvd upgrade-tails">
<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>
<ul class="download-only">
<li>[[From Windows|install/win/usb]]</li>
<li>[[From Debian, Ubuntu, or Mint|install/debian/usb]]</li>
<li>[[From other Linux distributions|install/linux/usb]]</li>
<li>[[From macOS by burning a DVD first|install/mac/dvd]]</li>
<li>[[From macOS and the command line|install/mac/usb]]</li>
</ul>
</div>
</div>
</div> <!-- BitTorrent download -->
......
span.download-only {
span.download-only, ul.download-only {
display: inline;
}
......
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