From: Jonatan Schlag Date: Fri, 12 Jan 2018 13:50:17 +0000 (+0100) Subject: bootstrap4: port job details pages X-Git-Url: http://git.ipfire.org/?p=pbs.git;a=commitdiff_plain;h=ab41d0c5769455c4fedbe30b26f55d30ca35b46a bootstrap4: port job details pages Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/jobs-buildroot.html b/src/templates/jobs-buildroot.html index 4da26fd..b93d3c9 100644 --- a/src/templates/jobs-buildroot.html +++ b/src/templates/jobs-buildroot.html @@ -3,92 +3,94 @@ {% block title %}{{ _("Job buildroot")}}: {{ job.name }}{% end block %} {% block body %} - -
-

- {{ _("Build job")}}: {{ job.name }} {{ _("Buildroot") }} -

+
+
+ +
-
-

- {{ _("The packages listed below were used to build %s.") % job.name }} -

+
+

+ {{ _("Build job")}}: {{ job.name }}
+ {{ _("Buildroot") }} +

+
-
- - - - - - - - - - - - - -
{{ _("Packages") }}{{ len(buildroot) }}
{{ _("Buildroot size") }}{{ format_size(buildroot_size) }}
{{ _("Download size") }}{{ format_size(download_size) }}
+ +
+
+
+ + + + + + + + + + + + + +
{{ _("Packages") }}{{ len(buildroot) }}
{{ _("Buildroot size") }}{{ format_size(buildroot_size) }}
{{ _("Download size") }}{{ format_size(download_size) }}
+
-
+
+
+

+ {{ _("The packages listed below were used to build %s.") % job.name }} +

+
+
- - - {% for name, uuid, pkg in buildroot %} - - {% if pkg %} - - - - {% else %} - - - - {% end %} - - {% end %} - -
- {{ pkg.friendly_name }} - - {{ pkg.summary }} - - {{ format_size(pkg.filesize) }} - - {{ name }} - - ({{ uuid }}) - - {{ _("N/A") }} -
+
+
+
+ + + {% for name, uuid, pkg in buildroot %} + + {% if pkg %} + + + + {% else %} + + + + {% end %} + + {% end %} + +
+ {{ pkg.friendly_name }} + + {{ pkg.summary }} + + {{ format_size(pkg.filesize) }} + + {{ name }} + + ({{ uuid }}) + + {{ _("N/A") }} +
+
+
+
{% end block %} diff --git a/src/templates/jobs-detail.html b/src/templates/jobs-detail.html index 9d605d5..05c084c 100644 --- a/src/templates/jobs-detail.html +++ b/src/templates/jobs-detail.html @@ -3,145 +3,181 @@ {% block title %}{{ _("Job") }}: {{ job.name }}{% end block %} {% block body %} - - -
- - {{ _("Actions") }} - - -
+
+
+ +
+
-
-

- {{ _("Build job") }}: {{ job.name }}
- {{ job.pkg.summary }} -

+
+ {% if current_user and job.state in ("dispatching", "running", "uploading", "aborted", "failed", "finished") %} +
+

+ {{ _("Build job") }}: {{ job.name }} + {% module JobState(job, cls="float-lg-right float-xl-right", show_icon=False) %} +
+ {{ job.pkg.summary }} +

+
+
+
+ +
+ {% if job.state in ("dispatching", "running", "uploading") %} + + {{ _("Abort job") }} + + {% elif job.state in ("aborted", "failed") %} + + {{ _("Restart job") }} + + {% elif job.state == "finished" %} + + {{ _("Schedule test build") }} + + {% end %} +
+
+
+ {% else %} +
+

+ {{ _("Build job") }}: {{ job.name }} + {% module JobState(job, cls="float-lg-right float-xl-right", show_icon=False) %} +
+ {{ job.pkg.summary }} +

+
+ {% end %}
+ + {% if job.message %} -
- {{ "
".join(job.message.splitlines()) }} +
+
+
+ {{ "
".join(job.message.splitlines()) }} +
+
{% end %} {% if job.state == "aborted" and job.aborted_state %} -
- {{ _("Job has been aborted") }} -

- {{ _("This build job is in an aborted state, because the build process crashed unexpectedly.") }} - {{ _("In most cases, there is no log file and you must figure out the issue on your own.") }} -

-

- {{ _("The error code is:") }} - - {% if job.aborted_state == -11 %} - SEGV - {{ _("Segmentation violation") }} - {% else %} - {{ job.aborted_state }} - {{ _("Unknown") }} - {% end %} -

- - {% if current_user and current_user.is_admin() %} -

- {{ _("You may resubmit the job to try again:") }} - {{ _("Re-submit build") }} -

- {% end %} +
+
+ +
{% end %}
-
-
-
-
- {% module JobState(job, cls="lead", show_icon=True) %} - +
+

{{ _("General") }}

+
+ + {% if job.rank %} -

- {{ _("#%s in the build queue") % job.rank }} -

+ + + + {% end %} - -
- -

- {{ friendly_time(job.duration) }} - {% if job.builder %} -
- {{ job.builder.name }} - {% else %} - {{ _("No builder assigned.") }} - {% end %} -

- - -
-

- {{ _("Created") }}
+

+ + + + + + + + + + + + + {% if job.time_started %} + + + + + {% end %} + {% if job.time_finished %} + + + + + {% end %} + +
+ {{ _("Job rank") }} + + {{ _("#%s in the build queue") % job.rank }} +
+ {{ _("Time") }} + + {{ friendly_time(job.duration) }} +
+ {{ _("Builder") }} + + {% if job.builder %} + {{ job.builder.name }} + {% else %} + {{ _("No builder assigned.") }} + {% end %} +
+ {{ _("Created") }} + {{ format_date(job.time_created, full_format=True) }} -

- {% if job.time_started %} -

- {{ _("Started") }}
+

+ {{ _("Started") }} + {{ format_date(job.time_started, full_format=True) }} -

- {% end %} - {% if job.time_finished %} -

- {{ _("Finished") }}
+

+ {{ _("Finished") }} + {{ format_date(job.time_finished, full_format=True) }} -

- {% end %} - - +
-
-

{{ _("Build logs") }}

+
+

{{ _("Build logs") }}

{% if job.logfiles %} {% module LogFilesTable(job, job.logfiles) %} {% else %} @@ -149,8 +185,7 @@ {% end %} {% if job.buildroot %} -
-

+

{{ _("Buildroot") }} ({{ _("%s package", "%s packages", len(job.buildroot)) % len(job.buildroot) }})

@@ -159,21 +194,29 @@
{% if len(job) > 0 %} -
- -

- {{ _("Package files") }} - ({{ len(job) }}) -

- - {% module PackagesTable(job, job) %} +
+
+

+ {{ _("Package files") }} + ({{ len(job) }}) +

+
+
+ {% module PackagesTable(job, job) %} +
+
{% end %} {% if log %} -
- -

{{ _("Log") }}

- - {% module Log(log) %} +
+
+

+ {{ _("Log") }} +

+
+
+ {% module Log(log) %} +
+
{% end %} {% end block %} diff --git a/src/templates/modules/packages-table.html b/src/templates/modules/packages-table.html index 67ab5d9..34b3682 100644 --- a/src/templates/modules/packages-table.html +++ b/src/templates/modules/packages-table.html @@ -1,27 +1,28 @@ - - - - - - - - - - - {% for package in packages %} +
+
{{ _("Name") }}{{ _("Summary") }}{{ _("Size") }} 
+ - - - - + + + + - {% end %} - -
- {{ package.friendly_name }} - {{ package.summary }}{{ format_size(package.filesize) }} - - - {{ _("Download") }} - - {{ _("Name") }}{{ _("Summary") }}{{ _("Size") }} 
+ + + {% for package in packages %} + + + {{ package.friendly_name }} + + {{ package.summary }} + {{ format_size(package.filesize) }} + + + {{ _("Download") }} + + + + {% end %} + + +
\ No newline at end of file