[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 620c21619674eb3ece5e74c407fea4b5f272784a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 22:05:04 2010 +0000

    2010-01-08  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Show patch status in bugs.webkit.org
            https://bugs.webkit.org/show_bug.cgi?id=33368
    
            This patch adds an iframe to the show_bug page and the edit attachment
            page that displays whether the attachment passed the various bots.
    
            * template/en/custom/attachment/edit.html.tmpl:
            * template/en/custom/attachment/list.html.tmpl:
            * template/en/custom/attachment/reviewform.html.tmpl:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53007 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index bc59fee..8c0ad9c 100644
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-08  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Show patch status in bugs.webkit.org
+        https://bugs.webkit.org/show_bug.cgi?id=33368
+
+        This patch adds an iframe to the show_bug page and the edit attachment
+        page that displays whether the attachment passed the various bots.
+
+        * template/en/custom/attachment/edit.html.tmpl:
+        * template/en/custom/attachment/list.html.tmpl:
+        * template/en/custom/attachment/reviewform.html.tmpl:
+
 2009-12-07  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by David Kilzer.
diff --git a/BugsSite/template/en/custom/attachment/edit.html.tmpl b/BugsSite/template/en/custom/attachment/edit.html.tmpl
index c6b5ab4..85e7869 100644
--- a/BugsSite/template/en/custom/attachment/edit.html.tmpl
+++ b/BugsSite/template/en/custom/attachment/edit.html.tmpl
@@ -256,6 +256,19 @@
                                            attach_id = attachment.id %]<br>
         [% END %]
 
+[%# if WEBKIT_CHANGES %]
+        [% IF attachment.ispatch %]
+        <b><small>Bot Status:</small></b>
+
+        <div class="statusBubble">
+          <iframe src="https://webkit-commit-queue.appspot.com/status-bubble/[% attachment.id %]"
+                  style="width: 300px; height: 18px; border: none;" scrolling="no">
+          </iframe>
+        </div>
+        <br>
+        [% END %]
+[%# endif // WEBKIT_CHANGES %]
+
         <div id="smallCommentFrame">
           <b><small><label for="comment">Comment</label> (on the
           [%+ terms.bug %]):</small></b><br>
diff --git a/BugsSite/template/en/custom/attachment/list.html.tmpl b/BugsSite/template/en/custom/attachment/list.html.tmpl
index be98425..fd2202a 100644
--- a/BugsSite/template/en/custom/attachment/list.html.tmpl
+++ b/BugsSite/template/en/custom/attachment/list.html.tmpl
@@ -138,6 +138,15 @@
             | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=diff">Diff</a>
           [% END %]
           [% Hook.process("action") %]
+[%# if WEBKIT_CHANGES %]
+          [% IF attachment.ispatch %]
+          <div class="statusBubble">
+            <iframe src="https://webkit-commit-queue.appspot.com/status-bubble/[% attachment.id %]"
+                    style="width: 300px; height: 18px; border: none;" scrolling="no">
+            </iframe>
+          </div>
+          [% END %]
+[%# endif // WEBKIT_CHANGES %]
         </td>
       </tr>
     [% END %]
diff --git a/BugsSite/template/en/custom/attachment/reviewform.html.tmpl b/BugsSite/template/en/custom/attachment/reviewform.html.tmpl
index cbfd1d8..860f112 100644
--- a/BugsSite/template/en/custom/attachment/reviewform.html.tmpl
+++ b/BugsSite/template/en/custom/attachment/reviewform.html.tmpl
@@ -84,6 +84,17 @@
     [% END %]
 </td>
 <td>
+[% IF ispatch %]
+  <b><small>Bot Status:</small></b>
+
+  <div class="statusBubble">
+    <iframe src="https://webkit-commit-queue.appspot.com/status-bubble/[% attachment.id %]"
+            style="width: 300px; height: 18px; border: none;" scrolling="no">
+    </iframe>
+  </div>
+[% END %]
+</td>
+<td>
 Back to <a href="show_bug.cgi?id=[% attachment.bug_id %]" target="_top">[% terms.Bug %] #[% attachment.bug_id %]</a>
 </td>
 <td>
@@ -99,7 +110,7 @@ Back to <a href="show_bug.cgi?id=[% attachment.bug_id %]" target="_top">[% terms
 </td>
 </tr>
 <tr>
-<td colspan="4">
+<td colspan="5">
 Enter comments below:<br>
 <textarea id=comment name="comment" wrap="soft">[% quotedpatch FILTER html %]</textarea><br>
 </tr>

-- 
WebKit Debian packaging