Redesigned download page to make download links more prominent

This commit is contained in:
str4d
2014-03-24 02:58:15 +00:00
parent b5314158ac
commit dcf1a32cea
6 changed files with 108 additions and 70 deletions

View File

@ -1,10 +1,10 @@
{% extends "global/layout.html" %}
{% block title %}{{ _('Download') }}{% endblock %}
{% set i2pinstall_windows_sig = '536a5dd49110a3717c74701c7f2ed91deea10109e527125c3bbed3b6863fffaa' %}
{% set i2pinstall_jar_sig = 'a0fe6702424d14fdb8697aa34fae0f5960dd6045a469ce910ad90928362eb72e' %}
{% set i2p_android_sig = 'ddbe0615495e7e0d1b81c581907ab974ddebc9d4f8059b789667d7f26b341748' %}
{% set i2psource_sig = '50b18c6e012cae1f05295b54ec88ab71c56b8ebf8b9267242bab37f918b80166' %}
{% set i2pupdate_sig = '5264e4c02b7d8b9a6af3c5829d891f6a53f51a976d08fa68873b8717cbfc4b74' %}
{% set i2pinstall_windows_hash = '536a5dd49110a3717c74701c7f2ed91deea10109e527125c3bbed3b6863fffaa' %}
{% set i2pinstall_jar_hash = 'a0fe6702424d14fdb8697aa34fae0f5960dd6045a469ce910ad90928362eb72e' %}
{% set i2p_android_hash = 'ddbe0615495e7e0d1b81c581907ab974ddebc9d4f8059b789667d7f26b341748' %}
{% set i2psource_hash = '50b18c6e012cae1f05295b54ec88ab71c56b8ebf8b9267242bab37f918b80166' %}
{% set i2pupdate_hash = '5264e4c02b7d8b9a6af3c5829d891f6a53f51a976d08fa68873b8717cbfc4b74' %}
{% block content %}
<h3>{{ _('Dependency') }}</h3>
<p>{% trans java='http://java.com/download/',
@ -33,17 +33,17 @@ or type <tt>java -version</tt> at your command prompt.
<img src="{{ url_for('static', filename='images/download/windows.png') }}" alt="Windows" title="Windows" />
</div>
<div class="details">
<div class="file">
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s_windows.exe')) }}">i2pinstall_{{ ver() }}_windows.exe</a> ({{ def_mirror.org }})
(<a href="{{ get_url('downloads_select', version=ver(), file=ver('i2pinstall_%s_windows.exe')) }}">{{ _('select alternate link') }}</a>)
<div class="sig">
(SHA256 <code>{{ i2pinstall_windows_sig }}</code>
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s_windows.exe.sig')) }}">sig</a>)
<div class="file">
<a class="default" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s_windows.exe')) }}">i2pinstall_{{ ver() }}_windows.exe ({{ def_mirror.org }})</a>
<a class="mirrors" href="{{ get_url('downloads_select', version=ver(), file=ver('i2pinstall_%s_windows.exe')) }}">{{ _('select alternate link') }}</a>
<a class="sig" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s_windows.exe.sig')) }}">sig</a>
</div>
</div>
{% trans -%}
<div class="hash">
<code>{{ i2pinstall_windows_hash }}</code>
</div>
<p>{% trans -%}
Download that file and run it.
{%- endtrans %}
{%- endtrans %}</p>
</div>
</div>
@ -52,21 +52,21 @@ or type <tt>java -version</tt> at your command prompt.
<img src="{{ url_for('static', filename='images/download/mac-osx.png') }}" alt="Mac OS X" title="Mac OS X" />
</div>
<div class="details">
<div class="file">
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a> ({{ def_mirror.org }})
(<a href="{{ get_url('downloads_select', version=ver(), file=ver('i2pinstall_%s.jar')) }}">{{ _('select alternate link') }}</a>)
<div class="sig">
(SHA256 <code>{{ i2pinstall_jar_sig }}</code>
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
<div class="file">
<a class="default" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar ({{ def_mirror.org }})</a>
<a class="mirrors" href="{{ get_url('downloads_select', version=ver(), file=ver('i2pinstall_%s.jar')) }}">{{ _('select alternate link') }}</a>
<a class="sig" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>
</div>
</div>
{% trans i2pversion=ver() -%}
<div class="hash">
<code>{{ i2pinstall_jar_hash }}</code>
</div>
<p>{% trans i2pversion=ver() -%}
Download that file and double-click it (if that works) or
type <code>java -jar i2pinstall_{{ i2pversion }}.jar</code> in a terminal to run the
installer.
You may be able to right-click and select
&quot;Open with Java&quot;.
{%- endtrans %}
{%- endtrans %}</p>
<h2>{% trans %}Command line (headless) install:{% endtrans %}</h2>
{% trans i2pversion=ver() -%}
@ -81,21 +81,21 @@ or type <tt>java -version</tt> at your command prompt.
<img src="{{ url_for('static', filename='images/download/freebsd-tux.png') }}" alt="GNU/Linux / BSD / Solaris" title="GNU/Linux / BSD / Solaris" />
</div>
<div class="details">
<div class="file">
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a> ({{ def_mirror.org }})
(<a href="{{ get_url('downloads_select', version=ver(), file=ver('i2pinstall_%s.jar')) }}">{{ _('select alternate link') }}</a>)
<div class="sig">
(SHA256 <code>{{ i2pinstall_jar_sig }}</code>
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
<div class="file">
<a class="default" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar ({{ def_mirror.org }})</a>
<a class="mirrors" href="{{ get_url('downloads_select', version=ver(), file=ver('i2pinstall_%s.jar')) }}">{{ _('select alternate link') }}</a>
<a class="sig" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>
</div>
</div>
{% trans i2pversion=ver() -%}
<div class="hash">
<code>{{ i2pinstall_jar_hash }}</code>
</div>
<p>{% trans i2pversion=ver() -%}
Download that file and double-click it (if that works) or
type <code>java -jar i2pinstall_{{ i2pversion }}.jar</code> in a terminal to run the
installer.
On some platforms you may be able to right-click and select
&quot;Open with Java&quot;.
{%- endtrans %}
{%- endtrans %}</p>
<h2>{% trans %}Command line (headless) install:{% endtrans %}</h2>
{% trans i2pversion=ver() -%}
@ -110,7 +110,9 @@ or type <tt>java -version</tt> at your command prompt.
<img src="{{ url_for('static', filename='images/download/debian-ubuntu.png') }}" alt="Debian / Ubuntu" title="Debian / Ubuntu" />
</div>
<div class="details">
<a href="{{ get_url('downloads_debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
<div class="file">
<a class="default" href="{{ get_url('downloads_debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
</div>
</div>
</div>
@ -119,24 +121,23 @@ or type <tt>java -version</tt> at your command prompt.
<img src="{{ url_for('static', filename='images/download/android.png') }}" alt="Android" title="Android" />
</div>
<div class="details">
<div class="file">
{% trans %}Outside I2P{% endtrans %}:
<!-- do not use url_for here -->
<a href="https://download.i2p2.de/android/current/i2p.apk">i2p-android-0.9.11-0_b1-API8.apk</a>
<br>
{% trans %}Inside I2P{% endtrans %}:
<!-- do not use i2pconv here -->
<a href="http://stats.i2p/i2p.apk">i2p-android-0.9.11-0_b1-API8.apk</a>
<div class="sig">
(SHA256 <code>{{ i2p_android_sig }}</code>
)
<div class="file">
{% trans %}Outside I2P{% endtrans %}:
<!-- do not use url_for here -->
<a class="default" href="https://download.i2p2.de/android/current/i2p.apk">i2p-android-0.9.11-0_b1-API8.apk</a>
<br>
{% trans %}Inside I2P{% endtrans %}:
<!-- do not use i2pconv here -->
<a class="default" href="http://stats.i2p/i2p.apk">i2p-android-0.9.11-0_b1-API8.apk</a>
</div>
</div>
{% trans devbuild='0.9.10-3_b4-API8', str4durl='http://'+i2pconv('str4d.i2p')+'/android/' -%}
<div class="hash">
<code>{{ i2p_android_hash }}</code>
</div>
<p>{% trans devbuild='0.9.10-3_b4-API8', str4durl='http://'+i2pconv('str4d.i2p')+'/android/' -%}
The above file is the current release build.
The latest dev build is version {{ devbuild }}, and is available from
<a href="{{ str4durl }}">str4d's eepsite</a>.
{%- endtrans %}
{%- endtrans %}</p>
<div class="warning">
{% trans -%}
The I2P Android app is in development and does NOT currently provide strong anonymity.
@ -161,15 +162,15 @@ or type <tt>java -version</tt> at your command prompt.
<img src="{{ url_for('static', filename='images/download/source.png') }}" alt="{{ _('Source package') }}" title="{{ _('Source package') }}" />
</div>
<div class="details">
<div class="file">
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2psource_%s.tar.bz2')) }}">i2psource_{{ ver() }}.tar.bz2</a> ({{ def_mirror.org }})
(<a href="{{ get_url('downloads_select', version=ver(), file=ver('i2psource_%s.tar.bz2')) }}">{{ _('select alternate link') }}</a>)
<div class="sig">
(SHA256 <code>{{ i2psource_sig }}</code>
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2psource_%s.tar.bz2.sig')) }}">sig</a>)
<div class="file">
<a class="default" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2psource_%s.tar.bz2')) }}">i2psource_{{ ver() }}.tar.bz2 ({{ def_mirror.org }})</a>
<a class="mirrors" href="{{ get_url('downloads_select', version=ver(), file=ver('i2psource_%s.tar.bz2')) }}">{{ _('select alternate link') }}</a>
<a class="sig" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2psource_%s.tar.bz2.sig')) }}">sig</a>
</div>
</div>
{% trans monotoneurl=site_url('get-involved/guides/new-developers'),
<div class="hash">
<code>{{ i2psource_hash }}</code>
</div>
<p>{% trans monotoneurl=site_url('get-involved/guides/new-developers'),
gitrepo='http://'+i2pconv('git.repo.i2p')+'/w/i2p.i2p.git',
github='https://github.com/i2p/i2p.i2p',
i2pversion=ver() -%}
@ -178,7 +179,7 @@ or type <tt>java -version</tt> at your command prompt.
<br />
Run <code>(tar xjvf i2psource_{{ i2pversion }}.tar.bz2 ; cd i2p-{{ i2pversion }} ; ant pkg)</code> then either
run the GUI installer or headless install as above.
{%- endtrans %}
{%- endtrans %}</p>
</div>
</div>
@ -256,14 +257,14 @@ receive the release.
<img src="{{ url_for('static', filename='images/download/update-manual.png') }}" alt="{{ _('Manual updates') }}" title="{{ _('Manual updates') }}" />
</div>
<div class="details">
<div class="file">
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pupdate_%s.zip')) }}">i2pupdate_{{ ver() }}.zip</a> ({{ def_mirror.org }})
(<a href="{{ get_url('downloads_select', version=ver(), file=ver('i2pupdate_%s.zip')) }}">{{ _('select alternate link') }}</a>)
<div class="sig">
(SHA256 <code>{{ i2pupdate_sig }}</code>
<a href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pupdate_%s.zip.sig')) }}">sig</a>)
<div class="file">
<a class="default" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pupdate_%s.zip')) }}">i2pupdate_{{ ver() }}.zip ({{ def_mirror.org }})</a>
<a class="mirrors" href="{{ get_url('downloads_select', version=ver(), file=ver('i2pupdate_%s.zip')) }}">{{ _('select alternate link') }}</a>
<a class="sig" href="{{ url_for('downloads_redirect', version=ver(), protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver('i2pupdate_%s.zip.sig')) }}">sig</a>
</div>
<div class="hash">
<code>{{ i2pupdate_hash }}</code>
</div>
</div>
<ol>
<li>
{% trans -%}

View File

@ -249,11 +249,31 @@ div#content .inner td.blue {
}
.file {
margin: 5px;
margin-bottom: 10px;
}
.file > a {
padding: 5px;
background-color: rgba(255,255,255,0.2);
border-radius: 3px;
box-shadow: -1px -1px 1px 1px rgb(51, 51, 51) inset;
text-align: center;
}
.file .default {
display: block;
padding: 15px;
}
.file .mirrors {
display: inline-block;
margin-left: 23%;
width: 40%;
}
.file .sig {
display: inline-block;
vertical-align: top;
width: 10%;
}
.details .hash:before {
content: 'SHA256: ';
}
.warning {

View File

@ -2,3 +2,8 @@
div#topbar #logo {
float: right;
}
/** Frontpage **/
div#content .feed-icon {
float: left;
}

View File

@ -240,9 +240,18 @@ div#content .inner > .title {
}
.file {
float: left;
width: 40%;
}
.sig {
.details .hash {
float: right;
overflow: auto;
width: 50%;
}
.details > p, .details > ol {
clear: both;
}
/* End of downloads list CSS */

View File

@ -45,14 +45,17 @@ div#content .main {
-ms-transform:rotate(5deg);
-o-transform:rotate(5deg);
}
div#content .feed-icon {
float: left;
}
/** Downloads list **/
.package .os {
float: right;
}
.package .details {
float: left;
float: left;
}
.file {
float: right;
}
.details .hash {
float: left;
}

View File

@ -125,7 +125,7 @@ div#content .inner .title {
margin-top: 1em;
}
.sig {
.details .hash {
display: none;
}