From bfef679d5e65e6d3e581e7f49e85d7168112261a Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Wed, 10 Sep 2014 15:35:40 +0400
Subject: [PATCH] Collapse comment text when editing it

---
 js/bug.js                                  | 1 +
 skins/contrib/Mozilla/global.css           | 5 +++++
 template/en/default/bug/comments.html.tmpl | 5 ++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/js/bug.js b/js/bug.js
index 458e939e7..8743921fb 100644
--- a/js/bug.js
+++ b/js/bug.js
@@ -432,6 +432,7 @@ function showEditComment(comment_id)
                     submit_but.value = 'Save All Changes';
                     but_wrapper.appendChild(submit_but);
                     parent.appendChild(but_wrapper);
+                    showhide_comment(key, false);
                     textarea.focus();
                 }
             }
diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css
index 884b01790..b3d3e8eac 100644
--- a/skins/contrib/Mozilla/global.css
+++ b/skins/contrib/Mozilla/global.css
@@ -531,6 +531,11 @@ input.required, select.required, span.required_explanation {
     margin: 0;
 }
 
+.bz_comment textarea {
+    margin: 8px 0;
+    padding: 10px;
+}
+
 .bz_first_comment_head, .bz_comment_head, .bz_comment_wthead {
     font-weight: normal;
     line-height: 32px;
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 79bfabd8a..5c227db7c 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -121,10 +121,9 @@
         [% IF NOT wt_only %]
         <span class="bz_comment_number">
           [% IF (comment.author.id == user.id || !comment.count) && collision != 1 %]
-          [<a href="#" onclick="showEditComment([% comment.id %]); return false;">Edit Comment</a>]
+          [<a href="#" onclick="showEditComment([% comment.id %]); return false;">Edit</a>]
           [% END %]
-          <a name="c[% comment.count %]"
-             href="show_bug.cgi?id=[% bug.bug_id %]#c[% comment.count %]">
+          <a name="c[% comment.count %]" href="show_bug.cgi?id=[% bug.bug_id %]#c[% comment.count %]">
             [%- comment_label FILTER html %]</a>
         </span>
         [% END %]