downloads: Update page design

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scss/style.scss b/src/scss/style.scss
index d06b75058c90635ec1d9b0bee0482fc38a361d58..a9e5afa4b59c40e838830601c1cad36829bd3966 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -101,12 +101,6 @@ pre {
        }
 }
 
-.list-group {
-       .list-group-item {
-               color: $body-bg;
-       }
-}
-
 .navbar {
        .navbar-brand {
                font-weight: bold;

diff --git a/src/templates/download/release.html b/src/templates/download/release.html
index 88e9649cc495533ba6227124634870851186d596..98c7384fe978a929b046795a64f02914de84da76 100644 (file)
--- a/src/templates/download/release.html
+++ b/src/templates/download/release.html
@@ -5,7 +5,17 @@
 {% block container %}
        <div class="header">
                <div class="container">
-                       <h1>{{ release }}</h1>
+                       <h1>{{ _("Download") }}</h1>
+
+                       <p class="text-muted">
+                               IPFire is free to download for everyone... XXX
+                       </p>
+               </div>
+       </div>
+
+       <div class="container">
+               <section>
+                       <h2>{{ release }}</h2>
 
                        <p class="text-muted">
                                {{ _("Released %s") % locale.format_date(release.published, relative=True, shorter=True) }}
@@ -15,42 +25,38 @@
                                        <a href="/blog/{{ release.blog.slug }}">{{ _("Release Notes") }}</a>
                                {% end %}
                        </p>
-               </div>
-       </div>
 
-       <div class="container">
-               <section>
-                       {% for arch in release.primary_arches %}
-                               <h5>{{ arch }}</h5>
+                       <div class="list-group">
+                               {% for i, arch in enumerate(release.arches) %}
+                                       <div class="list-group-item bg-dark text-white d-flex align-items-start justify-content-between">
+                                               <h6 class="mb-0">{{ arch }}</h6>
+
+                                               {% if arch in release.experimental_arches %}
+                                                       <span class="badge badge-success">{{ _("Experimental") }}</span>
+                                               {% elif arch in release.secondary_arches %}
+                                                       <span class="badge badge-warning">{{ _("Legacy") }}</span>
+                                               {% end %}
+                                       </div>
 
-                               <ul class="list-group mb-5">
                                        {% for file in release.get_files_by_arch(arch) %}
-                                               <li class="list-group-item">
-                                                       <div class="d-flex w-100 justify-content-between">
-                                                               <a href="{{ file.url }}">{{ _(file.desc) }}</a>
+                                               <a class="list-group-item list-group-item-action" href="{{ file.url }}">
+                                                       <h6>
+                                                               {{ _(file.desc) }} <i class="fas fa-download text-primary"></i>
+                                                       </h6>
 
-                                                               {% if file.size >= 1024 * 1024 %}
-                                                                       <span class="text-muted">{{ format_size(file.size) }}</span>
-                                                               {% end %}
-                                                       </div>
+                                                       <ul class="list-inline text-muted small mb-0">
+                                                               <li class="list-inline-item">
+                                                                       {{ format_size(file.size) }}
+                                                               </li>
 
-                                                       <ul class="list-inline text-muted small mb-0 d-none d-md-block">
                                                                <li class="list-inline-item">
                                                                        {{ "%s: %s" % ("SHA256" if file.sha256 else "SHA1", file.sha256 or file.sha1) }}
                                                                </li>
-
-                                                               {% if file.torrent_url %}
-                                                                       <li class="list-inline-item">
-                                                                               <a href="{{ file.torrent_url }}">
-                                                                                       <i class="fas fa-download"></i> {{ _("Torrent Download") }}
-                                                                               </a>
-                                                                       </li>
-                                                               {% end %}
                                                        </ul>
-                                               </li>
+                                               </a>
                                        {% end %}
-                               </ul>
-                       {% end %}
+                               {% end %}
+                       </div>
                </section>
        </div>
 
@@ -77,52 +83,4 @@
                        </div>
                </div>
        </section>
-
-       {% if release.secondary_arches %}
-               <div class="container">
-                       <section>
-                               <h3>{{ _("Secondary Architectures") }}</h3>
-
-                               {% for arch in release.secondary_arches %}
-                                       <h5>
-                                               {{ arch }}
-
-                                               {% if arch in release.experimental_arches %}
-                                                       <span class="badge badge-success small">{{ _("Experimental") }}</span>
-                                               {% else %}
-                                                       <span class="badge badge-warning small">{{ _("Legacy") }}</span>
-                                               {% end %}
-                                       </h5>
-
-                                       <ul class="list-group mb-5">
-                                               {% for file in release.get_files_by_arch(arch) %}
-                                                       <li class="list-group-item">
-                                                               <div class="d-flex w-100 justify-content-between">
-                                                                       <a href="{{ file.url }}">{{ _(file.desc) }}</a>
-
-                                                                       {% if file.size >= 1024 * 1024 %}
-                                                                               <span class="text-muted">{{ format_size(file.size) }}</span>
-                                                                       {% end %}
-                                                               </div>
-
-                                                               <ul class="list-inline text-muted small mb-0 d-none d-md-block">
-                                                                       <li class="list-inline-item">
-                                                                               {{ "%s: %s" % ("SHA256" if file.sha256 else "SHA1", file.sha256 or file.sha1) }}
-                                                                       </li>
-
-                                                                       {% if file.torrent_url %}
-                                                                               <li class="list-inline-item">
-                                                                                       <a href="{{ file.torrent_url }}">
-                                                                                               <i class="fas fa-download"></i> {{ _("Torrent Download") }}
-                                                                                       </a>
-                                                                               </li>
-                                                                       {% end %}
-                                                               </ul>
-                                                       </li>
-                                               {% end %}
-                                       </ul>
-                               {% end %}
-                       </section>
-               </div>
-       {% end %}
 {% end block %}