Commit f88af6f8 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'tchou/web/10530-dave' into web/10530-dave

Conflicts:
	wiki/src/download.inline.mdwn
parents 28592733 001649fc
......@@ -7,8 +7,8 @@
[[!meta title="Download and verify"]]
<div id="download-and-verify">
<div id="extension-version">1.0</div>
<div id="download-and-verify" >
<div id="extension-version">0.1.0</div>
<div id="undetected-browser">
<p>We failed to detect your browser vendor, maybe because JavaScript is disabled.</p>
......@@ -16,15 +16,17 @@
<div class="row download-options">
<div class="col-md-6 extension">
<h2>Browser extension</h2>
<p>(for Firefox, Tor Browser, or Chrome)</p>
<a href="" class="btn btn-lg btn-primary">I'm already in Firefox or Tor Broswer</a>
<a href="" class="btn btn-lg btn-primary">I'm already in Chrome</a>
<p>(for Firefox <span class="minver-firefox">38.0.1</span> or above,
Tor Browser <span class="minver-tor">5</span> or above<span class="chrome-browser">, Chrome <span class="minver-chrome">44</span> or above</span>)</p>
<p>Copy and paste this link in Firefox, Tor Browser, or Chrome:</p>
<a href="?override=firefox" class="btn btn-lg btn-primary browser-override">I'm already in Firefox >= <span class="minver-firefox">38.0.1</span> or Tor Browser >= <span class="minver-tor">5</span></a>
<a href="?override=chrome" class="btn btn-lg btn-primary browser-override chrome-browser">I'm already in Chrome >= <span class="minver-chrome">44</span></a>
<p>Or copy and paste this link in Firefox, Tor Browser, or Chrome:</p>
<code>https://tails.boum.org/download</code>
</div>
<div class="col-md-6 bittorrent">
<h2>BitTorrent</h2>
<a href="[[!inline pages="inc/stable_i386_torrent_url" raw="yes"]]" class="btn btn-lg btn-primary">Download Torrent file</a>
<a href='[[!inline pages="inc/stable_i386_torrent_url" raw="yes"]]' class="btn btn-lg btn-primary">Download Torrent file</a>
</div>
</div>
</div>
......@@ -34,13 +36,16 @@
<div class="row download-options">
<div class="col-md-6 extension">
<h2>Browser extension</h2>
<p>(for Firefox, Tor Browser, or Chrome)</p>
<p>Copy and paste this link in Firefox, Tor Browser, or Chrome:</p>
<p>(for Firefox <span class="minver-firefox">38.0.1</span> or above,<span class="chrome-browser">
Chrome <span class="minver-chrome">44</span> or above,</span>
Tor Browser <span class="minver-tor">5</span> or above)</p>
<p>Copy and paste this link in Firefox >= <span class="minver-firefox">38.0.1</span><span class="chrome-browser">,
Chrome >= <span class="minver-chrome">44</span></span> or Tor Browser >= <span class="minver-tor">5</span>:</p>
<code>https://tails.boum.org/download</code>
</div>
<div class="col-md-6 bittorrent">
<h2>BitTorrent</h2>
<a href="[[!inline pages="inc/stable_i386_torrent_url" raw="yes"]]" class="btn btn-lg btn-primary">Download Torrent file</a>
<a href='[[!inline pages="inc/stable_i386_torrent_url" raw="yes"]]' class="btn btn-lg btn-primary">Download Torrent file</a>
</div>
</div>
</div>
......@@ -92,15 +97,15 @@
</div>
</div>
</div>
<p id="bittorrent-minor">or <a href="[[!inline pages="inc/stable_i386_torrent_url" raw="yes"]]" >Download via BitTorrent</a></p>
<p id="bittorrent-minor">or <a href='[[!inline pages="inc/stable_i386_torrent_url" raw="yes"]]' >Download via BitTorrent</a></p>
</div>
<a id="i_have_iso" href="">I already have an ISO image.</a>
<a id="i_have_iso" href="" title="Select an ISO image to verify">I already have an ISO image.</a>
<div id="download">
<a id="download-button" href="[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]" class="btn btn-lg btn-primary clearfix">
<span id="download-button-label" class="pull-left">Download Tails [[!inline pages="inc/stable_i386_version" raw="yes"]] ISO image
<small id="download-button-size" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>
<a id="download-button" href='[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]' class="btn btn-lg btn-primary clearfix iso-url">
<span id="download-button-label" class="pull-left">Download Tails <span class="iso-version">[[!inline pages="inc/stable_i386_version" raw="yes"]]</span> ISO image
<small id="download-button-size" class="iso-url-text" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>
</span>
<div id="download-button-state" class="pull-right">
<span id="download-button-state-retry" class="label label-warning">Retry</span>
......@@ -109,18 +114,18 @@
</a>
<div id="download-text" class="btn btn-lg clearfix">
<div id="download-text-left" class="pull-left clearfix">
<div id="download-text-label" class="pull-left">Download Tails[[!inline pages="inc/stable_i386_version" raw="yes"]] ISO image
<div id="download-text-label" class="pull-left">Download Tails <span class="iso-version">[[!inline pages="inc/stable_i386_version" raw="yes"]]</span> ISO image
<small id="download-eta">
240 Ko/s - 360,7/[[!inline pages="inc/stable_i386_iso_size" raw="yes"]], 10 minutes left
<span class="speed-Kbs">240</span> Kb/s - <span class="downloaded-KB">360.7</span>/<span class="iso-size-KB">[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</span>KB, <span class="eta-mins">10</span> minutes left
</small>
</div>
<div id="download-progress" class="progress">
<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%">
<span class="sr-only">45% Complete</span>
45%
<span class="sr-only"><span class="progress-label">45%</span> Complete</span>
<span class="progress-label">45%</span>
</div>
</div>
<small id="download-path">Downloading to /home/amnesia/Tor Browser/tails-i386-1.3.2.iso</small>
<small id="download-path">Downloading to <span class="download-path">/home/amnesia/Tor Browser/tails-i386-1.3.2.iso</span></small>
</div>
<div id="download-text-state" class="pull-right">
<span id='download-text-pause'>
......@@ -142,20 +147,23 @@
<div id="verify">
<div id="verify-text" class="btn btn-lg clearfix">
<div class="pull-left">
<span id="verify-text-label">Verify ISO image</span>
<small id="verify-text-calculating">Calculating SHA-256 checksum...</small>
<div id="verify-text-label">Verify ISO image</div>
<small id="verify-text-calculating">Computing SHA-256 checksum for <span class="verify-file-path"></span>...</small>
<div id="verify-text-computed-hash" class="iso-computed-hash"></div>
</div>
<div id="verify-text-state" class="pull-right">
<span id="verify-text-state-calculating" class="state calculating label label-info">Calculating</span>
<span id="verify-text-state-calculating" class="state calculating label label-info"><span class="verify-progress">0%</span></span>
<span id="verify-text-state-done" class="state success label label-success">Done</span>
<span id="verify-text-state-failed" class="state failed label label-danger">Failed</span>
</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>.
<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>
</div>
<div id="verify-text-failure" class="bg-warning">
<p>The verification of the ISO image failed! Please try to download again&hellip;</p>
</div>
......
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