bootstrap4: rework changelog

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/src/templates/modules/changelog/entry.html b/src/templates/modules/changelog/entry.html
index 511a0a90c791757107d211fbb2c61d8acdc2c529..08e4a49555f9777fe30279d732cf055f0d27c43e 100644 (file)
--- a/src/templates/modules/changelog/entry.html
+++ b/src/templates/modules/changelog/entry.html
@@ -1,36 +1,43 @@
 <div class="card mb-3
-               {% if build.type == "release" and build.repo.type == "stable" %}
-                       border-success
-               {% elif build.type == "release" and build.repo.type == "unstable" %}
-                       border-warning
-               {% elif build.type == "release" and build.repo.type == "testing" %}
-                       border-danger
+               {% if build.type == "release" and build.repo %}
+                       {% if build.repo.type == "stable" %}
+                               border-success
+                       {% elif  build.repo.type == "unstable" %}
+                               border-danger
+                       {% elif build.repo.type == "testing" %}
+                               border-warning
+                       {% end %}
                {% elif build.type == "scratch" %}
-                       border-danger
-               {% end %}" style="width:100%;">
-               <div class="card-header
+                       border-secondary
+               {% end %}
+       "
+       style="width:100%;">
                {% if build.type == "release" and build.repo %}
                        {% if build.repo.type == "stable" %}
-                               text-success">
-                               <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
-                                       {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
-                               </a>
+                               <div class="card-header text-success">
+                                       <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
+                                               {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
+                                       </a>
+                               </div>
                        {% elif build.repo.type == "unstable" %}
-                               text-warning">
-                               <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
-                                       {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
-                               </a>
+                               <div class="card-header text-danger">
+                                       <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
+                                               {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
+                                       </a>
+                               </div>
                        {% elif build.repo.type == "testing" %}
-                               text-danger">
-                               <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
-                                       {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
-                               </a>
+                               <div class="card-header text-warning">
+                                       <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
+                                               {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
+                                       </a>
+                               </div>
                        {% end %}
                {% elif build.type == "scratch" %}
-                       text-secondary">
-                       {{ _("Scratch build") }}
+                       <div class="card-header text-secondary">
+                               {{ _("Scratch build") }}
+                       </div>
                {% end %}
-               </div>
+
                <div class="card-body">
                        <h4 class="card-title">
                                <a href="/build/{{ build.uuid }}">

diff --git a/src/templates/modules/changelog/index.html b/src/templates/modules/changelog/index.html
index 828463b64d71e78e42e7bec382be19254d6cdf7b..24183727c191dbcb34ad8ec7306df28164cb5989 100644 (file)
--- a/src/templates/modules/changelog/index.html
+++ b/src/templates/modules/changelog/index.html
@@ -1,4 +1,3 @@
-
 {% for b in builds %}
        {% module ChangelogEntry(b) %}
 {% end %}

diff --git a/src/templates/packages/changelog.html b/src/templates/packages/changelog.html
index 99340cc4222c283b68f1c840f5ec25f38897bd15..de050131e5935732136d0d86271805600c49c248 100644 (file)
--- a/src/templates/packages/changelog.html
+++ b/src/templates/packages/changelog.html
@@ -3,51 +3,58 @@
 {% block title %}{{ _("Changelog of %s") % name }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/packages">{{ _("Packages") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/package/{{ name }}">{{ name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/package/{{ name }}/changelog">{{ _("Changelog") }}</a>
-               </li>
-       </ul>
-
-       <div class="page-header">
-               <h2>
-                       {{ name }} <small>{{ _("Changelog") }}</small>
-               </h2>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/packages">{{ _("Packages") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/package/{{ name }}">{{ name }}</a></li>
+                                       <li class="breadcrumb-item active">     <a href="/package/{{ name }}/changelog">{{ _("Changelog") }}</a></li>
+                               </ol>
+                       </nav>
+               </div>
        </div>
 
-       {% module Changelog(builds=builds) %}
-
-       <ul class="pager">
-               {% if have_prev %}
-                       <li class="previous">
-                               <a href="?offset={{ offset - limit }}&limit={{ limit }}">&larr; {{ _("Newer") }}</a>
-                       </li>
-               {% else %}
-                       <li class="previous disabled">
-                               <a href="#">&larr; {{ _("Newer") }}</a>
-                       </li>
-               {% end %}
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <h2 style="word-wrap: break-word;">
+                               {{ name }}
+                               <br>
+                               <small>{{ _("Changelog") }}</small>
+                       </h2>
+               </div>
+       </div>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       {% module Changelog(builds=builds) %}
+               </div>
+       </div>
 
-               {% if have_next %}
-                       <li class="next">
-                               <a href="?offset={{ offset + limit }}&limit={{ limit }}">{{ _("Older") }} &rarr;</a>
-                       </li>
-               {% else %}
-                       <li class="next disabled">
-                               <a href="#">{{ _("Older") }} &rarr;</a>
-                       </li>
-               {% end %}
-       </ul>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav>
+                               <ul class="pagination justify-content-center">
+                                       {% if have_prev %}
+                                               <li class="page-item">
+                                                       <a class="page-link" href="?offset={{ offset - limit }}&limit={{ limit }}">&larr; {{ _("Newer") }}</a>
+                                               </li>
+                                       {% else %}
+                                               <li class="page-item disabled">
+                                                       <a class="page-link" href="#">&larr; {{ _("Newer") }}</a>
+                                               </li>
+                                       {% end %}
+                                       {% if have_next %}
+                                               <li class="page-item">
+                                                       <a class="page-link" href="?offset={{ offset + limit }}&limit={{ limit }}">{{ _("Older") }} &rarr;</a>
+                                               </li>
+                                       {% else %}
+                                               <li class="page-item disabled">
+                                                       <a class="page-link" href="#">{{ _("Older") }} &rarr;</a>
+                                               </li>
+                                       {% end %}
+                               </ul>
+                       </nav>
+               </div>
+       </div>
 {% end block %}