From: Jonatan Schlag Date: Thu, 4 Jan 2018 15:39:35 +0000 (+0100) Subject: bootstrap4: port build details page to bootstrap4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd82f3f7682371fc0fef8e77ee4dc3186bfd92a9;p=pbs.git bootstrap4: port build details page to bootstrap4 Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/build-detail.html b/src/templates/build-detail.html index 57d06992..c8fff02f 100644 --- a/src/templates/build-detail.html +++ b/src/templates/build-detail.html @@ -3,220 +3,242 @@ {% block title %}{{ _("Build") }}: {{ build.name }}{% end block %} {% block body %} - - - {% module BuildHeadline(build) %} - {% module BuildStateWarnings(build) %} -
-
-
-
-
-

- {% if build.score > 0 %} - +{{ build.score }} - {% else %} - {{ build.score }} - {% end %} -

- -
- -

- {{ _("Score") }} - - {% if build.state == "broken" %} - {{ _("(broken)") }} - {% elif build.state == "obsolete" %} - {{ _("(obsolete)") }} - {% end %} -

- - {% if build.severity %} -
- - {% if build.severity == "security update" %} - - {{ _("Security update") }} - {% elif build.severity == "bugfix update" %} - - {{ _("Bug fix update") }} - {% elif build.severity == "enhancement" %} - - {{ _("Enhancement") }} - {% elif build.severity == "new package" %} - - {{ _("New package") }} - {% else %} - {{ _("Unhandled: %s") % build.severity }} - {% end %} - {% end %} - - {% if bugs %} -
- -
{{ _("Fixed bugs") }}
+
+ +
+
- +
+ {% if current_user and build.has_perm(current_user) %} +
+ {% module BuildHeadline(build) %} +
+
+
+ +
+ {% if build.type == "release" %} + + {{ _("Change state") }} + + + {{ _("Modify bug list") }} + + {% elif build.type == "scratch" %} + + + {{ _("Delete build") }} + {% end %} -
+
+
+ {% else %} +
+ {% module BuildHeadline(build) %} +
+ {% end %} +
-
- {% if build.type == "release" %} - {% if build.commit %} - {% module CommitMessage(build.commit) %} - -
+ {% module BuildStateWarnings(build) %} -

- {{ _("Author") }} {% module LinkToUser(build.commit.author) %} - ‐ - {{ _("Commit") }} {{ build.pkg.commit.revision[:7] }} -

+
+ {% if build.type == "release" %} +
+ {% else %} +
+ {% end %} +
+ {% if build.severity %} +

+ {% if build.severity == "security update" %} + + {{ _("Security update") }} + {% elif build.severity == "bugfix update" %} + + {{ _("Bug fix update") }} + {% elif build.severity == "enhancement" %} + + {{ _("Enhancement") }} + {% elif build.severity == "new package" %} + + {{ _("New package") }} {% else %} -

{{ _("No commit message.") }}

+ {{ _("Unhandled: %s") % build.severity }} {% end %} - {% elif build.type == "scratch" %} - ... - {% end %} -

+ + {% end %} +
+

+ {{ _("Score") }} +

+

+

+ {% if build.score > 0 %} + +{{ build.score }} + {% else %} + {{ build.score }} + {% end %} +

+ {% if bugs %} +
{{ _("Fixed bugs") }}
+

+
+ + {% else %} +

+
+ {% end %}
- -
- -

-
- - - {{ _("Comment") }} - -
- - {{ _("Log") }} -

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

{{ _("Jobs") }}

+ {% if build.type == "release" %} +
+ {% if build.commit %} + {% module CommitMessage(build.commit) %} + +
+ +

+ {{ _("Author") }} {% module LinkToUser(build.commit.author) %} + ‐ + {{ _("Commit") }} {{ build.pkg.commit.revision[:7] }} +

+ {% else %} +

{{ _("No commit message.") }}

+ {% end %} +
+ {% end %} + {% if build.type == "release" %} +
+ {% else %} +
+ {% end %} +

{{ _("Jobs") }}

{% module JobsBoxes(build) %} -

+

{{ _("Source package") }}

- - {% if current_user and build.has_perm(current_user) %} -
-
- {% if build.type == "release" %} -
- {{ _("Change state") }} - {{ _("Modify bug list") }} -
- {% elif build.type == "scratch" %} -
- - - {{ _("Delete build") }} - -
- {% end %} -
+
+
+

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

- {% end %} +
+ + + {{ _("Comment") }} + +
+
+
+
+ {% module Log(log) %} +
+
+ + + {% module Modal("build-comment", build=build) %} +
{% if build.type == "release" %}
-
- {% if current_user and build.has_perm(current_user) %} - {% if build.repo %} +
+

+ {{ _("Repository") }} +

+
+
+
+ {% if current_user and build.has_perm(current_user) %} + {% if build.repo %} +
+ {{ build.distro.name }} - + {{ build.repo.name }} + {{ _("since %s") % locale.format_date(build.repo_time, relative=False) }} +
{% if build.can_move_forward %} -
- {{ _("Push") }} - - +
+ {{ _("Push") }} +
+
+ {{ _("Unpush") }}
{% module Modal("build-push", build=build, current_repo=repo, next_repo=next_repo) %} {% module Modal("build-unpush", build=build, repo=repo) %} {% else %} - - {{ _("Unpush") }} - - +
+ + {{ _("Unpush") }} + +
{% module Modal("build-unpush", build=build, repo=repo) %} {% end %} - {% else %} + {% else %} +
+ + {{ _("This package does not belong to any repository.") }} + +
+
{% if build.can_move_forward or build.state == "obsolete" %} - + {{ _("Push") }} - {% module Modal("build-push", build=build, current_repo=repo, next_repo=next_repo) %} {% end %} - {% end %} - {% end %} - - {% if build.repo %} - {{ build.distro.name }} - - {{ build.repo.name }} - {{ _("since %s") % locale.format_date(build.repo_time, relative=False) }} - {% else %} - - {{ _("This package does not belong to any repository.") }} - +
{% end %} -
+ {% else %} +
+ {% if build.repo %} + {{ build.distro.name }} - + {{ build.repo.name }} + {{ _("since %s") % locale.format_date(build.repo_time, relative=False) }} + {% else %} + + {{ _("This package does not belong to any repository.") }} + + {% end %} +
+ {% end %}
- -
{% end %} - {% module Modal("build-comment", build=build) %} -
-
-
+
+

+ {{ _("Watchers") }} +

+
+
+
+
{% module WatchersSidebarTable(build, build.get_watchers()) %}
diff --git a/src/templates/modules/build-headline.html b/src/templates/modules/build-headline.html index 21e3c5e4..c463e85b 100644 --- a/src/templates/modules/build-headline.html +++ b/src/templates/modules/build-headline.html @@ -1,26 +1,19 @@ -
-
- {% if pkg.critical_path %} - {{ _("Critical path") }} +

+ {% if shorter %} + {{ pkg.name }} + {% else %} + {{ build.name }} + {% end %} + {% if pkg.critical_path %} + {{ _("Critical path") }} + {% end %} + {% if not short %} + {% if build.type == "release" %} + {{ _("Release build") }} + {% elif build.type == "scratch" %} + {{ _("Scratch build") }} {% end %} - - {% if not short %} - {% if build.type == "release" %} - {{ _("Release build") }} - {% elif build.type == "scratch" %} - {{ _("Scratch build") }} - {% end %} - {% end %} -

- -

- {% if shorter %} - {{ pkg.name }} - {% else %} - {{ build.name }} - {% end %} - -
- {{ pkg.summary }} -

-
+ {% end %} +
+ {{ pkg.summary }} + \ No newline at end of file diff --git a/src/templates/modules/build-state-warnings.html b/src/templates/modules/build-state-warnings.html index 2d5f6bc3..cea4702f 100644 --- a/src/templates/modules/build-state-warnings.html +++ b/src/templates/modules/build-state-warnings.html @@ -1,11 +1,15 @@ {% if build.state == "broken" %} -
- {{ _("This build is broken!") }} - {{ _("This means that the package may cause severe damage on your system and/or does not work at all.") }} +
+
+ +
{% elif build.state == "obsolete" %} -
- {{ _("This build is obsolete!") }} + {% end %}