Bug 574338: When comment box is positioned at [top|bottom], include "Add Comment" link at [bottom|top]

r/a=mkanat

2 files changed, 24 insertions, 0 deletions

diff --git a/js/comments.js b/js/comments.js
index 79bdae855..697cedd20 100644
--- a/js/comments.js
+++ b/js/comments.js
@@ -86,3 +86,14 @@ function addCollapseLink(count) {
                    '); return false;" title="Collapse the comment.">[-]<\/a> ');
 }
 
+function goto_add_comments( anchor ){
+    anchor =  (anchor || "add_comment");
+    // we need this line to expand the comment box
+    document.getElementById('comment').focus();
+    setTimeout(function(){ 
+        document.location.hash = anchor;
+        // firefox doesn't seem to keep focus through the anchor change
+        document.getElementById('comment').focus();
+    },10);
+    return false;
+}
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index e44e4e7b9..9a7a050af 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -65,6 +65,14 @@
   [% count = count + increment %]
 [% END %]
 
+[% IF user.settings.comment_box_position.value == "before_comments" && user.id %]
+  <div class="bz_add_comment">
+    <a href="#" 
+       onclick="return goto_add_comments();">
+       Add Comment</a>
+  </div>
+[% END %]
+
 [%# Note: this template is used in multiple places; if you use this hook,
   # make sure you are aware of this fact.
   #%]  
@@ -78,6 +86,11 @@
                                return false;">Collapse All Comments</a></li>
       <li><a href="#" onclick="toggle_all_comments('expand', [% comments.size %]);
                                return false;">Expand All Comments</a></li>
+      [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
+        <li class="bz_add_comment"><a href="#" 
+            onclick="return goto_add_comments('bug_status_bottom');">
+            Add Comment</a></li>
+      [% END %]                               
     </ul>
   [% END %]
 </td>