From: Michael Tremer Date: Sat, 29 Apr 2023 10:54:14 +0000 (+0000) Subject: jobs: Redesign the big module X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52eb3273045d5cc976362246c5b9da0964ccab01;p=pbs.git jobs: Redesign the big module Signed-off-by: Michael Tremer --- diff --git a/src/templates/jobs/modules/list.html b/src/templates/jobs/modules/list.html index 6e6fe429..6bf9a6be 100644 --- a/src/templates/jobs/modules/list.html +++ b/src/templates/jobs/modules/list.html @@ -2,93 +2,106 @@ {% set build = job.build %}
-
-
-
-
-
- {% if show_arch_only %} - {{ job.arch }} - {% else %} - - {{ job }} - - {% end %} +
- {% if job.has_failed() %} - - {{ _("Failed") }} - - {% end %} -
+

+ {% if show_arch_only %} + {{ job.arch }} + {% else %} + + {{ job }} + + {% end %} - {% if build.owner %} -

- {{ build.owner }} -
- {% end %} -
+ {% if job.is_aborted() %} + + {{ _("Aborted %(when)s by %(who)s") % { + "when" : locale.format_date(job.aborted_at), + "who" : job.aborted_by, + } }} + + {% elif job.is_pending() %} + + + + + + + + {{ _("Pending since %s") % locale.format_date(job.created_at, shorter=True) }} + + + + {% elif job.is_running() %} + + + + + - {% if job.is_aborted() %} -
- - {{ _("Aborted %s") % locale.format_date(job.aborted_at) }} + + {{ _("Running since %s") % format_time(job.duration) }} -
- {% elif job.has_finished() %} -
- {{ _("Finished %s") % \ - locale.format_date(job.finished_at, shorter=True) }} -
- {% end %} + + + {% elif job.has_failed() %} + + {{ _("Failed %s") % locale.format_date(job.finished_at, shorter=True) }} + + {% elif job.has_finished() %} + + {{ _("Finished %s") % locale.format_date(job.finished_at, shorter=True) }} + + {% end %} +

+ + {% if job.is_pending() and job.depcheck_succeeded is False %} +
+ 
{{ job.message }}
+ {% end %} - {% if job.is_running() %} -
-
- -
+ {# Show all packages that have been built #} + {% if show_packages and job.packages %} + {% for package in job.packages %} + + + + + {{ package.name }} + + {% end %} + {% end %} + + {% if job.is_running() or job.has_failed() or job.has_finished() %} +
+
+ {% if job.builder %} + + {{ _("Builder %s") % job.builder }} + + {% end %} -
- {{ format_time(job.duration, shorter=True) }} -
+ + {{ _("View Log") }} + -
- + {% if job.is_running() %} + {{ _("Abort") }} -
-
- {% end %} -
- - {# Show all packages that have been built #} - {% if show_packages and job.packages %} -
- +
{% end %} - - {# Footer with some useful buttons #} - -
+
{% end %}