From 434554fd73c345687a2161c289fbf93c4fdb978e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 14 Oct 2015 14:58:58 +0000
Subject: [PATCH] Download list styling

---
 i2p2www/pages/downloads/list.html      |  1 -
 i2p2www/pages/downloads/macros         | 31 ++++++++----------------
 i2p2www/static/styles/duck/default.css |  5 ++++
 i2p2www/static/styles/duck/desktop.css | 33 +++++++++++++++++++-------
 i2p2www/static/styles/duck/mobile.css  |  4 ----
 5 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index ae511600..e4629981 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -84,7 +84,6 @@ or type <tt>java -version</tt> at your command prompt.
 {% endcall %}
 
 {% call package('android') %}
-    <p>&nbsp;</p>
     <div class="warning">
       {% trans -%}
       Requires Android 2.3 (Gingerbread) or higher. If you earlier installed
diff --git a/i2p2www/pages/downloads/macros b/i2p2www/pages/downloads/macros
index 3d84a898..f824367a 100644
--- a/i2p2www/pages/downloads/macros
+++ b/i2p2www/pages/downloads/macros
@@ -60,27 +60,14 @@
 {% call package_outer(type, name, icon) %}
     <div class="file">
     {%- if type == 'android' %}
-      {% trans %}Outside I2P{% endtrans %}:
       <!-- do not use url_for here -->
-      <a class="default" href="https://download.i2p2.de/android/current/i2p.apk">I2P {{ i2p_android_version }}</a>
-      <br>
-      {% trans %}Inside I2P{% endtrans %}:
+      <a class="default" href="https://download.i2p2.de/android/current/i2p.apk">{% trans %}Outside I2P{% endtrans %} ({{ i2p_android_version }})</a>
       <!-- do not use i2pconv here -->
-      <a class="default" href="http://update.killyourtv.i2p/i2p.apk">I2P {{ i2p_android_version_kytv }}</a>
-      <br>
-      Google Play:
-      <a class="default" href="https://play.google.com/store/apps/details?id=net.i2p.android">I2P {{ i2p_android_version }}</a>
-      <br>
-      {% trans %}Our F-Droid repository{% endtrans %}:
-      <a class="default" href="https://f-droid.i2p.io/">I2P {{ i2p_android_version }}</a>
-      <br>
-      F-Droid:
-      <a class="default" href="https://f-droid.org/app/net.i2p.android.router">I2P {{ i2p_android_version_fdroid }}</a>
-      <br>
-      {% trans %}Development Builds{% endtrans %}:
-      {% trans str4durl='http://'+i2pconv('str4d.i2p')+'/android/' -%}
-      <a class="default" href="{{ str4durl }}">str4d's eepsite</a>
-      {%- endtrans %}
+      <a class="default" href="http://update.killyourtv.i2p/i2p.apk">{% trans %}Inside I2P{% endtrans %} ({{ i2p_android_version_kytv }})</a>
+      <a class="default" href="https://play.google.com/store/apps/details?id=net.i2p.android">Google Play ({{ i2p_android_version }})</a>
+      <a class="default" href="https://f-droid.i2p.io/">{% trans %}Our F-Droid repository{% endtrans %} ({{ i2p_android_version }})</a>
+      <a class="default" href="https://f-droid.org/app/net.i2p.android.router">F-Droid ({{ i2p_android_version_fdroid }})</a>
+      <a class="default" href="{{ 'http://'+i2pconv('str4d.i2p')+'/android/' }}">{% trans %}Development Builds{% endtrans %}</a>
     {% else %}
       <a class="default" href="{{ url_for('downloads_redirect', version=ver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver(filename)) }}">
         <span class="name">{{ ver(filename) }}</span><br />
@@ -90,8 +77,10 @@
       <a class="sig" href="{{ url_for('downloads_redirect', version=ver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver(signame)) }}">sig</a>
     {% endif -%}
     </div>
-    <div class="hash">
-      <code>{{ hash }}</code>
+    <div class="meta">
+      <div class="hash">
+        <code>{{ hash }}</code>
+      </div>
     </div>
     {{ details }}
 {% endcall %}
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 0986d2d1..bbbac192 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -212,6 +212,7 @@ div#content .inner .box {
 }
 
 div#content .inner .meta {
+    clear: both;
     text-align: center;
 }
 
@@ -347,6 +348,10 @@ div#content .inner .box img {
     vertical-align: top;
 }
 
+.details .hash {
+    overflow: auto;
+}
+
 .details .hash:before {
     content: 'SHA256: ';
     font-size: 0.8125em;
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index 77dab1c4..dc992c98 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -275,24 +275,41 @@ div#content > .title {
 
 .package .details {
     float: right;
-    width: 80%;
+    width: 78%;
 }
 
 .file {
     float: left;
-    width: 40%;
+    width: 100%;
+}
+
+.file .default {
+    clear: left;
+    border-radius: 5px;
+    float: left;
+    max-width: 67%;
+}
+
+.file .mirrors,
+.file .sig {
+    clear: right;
+    float: right;
+    width: 25%;
+}
+
+.file .mirrors {
+    border-radius: 5px 5px 0 0;
+}
+
+.file .sig {
+    border-radius: 0 0 5px 5px;
 }
 
 .file > a:hover {
     box-shadow: 1px 1px 1px 1px rgb(51, 51, 51) inset
 }
 
-.details .hash {
-    float: right;
-    overflow: auto;
-    width: 50%;
-}
-
+.details > div,
 .details > p,
 .details > ol {
     clear: both
diff --git a/i2p2www/static/styles/duck/mobile.css b/i2p2www/static/styles/duck/mobile.css
index 83f12b98..abcdf7b0 100644
--- a/i2p2www/static/styles/duck/mobile.css
+++ b/i2p2www/static/styles/duck/mobile.css
@@ -126,10 +126,6 @@ div#content .inner {
     margin-top: 1em
 }
 
-.details .hash {
-    display: none
-}
-
 #global-footer .aside {
     margin-left: 1%;
     width: 49%;