diff options
Diffstat (limited to 'WebKitTools/QueueStatusServer/templates')
3 files changed, 33 insertions, 15 deletions
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/includes/singlequeuestatus.html b/WebKitTools/QueueStatusServer/templates/includes/singlequeuestatus.html new file mode 100644 index 0000000..075cd39 --- /dev/null +++ b/WebKitTools/QueueStatusServer/templates/includes/singlequeuestatus.html @@ -0,0 +1,5 @@ +<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 %} diff --git a/WebKitTools/QueueStatusServer/templates/queuestatus.html b/WebKitTools/QueueStatusServer/templates/queuestatus.html index 38c125f..d2d72c7 100644 --- a/WebKitTools/QueueStatusServer/templates/queuestatus.html +++ b/WebKitTools/QueueStatusServer/templates/queuestatus.html @@ -11,18 +11,31 @@ <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 %} + + {% ifequal status_group|length 1 %} + {% with title_status as status %} + {% include 'includes/singlequeuestatus.html' %} + {% endwith %} + {% else %} + <ul> + {% for status in status_group %} + <li class="status"> + {% include 'includes/singlequeuestatus.html' %} + </li> + {% endfor %} + </ul> + {% endifequal %} + </li> + {% endwith %} {% endfor %} </ul> </div> |