Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit e319320c6e59deb49f91adefb897814f156366a3 Author: Adam Samalik asamalik@redhat.com Date: Thu Jul 3 16:52:44 2014 +0200
[frontend] pkg name and version on the build page
frontend/coprs_frontend/coprs/filters.py | 16 +++ frontend/coprs_frontend/coprs/static/copr.css | 23 ++++- .../templates/coprs/detail/_builds_table.html | 2 +- .../coprs/templates/coprs/detail/build.html | 127 ++++++++++++++------ 4 files changed, 130 insertions(+), 38 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/filters.py b/frontend/coprs_frontend/coprs/filters.py index 2f6aada..03e80cf 100644 --- a/frontend/coprs_frontend/coprs/filters.py +++ b/frontend/coprs_frontend/coprs/filters.py @@ -114,3 +114,19 @@ def parse_package_name(pkg): if pkg is not None: return helpers.parse_package_name(os.path.basename(pkg)) return pkg + + +@app.template_filter("basename") +def parse_package_name(pkg): + if pkg is not None: + return os.path.basename(pkg) + return pkg + + +@app.template_filter("build_state_description") +def build_state_decoration(state): + description = "" + if state == "skipped": + description = "This package has already been built previously" + + return description diff --git a/frontend/coprs_frontend/coprs/static/copr.css b/frontend/coprs_frontend/coprs/static/copr.css index 8fb91e9..bb8cc40 100644 --- a/frontend/coprs_frontend/coprs/static/copr.css +++ b/frontend/coprs_frontend/coprs/static/copr.css @@ -22,7 +22,9 @@ h2 { }
h2.build-detail { - font-size: 1.8em; + font-size: 1.4em; + margin-bottom: 0px; + font-weight: normal; }
h3 { @@ -359,6 +361,25 @@ tr.build-row-skipped { color: #666; }
+dl.aligned dt { + font-weight: bolder; +} + +dl.aligned dd { + margin-left: 0; +} + +dl.aligned dt.oneline { + float: left; + clear: left; + margin-right: 9px; + font-weight: bold; +} + +dl.aligned div { + margin-bottom: 18px; +} + table.releases th { background-color: #f2f2f2; text-align: left; diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html index c3dbef2..65a2485 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html @@ -30,7 +30,7 @@ {% endif %} </td> <td> {{ build.started_on|time_ago(build.ended_on) }} </td> - <td class="build-{{ build.state }}">{{ build.state }}</td> + <td class="build-{{build.state}}" alt="{{build.state|build_state_description}}">{{ build.state }}</td> </tr> {% endfor %} </table> diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html index a8377cd..bec6956 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html @@ -10,7 +10,12 @@
{% else %} - <h2 class="build-detail"> Build {{ build.id }} in {{ build.copr.owner.name }}/{{ build.copr.name }}</h2> + <h2 class="build-detail" alt="{{build.state|build_state_description}}"> + <b>Build {{ build.id }}:</b> + <span class="build-{{build.state}}"> {{ build.state }} </span> + - {{build.pkgs|basename}} + </h2> + <div class="build-buttons" > {% if g.user and g.user.can_build_in(copr) %} {{ copr_build_cancel_form(build, page) }} @@ -21,46 +26,96 @@ {% endif %} </div>
- <dl> - <dt class="field-label"> Package name:<dt> - <dd>{{ build.pkgs|pkg_name }}</dd> - </dt> - <dt class="field-label"> Build time:</dt> - <dd><b>Submitted: </b> - {% if g.user %} - {{ build.submitted_on|localized_time(g.user.timezone) }} + <dl class="aligned" > + <div> + <dt> Results:</dt> + {% if build.results %} + <dd><a href="{{ build.results }}">{{ build.results }}</a></dd> + {% else %} + <dd>No results yet</dd> + {% endif %} + </div> + <div> + <dt class="oneline"> Name:</dt> + {% if build.pkg_name %} + <dd>{{ build.pkg_name }}</dd> {% else %} - {{ build.submitted_on|localized_time("UTC") }} + <dd>{{ build.pkgs|pkg_name }}</dd> {% endif %} - ({{ build.submitted_on|time_ago }} ago) - </dd> - <dd><b>Started: </b> - {% if g.user %} - {{ build.started_on|localized_time(g.user.timezone) }} + + + <dt class="oneline"> Version:</dt> + {% if build.pkg_version %} + <dd>{{ build.pkg_version }}</dd> {% else %} - {{ build.started_on|localized_time("UTC") }} + <dd> - </dd> {% endif %} - ({{ build.started_on|time_ago }} ago) - </dd> - <dd><b>Build time: </b> {{ build.started_on|time_ago(build.ended_on) }} </dd> - <dt class="field-label"> Results:</dt> - {% if build.results %} - <dd><a href="{{ build.results }}">{{ build.results }}</a></dd> - {% else %} - <dd>No results yet</dd> - {% endif %} - <dt class="field-label"> Chroots:</dt> - {% for chroot in build.build_chroots %} - <dd><b>{{ chroot.name }}: </b> - <span class="build-{{ chroot.status|state_from_num }}">{{ chroot.status|state_from_num }}</span> + </div> + <div> + <dt> Chroots:</dt> + {% for chroot in build.build_chroots %} <tr> + <dd> + {{ chroot.name }}: + <span class="build-{{chroot.state}}" + alt="{{chroot.state|build_state_description}}"> + {{ chroot.state }} + </span> + </dd> + {% endfor %} + </div> + <div> + <dt class="oneline"> Submitted: </dt> + <dd> + {% if g.user %} + {{ build.submitted_on|localized_time(g.user.timezone) }} + {% else %} + {{ build.submitted_on|localized_time("UTC") }} + {% endif %} + ({{ build.submitted_on|time_ago }} ago) + </dd> + + + <dt class="oneline"> Started: </dt> + <dd> + {% if g.user %} + {{ build.started_on|localized_time(g.user.timezone) }} + {% else %} + {{ build.started_on|localized_time("UTC") }} + {% endif %} + </dd> + + + <dt class="oneline"> Finished: </dt> + <dd> + {% if g.user %} + {{ build.ended_on|localized_time(g.user.timezone) }} + {% else %} + {{ build.ended_on|localized_time("UTC") }} + {% endif %} + </dd> + + + <dt class="oneline"> Build time: </dt> + <dd> + {{ build.started_on|time_ago(build.ended_on) }} + </dd> + </div> + <div> + <dt> Source: </dt> + <dd> + {% if build.pkgs is not none %} + {% for pkg in build.pkgs.split() %} + <dd> <a href="{{ pkg }}">{{ pkg }}</a></dd> + {% endfor %} + {% endif %} + </dd> + </div> + <div> + <dt class="oneline"> Submitted by: </dt> + <dd> + {{ build.user.name }} </dd> - {% endfor %} - <dt class="field-label"> Package URL:</dt> - {% if build.pkgs is not none %}{% for pkg in build.pkgs.split() %} - <dd> <a href="{{ pkg }}">{{ pkg }}</a></dd> - {% endfor %}{% endif %} - <dt class="field-label"> Submitted by:</dt> - <dd>{{ build.user.name }}</dd> + </div> </dl>