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

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 8c938524e4e3426de6a0a21b1a803a1cb8fccb7a
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 9 02:16:17 2010 +0000

    <http://webkit.org/b/33410> Fix "View Plain Diff"/"View Formatted Diff" button
    
    Reviewed by Adam Barth.
    
    This button was broken during a previous Bugzilla upgrade after
    changes were made to the names of objects exposed on templates.
    
    * template/en/custom/attachment/reviewform.html.tmpl: Changed
    attachid to attachment.id and ispatch to attachment.ispatch.
    Also tweaked the format to use 4 table columns instead of 5.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index 1df155a..8512676 100644
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,5 +1,18 @@
 2010-01-08  David Kilzer  <ddkilzer at apple.com>
 
+        <http://webkit.org/b/33410> Fix "View Plain Diff"/"View Formatted Diff" button
+
+        Reviewed by Adam Barth.
+
+        This button was broken during a previous Bugzilla upgrade after
+        changes were made to the names of objects exposed on templates.
+
+        * template/en/custom/attachment/reviewform.html.tmpl: Changed
+        attachid to attachment.id and ispatch to attachment.ispatch.
+        Also tweaked the format to use 4 table columns instead of 5.
+
+2010-01-08  David Kilzer  <ddkilzer at apple.com>
+
         Included UNCONFIRMED bugs by default in advanced search query
 
         Rubber-stamped by Alexey Proskuryakov.
diff --git a/BugsSite/template/en/custom/attachment/reviewform.html.tmpl b/BugsSite/template/en/custom/attachment/reviewform.html.tmpl
index c755a1e..14deb6c 100644
--- a/BugsSite/template/en/custom/attachment/reviewform.html.tmpl
+++ b/BugsSite/template/en/custom/attachment/reviewform.html.tmpl
@@ -35,7 +35,7 @@
   function viewPrettyPatch()
     {
       viewing_formatted_diff = !viewing_formatted_diff;
-      var src = "attachment.cgi?id=[% attachid %]";
+      var src = "attachment.cgi?id=[% attachment.id %]";
       var buttonText = "View Formatted Diff";
       if (viewing_formatted_diff) {
         src += "&action=prettypatch"
@@ -100,22 +100,20 @@
 [% END %]
 </td>
 <td>
-Back to <a href="show_bug.cgi?id=[% attachment.bug_id %]" target="_top">[% terms.Bug %] #[% attachment.bug_id %]</a>
-</td>
-<td>
-    [% IF ispatch %]
-      <script type="text/javascript">
-        <!--
+    <div>Back to <a href="show_bug.cgi?id=[% attachment.bug_id %]" target="_top">[% terms.Bug %] #[% attachment.bug_id %]</a></div>
+[% IF attachment.ispatch %]
+    <script type="text/javascript">
+    <!--
         if (typeof document.getElementById == "function") {
-          document.write('<button type="button" id="viewPrettyPatchButton" onclick="viewPrettyPatch();">View Plain Diff</button>');
+          document.write('<p><button type="button" id="viewPrettyPatchButton" onclick="viewPrettyPatch();">View Plain Diff</button></p>');
         }
-        //-->
-      </script>
-    [% END %]
+    //-->
+    </script>
+[% END %]
 </td>
 </tr>
 <tr>
-<td colspan="5">
+<td colspan="4">
 Enter comments below:<br>
 <textarea id=comment name="comment" wrap="soft">[% quotedpatch FILTER html %]</textarea><br>
 </tr>

-- 
WebKit Debian packaging