[PATCH v3 6/8] templates/patch: Add check summary panel
Stephen Finucane
stephen.finucane at intel.com
Fri Nov 6 04:13:21 AEDT 2015
Add a table to display the checks associated with a patch. This
includes the requisite styling along with some additional filters.
Signed-off-by: Stephen Finucane <stephen.finucane at intel.com>
--
v3: Slight restyling per web UI rework
---
htdocs/css/style.css | 54 ++++++++++++++++++++++++++++++++
patchwork/settings/base.py | 1 +
patchwork/templates/patchwork/patch.html | 32 +++++++++++++++++++
patchwork/templatetags/patch.py | 5 +++
4 files changed, 92 insertions(+)
diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index 96575df..a5eac2e 100644
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -244,6 +244,60 @@ table.patchmeta tr th, table.patchmeta tr td {
padding-top: 1em;
}
+/* checks forms */
+/* TODO(stephenfin): Merge this with 'div.patchform' rules */
+.checks {
+ border: 1px solid gray;
+ margin: 0.5em 1em;
+}
+
+.checks th {
+ margin-top: 0em;
+ margin-left: -0.6em;
+ margin-right: -0.6em;
+ padding: 0.3em 0.3em 0.3em 0.6em;
+ background-color: #0A0A47;
+ color: white;
+ font-size: 100%;
+ font-weight: normal;
+}
+
+.checks td {
+ border-top: 1px solid gray;
+ padding: 10px 15px;
+ padding-left: 0.2em;
+ margin-top: 0em;
+}
+
+.checks td a {
+ text-decoration: none;
+}
+
+.checks td a:visited {
+ color: #786FB4;
+}
+
+.checks a:hover {
+ text-decoration: underline;
+}
+
+.checks .state {
+ font-weight: bold;
+ color: #ddd;
+}
+
+.checks .state.success {
+ color: #82ca9d;
+}
+
+.checks .state.warning {
+ color: #ffe59a;
+}
+
+.checks .state.fail {
+ color: #f7977a;
+}
+
.comment .meta {
background: #f0f0f0;
padding: 0.3em 0.5em;
diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py
index f038727..82c792c 100644
--- a/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -19,6 +19,7 @@ ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
INSTALLED_APPS = [
'django.contrib.auth',
'django.contrib.contenttypes',
+ 'django.contrib.humanize',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.admin',
diff --git a/patchwork/templates/patchwork/patch.html b/patchwork/templates/patchwork/patch.html
index 00dc5a6..37a3beb 100644
--- a/patchwork/templates/patchwork/patch.html
+++ b/patchwork/templates/patchwork/patch.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
+{% load humanize %}
{% load syntax %}
{% load person %}
{% load patch %}
@@ -165,6 +166,37 @@ function toggle_headers(link_id, headers_id)
>{{ patch.pull_url }}</a>
{% endif %}
+{% if patch.checks %}
+<h2>Checks</h2>
+<table class="checks">
+<tr>
+ <th>Context</th>
+ <th>Check</th>
+ <th>Description</th>
+</tr>
+{% for check in patch.checks %}
+<tr>
+ <td>{{ check.context }}</td>
+ <td>
+ <span title="Updated {{ check.date|naturaltime }}"
+ class="state {{ check.get_state_display }}">
+ {{ check.get_state_display }}
+ </span>
+ </td>
+ <td>
+ {% if check.target_url %}
+ <a href="{{ check.target_url }}">
+ {% endif %}
+ {{ check.description }}
+ {% if check.target_url %}
+ </a>
+ {% endif %}
+ </td>
+</tr>
+{% endfor %}
+</table>
+{% endif %}
+
{% for item in patch.commit_message %}
<h2>Commit Message</h2>
<div class="comment">
diff --git a/patchwork/templatetags/patch.py b/patchwork/templatetags/patch.py
index 26cfc13..af5e54d 100644
--- a/patchwork/templatetags/patch.py
+++ b/patchwork/templatetags/patch.py
@@ -51,3 +51,8 @@ def patch_checks(patch):
return mark_safe('<span title="%s">%s</span>' % (
' / '.join(titles),
' '.join([str(counts[state]) for state in required])))
+
+
+ at register.filter(name='state_class')
+def state_class(state):
+ return '-'.join(state.split())
--
2.0.0
More information about the Patchwork
mailing list