From: Michael Tremer Date: Sun, 25 Nov 2012 20:44:29 +0000 (+0100) Subject: Redesign build detail page. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba487f5440158be0ce29905c4a5a663c12409284;p=pbs.git Redesign build detail page. --- diff --git a/data/static/css/style.css b/data/static/css/style.css index bb746d11..d033ba5f 100644 --- a/data/static/css/style.css +++ b/data/static/css/style.css @@ -101,3 +101,14 @@ body { .jobs-boxes .well table td { width: 50%; } + +.well-white { + background-color: white; +} + +p.huge { + font-size: 4em; + font-weight: bold; + margin-top: 0.2em; + margin-bottom: 0.4em; +} diff --git a/data/templates/build-detail.html b/data/templates/build-detail.html index 75415427..6fbbf80e 100644 --- a/data/templates/build-detail.html +++ b/data/templates/build-detail.html @@ -24,208 +24,178 @@ {% module BuildHeadline(_("Build"), build) %} {% module BuildStateWarnings(build) %} - {% if build.type == "scratch" and build.has_perm(current_user) %} -
- - - {{ _("Delete build") }} - - - {% if current_user.is_admin() %} - - {{ _("Reset build") }} - - {% end %} +
+
+
+

+ {% if build.credits > 0 %} + +{{ build.credits }} + {% else %} + {{ build.credits }} + {% 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 %} +
- {% end %} - {% if build.type == "release" %} + {% if build.type == "release" %} +
+

{{ _("Changes") }}

+ + {% module Text(build.commit.message_full, remove_linebreaks=False) %} + +

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

+ +
+
+ + {% if bugs %} +
+

+ {{ _("Fixed bugs") }} + ({{ len(bugs) }}) +

+ + {% module BugsTable(pkg, bugs) %} +
+ {% end %} + + {% elif build.type == "scratch" %} +
+ ... +
+ {% end %} +
+ + {% if current_user and build.has_perm(current_user) %}
-
- - -
-
- - - {% if build.pkg.commit %} - - - - - {% end %} - - - - - - - {% if build.message %} - - - - {% end %} - -
{{ _("Commit") }} - {{ build.pkg.commit.revision[:7] }} - - {{ build.pkg.commit.subject }} -
{{ _("Severity") }} - {% if build.severity is None %} - {{ _("Unspecified") }} - {% elif 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 %} -
- {% module Text(build.message) %} -
+ {% end %} +
+
+ {% end %} -
- {% if bugs %} - {% module BugsTable(pkg, bugs) %} - {% else %} -

- {{ _("Nothing in here, yet.") }} -

- {% end %} +
-
-
- - {{ _("Action") }} + {% if build.type == "release" %} +
+
+ {% if current_user and build.has_perm(current_user) %} + {% if build.repo %} + {% if build.can_move_forward %} +
+ {{ _("Push") }} +
-
-
-
-
-
-

{{ _("Repository") }}

- - - - {% if build.repo %} - - - + {% module Modal("build-push", build=build, current_repo=repo, next_repo=next_repo) %} + {% module Modal("build-unpush", build=build, repo=repo) %} {% else %} - - - + + {{ _("Unpush") }} + + + {% module Modal("build-unpush", build=build, repo=repo) %} {% end %} + {% else %} + {% if build.can_move_forward or build.state == "obsolete" %} + + {{ _("Push") }} + - {% if not build.state == "broken" %} - - - + {% module Modal("build-push", build=build, current_repo=repo, next_repo=next_repo) %} {% end %} - -
- {{ build.distro.name }} - - {{ build.repo.name }} - {{ _("since %s") % locale.format_date(build.repo_time, relative=False) }} -
- {{ _("This package does not belong to any repository.") }} -
- {% if current_user and build.has_perm(current_user) %} -
- {% if current_user.is_admin() or build.can_move_forward %} -
- - {{ _("Push") }} - -
- - {% module Modal("build-push", build=build, current_repo=repo, next_repo=next_repo) %} - {% end %} - - {% if build.repo %} -
- - {{ _("Unpush") }} - -
- - {% module Modal("build-unpush", build=build, repo=repo) %} - {% end %} -
- {% elif build.can_move_forward %} - {{ _("This package may be pushed forward.") }} - {% 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 %}
{% end %} - -
-
-
- - - {{ _("Comment") }} - - - {{ _("Score: %s") % build.credits }} - -
- - {% module Modal("build-comment", build=build) %} - - {% module WatchersSidebarTable(build, build.get_watchers()) %} -
-
-
+

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

+ {% module Log(log) %}
+

{{ _("Jobs") }}

+ {% module JobsBoxes(build) %}

@@ -234,55 +204,13 @@

+ {% module Modal("build-comment", build=build) %} +
- - - - - - - {% if build.owner %} - - - - - {% end %} - - {% if current_user and current_user.is_admin() %} - - - - - {% end %} - - - - - -
{{ _("Created") }}{{ format_date(build.created, full_format=True) }}
{{ _("Owner") }}{{ build.owner.realname }}
{{ _("Public?") }} - {% if build.public %} - {{ _("Yes") }} - {% else %} - {{ _("No") }} - {% end %} -
{{ _("Priority") }} - - {% if build.priority >= 2 %} - {{ _("Very high") }} - {% elif build.priority == 1 %} - {{ _("High") }} - {% elif build.priority == 0 %} - {{ _("Medium") }} - {% elif build.priority == -1 %} - {{ _("Low") }} - {% elif build.priority <= -2 %} - {{ _("Very low") }} - {% end %} - -
+ {% module WatchersSidebarTable(build, build.get_watchers()) %}
{% end block %} diff --git a/data/templates/modules/bugs-table.html b/data/templates/modules/bugs-table.html index 70e549a0..42c68e11 100644 --- a/data/templates/modules/bugs-table.html +++ b/data/templates/modules/bugs-table.html @@ -1,17 +1,16 @@ {% for bug in bugs %} - {% end %}
- #{{ bug.id }} -
- {{ bug.status }} - 		{{ bug.summary }} - - {% if bug.assignee %} -
{% raw format_email(bug.assignee) %} - {% end %} +
+ #{{ bug.id }} + + ‐ {{ bug.status }} + {% if bug.resolution %} + {{ bug.resolution }} + {% end %} +