[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:20:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c0fdbf9e2898a6f8cf82bb61ef49bb7516d2c94e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 11 10:06:21 2010 +0000
2010-09-11 Mihai Parparita <mihaip at chromium.org>
Reviewed by Adam Barth.
Group statuses in queue status by patch ID
https://bugs.webkit.org/show_bug.cgi?id=45588
Group statuses by patch ID so that the status page is easier
to scan.
* QueueStatusServer/handlers/queuestatus.py:
* QueueStatusServer/stylesheets/dashboard.css:
(.status-group):
(.status-bug):
(.status-group ul):
(.status-group ul li):
(.status-group ul li:hover):
(.status-cell):
(.status-cell:hover):
(.status-cell.pass):
(.status-cell.fail):
(.status-cell.pending):
(.status-cell.error):
* QueueStatusServer/templates/dashboard.html:
* QueueStatusServer/templates/queuestatus.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67295 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4dcddf1..88d112c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,31 @@
2010-09-11 Mihai Parparita <mihaip at chromium.org>
+ Reviewed by Adam Barth.
+
+ Group statuses in queue status by patch ID
+ https://bugs.webkit.org/show_bug.cgi?id=45588
+
+ Group statuses by patch ID so that the status page is easier
+ to scan.
+
+ * QueueStatusServer/handlers/queuestatus.py:
+ * QueueStatusServer/stylesheets/dashboard.css:
+ (.status-group):
+ (.status-bug):
+ (.status-group ul):
+ (.status-group ul li):
+ (.status-group ul li:hover):
+ (.status-cell):
+ (.status-cell:hover):
+ (.status-cell.pass):
+ (.status-cell.fail):
+ (.status-cell.pending):
+ (.status-cell.error):
+ * QueueStatusServer/templates/dashboard.html:
+ * QueueStatusServer/templates/queuestatus.html:
+
+2010-09-11 Mihai Parparita <mihaip at chromium.org>
+
Reviewed by Tony Chang.
Implement layoutTestController.dumpResourceResponseMIMETypes in Chromium DRT
diff --git a/WebKitTools/QueueStatusServer/handlers/queuestatus.py b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
index 5295b17..6c6a3d0 100644
--- a/WebKitTools/QueueStatusServer/handlers/queuestatus.py
+++ b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
@@ -50,9 +50,27 @@ class QueueStatus(webapp.RequestHandler):
def get(self, queue_name):
work_items = WorkItems.all().filter("queue_name =", queue_name).get()
statuses = queuestatus.QueueStatus.all().filter("queue_name =", queue_name).order("-date").fetch(15)
+
+ status_groups_by_patch_id = {}
+ status_groups = []
+ synthetic_patch_id_counter = 0
+
+ for status in statuses:
+ if status.active_patch_id:
+ patch_id = status.active_patch_id
+ else:
+ patch_id = 'synthetic-' + synthetic_patch_id_counter
+ synthetic_patch_id_counter += 1
+
+ if patch_id not in status_groups_by_patch_id:
+ new_status_group = []
+ status_groups_by_patch_id[patch_id] = new_status_group
+ status_groups.append(new_status_group)
+ status_groups_by_patch_id[patch_id].append(status)
+
template_values = {
"display_queue_name": display_name_for_queue(queue_name),
"work_item_rows": self._rows_for_work_items(work_items),
- "statuses": statuses,
+ "status_groups": status_groups,
}
self.response.out.write(template.render("templates/queuestatus.html", template_values))
diff --git a/WebKitTools/QueueStatusServer/stylesheets/dashboard.css b/WebKitTools/QueueStatusServer/stylesheets/dashboard.css
index 1ecf2eb..7b4f857 100644
--- a/WebKitTools/QueueStatusServer/stylesheets/dashboard.css
+++ b/WebKitTools/QueueStatusServer/stylesheets/dashboard.css
@@ -44,36 +44,59 @@ td {
tr:hover, li:hover {
background-color: #EEE;
}
+
+.status-group {
+ font-size: 90%;
+}
+
+.status-bug {
+ font-weight: bold;
+}
+
+.status-group ul {
+ font-size: 90%;
+}
+
+.status-group ul li {
+ padding: 2px 0 2px 7px;
+ overflow: hidden;
+}
+
+.status-group ul li:hover {
+ background: #ddd;
+}
+
.status-date {
color: #AAA;
float: right;
font-size: 8pt;
}
-.status {
+
+.status-cell {
margin: 1px;
padding: 1px 2px;
font-size: 9pt;
border: 1px solid transparent;
}
-.status:hover {
+.status-cell:hover {
border: 1px solid black;
}
-.pass {
+.status-cell.pass {
background-color: #8FDF5F;
cursor: pointer;
/* border: 1px solid #4F8530; */
}
-.fail {
+.status-cell.fail {
background-color: #E98080;
cursor: pointer;
/* border: 1px solid #A77272; */
}
-.pending {
+.status-cell.pending {
background-color: #FFFC6C;
cursor: pointer;
/* border: 1px solid #C5C56D; */
}
-.error {
+.status-cell.error {
background-color: #E0B0FF;
cursor: pointer;
/* border: 1px solid #ACA0B3; */
diff --git a/WebKitTools/QueueStatusServer/templates/dashboard.html b/WebKitTools/QueueStatusServer/templates/dashboard.html
index c5c2359..f88a5ea 100644
--- a/WebKitTools/QueueStatusServer/templates/dashboard.html
+++ b/WebKitTools/QueueStatusServer/templates/dashboard.html
@@ -24,14 +24,14 @@ function statusDetail(patch_id) {
</thead>
<tbody>{% for row in rows %}
<tr>
- <td class="status">
+ <td class="status-cell">
{{ row.bug_id|force_escape|webkit_bug_id|safe }}
</td>
- <td class="status">
+ <td class="status-cell">
{{ row.attachment_id|force_escape|webkit_attachment_id|safe }}
</td>
{% for bubble in row.bubbles %}
- <td class="status {{ bubble.status_class }}"
+ <td class="status-cell {{ bubble.status_class }}"
{% if bubble.status %}
onclick="statusDetail({{ row.attachment_id }})"
title="{{ bubble.status_date|timesince }}"
diff --git a/WebKitTools/QueueStatusServer/templates/queuestatus.html b/WebKitTools/QueueStatusServer/templates/queuestatus.html
index 38c125f..3a4f1a7 100644
--- a/WebKitTools/QueueStatusServer/templates/queuestatus.html
+++ b/WebKitTools/QueueStatusServer/templates/queuestatus.html
@@ -11,18 +11,29 @@
<div class="status-details">
<ul>
- {% for status in statuses %}
- <li>{% if status.active_bug_id %}
- <span class="status-bug">
- Patch {{ status.active_patch_id|force_escape|webkit_attachment_id|safe }} from bug
- {{ status.active_bug_id|force_escape|webkit_bug_id|safe }}:
- </span>{% endif %}
- <span class="status-message">{{ status.message|force_escape|urlize|webkit_linkify|safe }}</span>
- {% if status.results_file %}
- <span class="status-results">[{{ status.key.id|results_link|safe }}]</span>
- {% endif %}
- <span class="status-date">{{ status.date|timesince }} ago</span>
- </li>
+ {% for status_group in status_groups %}
+ {% with status_group.0 as title_status %}
+ <li class="status-group">
+ {% if title_status.active_bug_id %}
+ <span class="status-bug">
+ Patch {{ title_status.active_patch_id|force_escape|webkit_attachment_id|safe }} from bug
+ {{ title_status.active_bug_id|force_escape|webkit_bug_id|safe }}:
+ </span>
+ {% endif %}
+
+ <ul>
+ {% for status in status_group %}
+ <li class="status">
+ <span class="status-date">{{ status.date|timesince }} ago</span>
+ <span class="status-message">{{ status.message|force_escape|urlize|webkit_linkify|safe }}</span>
+ {% if status.results_file %}
+ <span class="status-results">[{{ status.key.id|results_link|safe }}]</span>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endwith %}
{% endfor %}
</ul>
</div>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list