Bugzilla should show bubbles from webkit-queues.appspot.com

https://bugs.webkit.org/show_bug.cgi?id=114391

Reviewed by Benjamin Poulain.

Include iframe from webkit-queues.appspot.com as well as one for webkit-commit-queue.appspot.com.

* code-review.js:
* template/en/custom/attachment/edit.html.tmpl:
* template/en/custom/attachment/list.html.tmpl:
* template/en/custom/attachment/reviewform.html.tmpl:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148153 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index fed773d..2f2d944 100644 (file)
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,17 @@
+2013-04-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Bugzilla should show bubbles from webkit-queues.appspot.com
+        https://bugs.webkit.org/show_bug.cgi?id=114391
+
+        Reviewed by Benjamin Poulain.
+
+        Include iframe from webkit-queues.appspot.com as well as one for webkit-commit-queue.appspot.com.
+
+        * code-review.js:
+        * template/en/custom/attachment/edit.html.tmpl:
+        * template/en/custom/attachment/list.html.tmpl:
+        * template/en/custom/attachment/reviewform.html.tmpl:
+
 2013-03-21  Ryosuke Niwa  <rniwa@webkit.org>
 
         EWS bubbles need more space

diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 16b5d65..854a259 100644 (file)
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -547,6 +547,7 @@ var CODE_REVIEW_UNITTEST;
 
   function handleStatusBubbleLoad(e) {
     e.target.contentWindow.postMessage('containerMetrics', 'https://webkit-commit-queue.appspot.com');
+    e.target.contentWindow.postMessage('containerMetrics', 'https://webkit-queues.appspot.com');
   }
 
   function fetchHistory() {
@@ -581,6 +582,14 @@ var CODE_REVIEW_UNITTEST;
       statusBubble.onload = handleStatusBubbleLoad;
       $('#statusBubbleContainer').append(statusBubble);
 
+      statusBubble = document.createElement('iframe');
+      statusBubble.className = 'statusBubble';
+      statusBubble.src  = 'https://webkit-queues.appspot.com/status-bubble/' + attachment_id;
+      statusBubble.scrolling = 'no';
+      // Can't append the HTML because we need to set the onload handler before appending the iframe to the DOM.
+      statusBubble.onload = handleStatusBubbleLoad;
+      $('#statusBubbleContainer').append(statusBubble);
+
       $('#toolbar .bugLink').html('<a href="/show_bug.cgi?id=' + bug_id + '" target="_blank">Bug ' + bug_id + '</a>');
     });
   }

diff --git a/Websites/bugs.webkit.org/template/en/custom/attachment/edit.html.tmpl b/Websites/bugs.webkit.org/template/en/custom/attachment/edit.html.tmpl
index 784f236..4a34741 100644 (file)
--- a/Websites/bugs.webkit.org/template/en/custom/attachment/edit.html.tmpl
+++ b/Websites/bugs.webkit.org/template/en/custom/attachment/edit.html.tmpl
@@ -264,6 +264,9 @@
           <iframe src="https://webkit-commit-queue.appspot.com/status-bubble/[% attachment.id %]"
                   style="width: 480px; height: 40px; border: none;" scrolling="no">
           </iframe>
+          <iframe src="https://webkit-queues.appspot.com/status-bubble/[% attachment.id %]"
+                  style="width: 480px; height: 40px; border: none;" scrolling="no">
+          </iframe>
         </div>
         <br>
         [% END %]

diff --git a/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl b/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl
index 669a19e..4845d09 100644 (file)
--- a/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl
+++ b/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl
@@ -156,7 +156,10 @@
             [% END %]
           <div class="statusBubble">
             <iframe src="https://webkit-commit-queue.appspot.com/status-bubble/[% attachment.id %]"
-                    style="width: 600px; height: 20px; border: none;" scrolling="no">
+                    style="width: 450px; height: 20px; border: none;" scrolling="no">
+            </iframe>
+            <iframe src="https://webkit-queues.appspot.com/status-bubble/[% attachment.id %]"
+                    style="width: 450px; height: 20px; border: none;" scrolling="no">
             </iframe>
           </div>
           [% END %]

diff --git a/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl b/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl
index 4ccdd73..9fb6a55 100644 (file)
--- a/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl
+++ b/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl
@@ -113,6 +113,9 @@
         <iframe src="https://webkit-commit-queue.appspot.com/status-bubble/[% attachment.id %]"
                 style="width: 450px; height: 20px; border: none;" scrolling="no">
         </iframe>
+        <iframe src="https://webkit-queues.appspot.com/status-bubble/[% attachment.id %]"
+                style="width: 450px; height: 20px; border: none;" scrolling="no">
+        </iframe>
       </div>
     </td>
     </tr>