Changeset 85247 in webkit

Timestamp:

Apr 28, 2011 3:22:20 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-04-28 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

EWS Bubbles should show commit-queue position when patch is in the commit-queue
​https://bugs.webkit.org/show_bug.cgi?id=59744

This was actually just a 2 line change to statusbubble.py.
I also cleaned up statusbubble.html a little while I was there
(the links are now actual <a> tags and have hover).

• QueueStatusServer/handlers/statusbubble.py:
• QueueStatusServer/templates/statusbubble.html:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QueueStatusServer/handlers/statusbubble.py (modified) (2 diffs)
• QueueStatusServer/templates/statusbubble.html (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-28  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        EWS Bubbles should show commit-queue position when patch is in the commit-queue
+        https://bugs.webkit.org/show_bug.cgi?id=59744
+
+        This was actually just a 2 line change to statusbubble.py.
+        I also cleaned up statusbubble.html a little while I was there
+        (the links are now actual <a> tags and have hover).
+
+        * QueueStatusServer/handlers/statusbubble.py:
+        * QueueStatusServer/templates/statusbubble.html:
+
 2011-04-28  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/QueueStatusServer/handlers/statusbubble.py

@@ -38 +38 @@
 
 class StatusBubble(webapp.RequestHandler):
-    _queues_to_display = [queue for queue in Queue.all() if queue.is_ews()]
-
     def _build_bubble(self, queue, attachment):
         queue_status = attachment.status_for_queue(queue)
@@ -53 +51 @@
     def get(self, attachment_id):
         attachment = Attachment(int(attachment_id))
-        bubbles = [self._build_bubble(queue, attachment) for queue in self._queues_to_display]
+        # Show all queue positions, even the commit-queue.
+        bubbles = [self._build_bubble(queue, attachment) for queue in Queue.all() if queue.is_ews() or attachment.position_in_queue(queue)]
         template_values = {
             "bubbles": bubbles,

trunk/Tools/QueueStatusServer/templates/statusbubble.html

@@ -24 +24 @@
     font-size: 11px;
     cursor: pointer;
+    text-decoration: none;
+    color: black;
+}
+.status:hover {
+    border-color: #666;
 }
 .none {
     cursor: auto;
+}
+.none:hover {
+    border-color: #AAA;
 }
 .pass {
@@ -49 +57 @@
 </style>
 <script>
-function statusDetail(patch_id) {
-  top.location = "/patch/" + patch_id
-}
 window.addEventListener("message", function(e) {
   if (e.data == 'containerMetrics') {
@@ -64 +69 @@
 <div id="bubbleContainer">
   {% for bubble in bubbles %}
-  <div class="status {{ bubble.state }}"{% if bubble.status %}
-      onclick="statusDetail({{ bubble.attachment_id }})"
-      title="{{ bubble.status.date|timesince }} ago"{% endif %}>
+  <a class="status {{ bubble.state }}"
+  {% if bubble.status %}
+      href="http://queues.webkit.org/patch/{{ bubble.attachment_id }}"
+      title="{{ bubble.status.date|timesince }} ago"
+  {% endif %}
+  >
     {{ bubble.name }}
     {% if bubble.queue_position %}
     <span class="queue_position">#{{ bubble.queue_position }}</span>
     {% endif %}
-  </div>
+  </a>
   {% endfor %}
 </div>