Skip to content

Commit

Permalink
Reformat and realign everything in the page to make better use of the…
Browse files Browse the repository at this point in the history 
… space we have there
  • Loading branch information
@Rudd-O
Rudd-O committed Mar 6, 2016
1 parent 3233372 commit 3068ec9
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 64 deletions.
18 changes: 10 additions & 8 deletions _layouts/downloads.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@
<style type="text/css">
<!--
.download-steps {
text-align: center;
margin-bottom: 3em;
}
.download-steps .white-box {
padding-bottom: 1em;
padding-top: 1em;
}
.download-steps .step-options {
margin-left: auto;
margin-right: auto;
border-collapse: separate;
border-spacing: 1em;
margin: -1em;
margin-left: auto;
margin-right: auto;
margin-bottom: 0em;
}
.download-steps .step-options a {
display: block;
Expand All @@ -21,11 +26,8 @@
padding-right: 1.6em;
}
.download-steps ul {
padding-left: 0;
}
.download-steps li {
list-style-type: none;
list-style-position: inside;
padding-left: 1em;
margin-bottom: 0;
}
-->
</style>
Expand Down
180 changes: 124 additions & 56 deletions pages/downloads.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,82 +9,150 @@ redirect_from:
- /wiki/QubesDownloads/
---

<div class="download-steps">
<h1 class="more-top add-left"><i class="fa fa-download"></i>Get Qubes OS</h1>

<div class="download-steps page-content white-box">

{% assign release_name = site.data.downloads.featured_release %}
{% assign release = site.data.downloads.releases[release_name] %}
{% assign primary_source = release.sources|first %}

<h1 class="more-top add-left">Get Qubes OS</h1>
<div class="row more-bottom">

<table class="step-options">
<tr>
<td colspan="{{ release.sources|size - 1}}"><a class="btn btn-primary btn-lg" href="{{ primary_source[1].url }}">Download {{ release_name }}</a></td>
</tr>
<tr>
{% for source in release.sources %}
{% if source[0] == primary_source[0] %}{% continue %}{% endif %}
<td><a class="btn btn-default" href="{{ source[1].url }}">Via {{ source[1].method }} from {{ source[0] }}</a></td>
{% endfor %}
</tr>
</table>
<div class="col-lg-2">

<p><a class="btn btn-default" href="#more-releases">Pick a live, experimental or older release</a></p>
<h2>Download</h2>

<ul>
{% for fdoc in release.featured_docs["get"] %}
<li><a href="{{ release.docs[fdoc].url }}">{{ fdoc }}</a></li>
{% endfor %}
<li><a href="/doc/supported-versions/">Supported Qubes OS versions</a></li>
<li><a href="/doc/version-scheme/">The Qubes OS version scheme</a></li>
<li><a href="/doc/license/">Read the Qubes OS License</a></li>
</ul>
</div>

<div class="col-lg-6">

<h1 class="more-top add-left">Verify Qubes OS</h1>
<table class="step-options">
<tr>
<td><a class="btn btn-primary btn-lg" href="{{ primary_source[1].url }}">Via {{ primary_source[1].method }} from {{ primary_source[0] }}</a></td>
</tr>
{% for source in release.sources %}
{% if source[0] == primary_source[0] %}{% continue %}{% endif %}
<tr>
<td><a class="btn btn-default" href="{{ source[1].url }}">Via {{ source[1].method }} from {{ source[0] }}</a></td>
</tr>
{% endfor %}
<tr>
<td><a class="btn btn-default" href="#more-releases">Pick a live, experimental or older release</a></td>
</tr>
</table>

<table class="step-options">
<tr>
<td colspan="3"><a class="btn btn-primary btn-lg" href="/doc/verifying-signatures/">How to verify your Qubes OS is authentic</a></td>
</tr>
<tr>
<td><a class="btn btn-default" href="{{ primary_source[1].verifiers['hash'] }}">Hashes</a></td>
<td><a class="btn btn-default" href="{{ primary_source[1].verifiers['sig'] }}">Signature</a></td>
<td><a class="btn btn-default" href="{{ primary_source[1].verifiers['key'] }}">Signer key</a></td>
</tr>
</table>
</div>

<div class="col-lg-4">

<ul>
<li><a href="/doc/install-security/">Installation Security Considerations</a></li>
</ul>
<p>Current release:<br/>
{{ release_name }}</p>

<ul>
{% for fdoc in release.featured_docs["get"] %}
<li><a href="{{ release.docs[fdoc].url }}">{{ fdoc }}</a></li>
{% endfor %}
<li><a href="/doc/supported-versions/">Supported Qubes OS versions</a></li>
<li><a href="/doc/version-scheme/">The Qubes OS version scheme</a></li>
<li><a href="/doc/license/">Read the Qubes OS License</a></li>
</ul>

<h1 class="more-top add-left">Deploy Qubes OS</h1>
</div>

<table class="step-options">
<tr>
<td><a class="btn btn-primary btn-lg" href="/doc/installation-guide/#burning-the-iso-onto-a-dvd-or-usb-stick">How to deploy and boot Qubes OS</a></td>
</tr>
</table>

<ul>
<li><a href="/doc/system-requirements/">System Requirements</a></li>
<li><a href="/hcl/">Hardware Compatibility List</a></li>
</ul>
</div>

<div class="row more-bottom">

<h1 class="more-top add-left">Enjoy Qubes OS</h1>
<div class="col-lg-2">

<table class="step-options">
<tr>
<td colspan="2"><a class="btn btn-primary btn-lg" href="/getting-started/#already-installed">Get started with Qubes OS</a></td>
</tr>
<tr>
<td><a class="btn btn-default btn-lg" href="/help/">Get help</a></td>
<td><a class="btn btn-default btn-lg" href="https://github.com/QubesOS">See the source</a></td>
</tr>
</table>
<h2>Verify</h2>

</div>

<div class="col-lg-6">

<table class="step-options">
<tr>
<td colspan="3"><a class="btn btn-primary btn-lg" href="/doc/verifying-signatures/">Check your Qubes OS is authentic</a></td>
</tr>
<tr>
<td><a class="btn btn-default" href="{{ primary_source[1].verifiers['hash'] }}">Hashes</a></td>
<td><a class="btn btn-default" href="{{ primary_source[1].verifiers['sig'] }}">Signature</a></td>
<td><a class="btn btn-default" href="{{ primary_source[1].verifiers['key'] }}">Signer key</a></td>
</tr>
</table>

</div>

<div class="col-lg-4">

<ul>
<li><a href="/doc/install-security/">Installation Security Considerations</a></li>
</ul>


</div>

</div>


<div class="row more-bottom">

<div class="col-lg-2">

<h2>Deploy</h2>

</div>

<div class="col-lg-6">

<table class="step-options">
<tr>
<td><a class="btn btn-primary btn-lg" href="/doc/installation-guide/#burning-the-iso-onto-a-dvd-or-usb-stick">Deploy and boot Qubes OS</a></td>
</tr>
</table>

</div>

<div class="col-lg-4">

<ul>
<li><a href="/doc/system-requirements/">System Requirements</a></li>
<li><a href="/hcl/">Hardware Compatibility List</a></li>
</ul>

</div>

</div>

<div class="row">

<div class="col-lg-2">

<h2>Enjoy!</h2>

</div>

<div class="col-lg-6">

<table class="step-options">
<tr>
<td><a class="btn btn-primary btn-lg" href="/getting-started/#already-installed">Get started with Qubes OS</a></td>
</tr>
</table>

</div>

<div class="col-lg-4">
<ul>
<li><a href="/help/">Get help</a></li>
<li><a href="https://github.com/QubesOS">See the source</a></li>
</ul>
</div>

</div>


</div>
Expand Down

0 comments on commit 3068ec9

Please sign in to comment.