diff options
author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebKitTools/QueueStatusServer/templates | |
parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebKitTools/QueueStatusServer/templates')
-rw-r--r-- | WebKitTools/QueueStatusServer/templates/queuestatus.html | 44 | ||||
-rw-r--r-- | WebKitTools/QueueStatusServer/templates/recentstatus.html | 60 |
2 files changed, 89 insertions, 15 deletions
diff --git a/WebKitTools/QueueStatusServer/templates/queuestatus.html b/WebKitTools/QueueStatusServer/templates/queuestatus.html new file mode 100644 index 0000000..38c125f --- /dev/null +++ b/WebKitTools/QueueStatusServer/templates/queuestatus.html @@ -0,0 +1,44 @@ +<!DOCTYPE html> +<html> +<head> +<title>{{ display_queue_name }} Status</title> +<link type="text/css" rel="stylesheet" href="/stylesheets/dashboard.css" /> +</head> +<body> +<h1>{{ display_queue_name }} Status</h1> + +<h3>Recent Status</h3> + +<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> + {% endfor %} + </ul> +</div> + +<h3>Patches in queue</h3> +<table> + <tr><th>Position</th><th>Patch</th></tr> + {% for row in work_item_rows %} + <tr> + <td>#{{ forloop.counter }}</td> + <td> + {{ row.attachment_id|force_escape|webkit_attachment_id|safe }} + </td> + </tr> + {% endfor %} +</table> + +</body> +</html> diff --git a/WebKitTools/QueueStatusServer/templates/recentstatus.html b/WebKitTools/QueueStatusServer/templates/recentstatus.html index 2bb9fbb..808d8d7 100644 --- a/WebKitTools/QueueStatusServer/templates/recentstatus.html +++ b/WebKitTools/QueueStatusServer/templates/recentstatus.html @@ -3,22 +3,52 @@ <head> <title>WebKit Queue Status</title> <link type="text/css" rel="stylesheet" href="/stylesheets/dashboard.css" /> +<style> +.queue_bubble { + border: 1px solid black; + margin-bottom: 10px; + border-radius: 10px; + padding: 5px; +} +.queue_name { + float:left; +} +.last_heard_from { + float: right; +} +.status_text { + clear: both; +} +.alive { + background-color: #8FDF5F; +} +.behind { + background-color: #FFFC6C; +} +.dead { + background-color: #E98080; +} +</style> </head> <body> -<h1>WebKit Queue Status</h1>{% for queue_name, statuses in queue_status.items %} -<div class="status-details"> - <h2>{{ queue_name }}</h2> - <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>{% endfor %} - </ul> -</div>{% endfor %} +<h1>WebKit Queue Status</h1> +{% for queue in queues %} +<div class="queue_bubble {{ queue.status_class }}"> + <div class="queue_name"> + <a href="/queue-status/{{ queue.name }}"> + {{ queue.display_name }} + </a> + </div> + {% if queue.last_heard_from %} + <div class="last_heard_from">{{ queue.last_heard_from|timesince }} ago</div> + {% endif %} + <div class="status_text"> + Status: {{ queue.status_text|force_escape|urlize|webkit_linkify|safe }} + </div> + <div> + {{ queue.pending_items_count }} pending + </div> +</div> +{% endfor %} </body> </html> |