2010-12-08 Ojan Vafai <ojan@chromium.org>

        Reviewed by Adam Barth.

        [reviewtool] should always show overall comments text box
        https://bugs.webkit.org/show_bug.cgi?id=45870

        * PrettyPatch/PrettyPatch.rb:
        * code-review.js:

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

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index 3dc273d0a7f927a410dfabfe5f2f70434bb1ede2..6adfcd7db112ccf6e777013f1327245339346128 100644 (file)
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-08  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [reviewtool] should always show overall comments text box
+        https://bugs.webkit.org/show_bug.cgi?id=45870
+
+        * PrettyPatch/PrettyPatch.rb:
+        * code-review.js:
+
 2010-12-04  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Adam Barth.

diff --git a/BugsSite/PrettyPatch/PrettyPatch.rb b/BugsSite/PrettyPatch/PrettyPatch.rb
index 2e04760100396b612c08e18a965fc7476e365707..8c40f3d51bad9ca7a4a345dad4d946eb65a9fe98 100644 (file)
--- a/BugsSite/PrettyPatch/PrettyPatch.rb
+++ b/BugsSite/PrettyPatch/PrettyPatch.rb
@@ -197,8 +197,18 @@ h1 :hover {
 }
 
 .comment textarea, .overallComments textarea {
+  display: block;
   width: 100%;
-  height: 6em;
+  height: 2em;
+}
+
+.overallComments .open {
+  -webkit-transition: height .2s;
+  height: 4em;
+}
+
+#statusBubbleContainer.wrap {
+  display: block;
 }
 
 body {
@@ -206,8 +216,10 @@ body {
 }
 
 #toolbar {
+  display: -webkit-box;
+  display: -moz-box;
   position: fixed;
-  padding: 5px;
+  padding: 3px;
   bottom: 0;
   left: 0;
   right: 0;
@@ -217,10 +229,6 @@ body {
 }
 
 #toolbar .actions {
-  float: left;
-}
-
-#toolbar .links {
   float: right;
 }
 
@@ -277,16 +285,14 @@ body {
   font-style: italic;
 }
 
-.description {
-  font-style: italic;
-}
-
-.comment, .overallComments, .previousComment, .frozenComment {
+.comment, .previousComment, .frozenComment {
   background-color: #ffd;
 }
 
 .overallComments {
-  padding: 5px;
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  margin-right: 3px;
 }
 
 .previousComment, .frozenComment {
@@ -304,8 +310,9 @@ body {
 }
 
 .statusBubble {
-  margin-left: 5px;
-  width: 450px;
+  margin-top: 2px;
+  /* FIXME: Size the statusBubble via postMessage so it sizes to it's content. */
+  width: 300px;
   height: 20px;
   border: none;
   vertical-align: middle;

diff --git a/BugsSite/code-review.js b/BugsSite/code-review.js
index ed82a8f3c3135a1e2adb85e0a7820079e145ca2a..cfaecfac756d53a5a397411c8a49202a9058621f 100644 (file)
--- a/BugsSite/code-review.js
+++ b/BugsSite/code-review.js
@@ -213,7 +213,7 @@
 
   function addFlagsForAttachment(details) {
     var flag_control = "<select><option></option><option>?</option><option>+</option><option>-</option></select>";
-    $('#toolbar .actions').append(
+    $('#flagContainer').append(
       $('<span class="review"> r: ' + flag_control + '</span>')).append(
       $('<span class="commitQueue"> cq: ' + flag_control + '</span>'));
 
@@ -247,7 +247,7 @@
 
       var details = $(data);
       addFlagsForAttachment(details);
-      $('#toolbar .actions').append($('<iframe class="statusBubble" src="https://webkit-commit-queue.appspot.com/status-bubble/' + attachment_id + '" scrolling="no"></iframe>'));
+      $('#statusBubbleContainer').append($('<iframe style="margin-top:2px;" class="statusBubble" src="https://webkit-commit-queue.appspot.com/status-bubble/' + attachment_id + '" scrolling="no"></iframe>'));
       $('#toolbar .bugLink').html('<a href="/show_bug.cgi?id=' + bug_id + '" target="_blank">Bug ' + bug_id + '</a>');
     });
   }
@@ -260,13 +260,33 @@
     });
   }
 
+  function openOverallComments(e) {
+    $('.overallComments textarea').addClass('open');
+    $('#statusBubbleContainer').addClass('wrap');
+  }
+
   $(document).ready(function() {
     crawlDiff();
     fetchHistory();
     $(document.body).prepend('<div id="message"><div class="help">Select line numbers to add a comment.</div><div class="commentStatus"></div></div>');
-    $(document.body).prepend('<div id="toolbar"><div class="actions"><button id="preview_comments">Preview</button><button id="post_comments">Publish</button></div><div class="links"><span class="bugLink"></span></div>');
+    $(document.body).prepend('<div id="toolbar">' +
+        '<div class="overallComments">' +
+            '<textarea placeholder="Overall comments"></textarea>' +
+        '</div>' +
+        '<div>' +
+          '<span id="statusBubbleContainer"></span>' +
+          '<span class="actions">' +
+              '<span class="links"><span class="bugLink"></span></span>' +
+              '<span id="flagContainer"></span>' +
+              '<button id="preview_comments">Preview</button>' +
+              '<button id="post_comments">Publish</button> ' +
+          '</span></div>' +
+        '</div>' +
+        '</div>');
+
+    $('.overallComments textarea').bind('click', openOverallComments);
+
     $(document.body).prepend('<div id="comment_form" class="inactive"><div class="winter"></div><div class="lightbox"><iframe id="reviewform" src="attachment.cgi?id=' + attachment_id + '&action=reviewform"></iframe></div></div>');
-    $(document.body).append('<div class="overallComments"><div class="description">Overall comments:</div><textarea></textarea></div>');
   });
 
   function discardComment() {