jobs: Move runtime into subtitle

This is a lot easier and looks cleaner because the runtime has a very
variable width.

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

diff --git a/src/templates/jobs/macros.html b/src/templates/jobs/macros.html
index aa10c01c553f8faaafeabf9bbc154da0c7ac3dd4..140c1fd1e8af3cbb337d2ecb62d675f4a5431f96 100644 (file)
--- a/src/templates/jobs/macros.html
+++ b/src/templates/jobs/macros.html
@@ -112,7 +112,12 @@
                                                                {% elif job.has_failed() %}
                                                                        <p class="has-text-danger">
                                                                                <small>
-                                                                                       {{ _("Failed %s") % job.finished_at | format_date(shorter=True) }}
+                                                                                       {% set args = {
+                                                                                               "duration" : job.duration | format_time,
+                                                                                               "when"     : job.finished_at | format_date(shorter=True),
+                                                                                       } %}
+
+                                                                                       {{ _("Failed %(when)s after %(duration)s") % args }}
                                                                                </small>
                                                                        </p>
 
@@ -120,7 +125,12 @@
                                                                {% elif job.has_finished() %}
                                                                        <p class="has-text-success">
                                                                                <small>
-                                                                                       {{ _("Finished %s") % job.finished_at | format_date(shorter=True) }}
+                                                                                       {% set args = {
+                                                                                               "duration" : job.duration | format_time,
+                                                                                               "when"     : job.finished_at | format_date(shorter=True),
+                                                                                       } %}
+
+                                                                                       {{ _("Finished %(when)s in %(duration)s") % args }}
                                                                                </small>
                                                                        </p>
 
@@ -175,15 +185,6 @@
                                                        {% endif %}
                                                {% endif %}
 
-                                               {# Runtime #}
-                                               {% if job.has_finished() %}
-                                                       <div class="level-item">
-                                                               <div class="tag">
-                                                                       {{ job.duration | format_time }}
-                                                               </div>
-                                                       </div>
-                                               {% endif %}
-
                                                {# Logs #}
                                                {% if job.show_log() %}
                                                        <div class="level-item">