From: Jonatan Schlag Date: Mon, 18 Dec 2017 10:45:42 +0000 (+0100) Subject: bootstrap4: port build overview to bootstrap4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=510aa006b63590504cee24276c21574b7d93540d;p=pbs.git bootstrap4: port build overview to bootstrap4 Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/build-index.html b/src/templates/build-index.html index 65df0a77..3eb4dd0f 100644 --- a/src/templates/build-index.html +++ b/src/templates/build-index.html @@ -3,25 +3,44 @@ {% block title %}{{ _("Builds") }}{% end block %} {% block body %} - - +
+
+ +
+
+ +
+
+

+ {{ _("Builds") }} +

+
+
+
+ +
+ + {{ _("Show Comments") }} + +
+
+
+
-
-

{{ _("Builds") }}

+
+
+ {% module BuildTable(builds, show_user=True) %} +
- {% module BuildTable(builds, show_user=True) %} {% end block %} diff --git a/src/templates/modules/build-table.html b/src/templates/modules/build-table.html index a2d5438f..4df9988c 100644 --- a/src/templates/modules/build-table.html +++ b/src/templates/modules/build-table.html @@ -1,85 +1,93 @@ {% if dates %} - - - {% for date, builds in dates %} - - - - - - - {% if show_repo %} - - {% end %} - {% if show_user %} - - {% end %} - {% if show_when %} - - {% end %} - - - {% for build in builds %} - - - - +
-

- {% module HeadingDate(date) %} - ({{ len(builds) }}) -

-
{{ _("Build") }}{{ _("Jobs") }}{{ _("Repository") }}{{ _("User") }}{{ _("Created") }}
- {{ build.name }} - - {% module JobsStatus(build) %} +
+ + + {% for date, builds in dates %} + + - + + + + {% if show_repo %} - + {% end %} - {% if show_user %} - {% if build.type == "scratch" and build.user %} - - {% elif build.type == "release" %} - - {% else %} - - {% end %} + {% end %} - {% if show_when %} - + {% end %} + - {% if show_repo_time %} - + - {% end %} - {% if show_can_move_forward %} - {% end %} - + + {% if show_repo %} + + {% end %} + + {% if show_user %} + {% if build.type == "scratch" and build.user %} + + {% elif build.type == "release" %} + + {% else %} + + {% end %} + {% end %} + + {% if show_when %} + + {% end %} + + {% if show_repo_time %} + + {% end %} + + {% if show_can_move_forward %} + + {% end %} + + {% end %} {% end %} - {% end %} - -
+

+ {% module HeadingDate(date) %} + ({{ len(builds) }}) +

{{ _("Build") }}{{ _("Jobs") }} - {% if build.repo %} - {{ build.distro.name }} / - {{ build.repo.name }} - {% end %} - {{ _("Repository") }} - {% module LinkToUser(build.user) %} - {% module LinkToUser(build.pkg.maintainer) %}{{ _("User") }} - {{ format_date(build.created, relative=True) }} - {{ _("Created") }}
- {{ format_date(build.repo_time, relative=False) }} + {% for build in builds %} +
+ + {% if build.is_broken() %} + {{ build.name }} + {% else %} + {{ build.name }} + {% end %} + - {{ build.can_move_forward }} + {% module JobsStatus(build) %}
+ {% if build.repo %} + {{ build.distro.name }} / + {{ build.repo.name }} + {% end %} + + {% module LinkToUser(build.user) %} + {% module LinkToUser(build.pkg.maintainer) %} + {{ format_date(build.created, relative=True) }} + + {{ format_date(build.repo_time, relative=False) }} + + {{ build.can_move_forward }} +
+
+
{% else %} -

+

{{ _("There are no builds to show at this place right now.") }}

{% end %}