From b527e84a026f0211391f93b487b33009f7cb0bce Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 31 Mar 2015 22:17:44 +0800
Subject: Bug 1147292: automatic CC when commenting isn't implemented

---
 .../en/default/bug_modal/new_comment.html.tmpl     | 29 ++++++++++++++++++++++
 extensions/BugModal/web/bug_modal.css              |  1 +
 2 files changed, 30 insertions(+)

diff --git a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl
index ff2562bf4..f6c3bb3fa 100644
--- a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl
@@ -25,5 +25,34 @@
   <textarea rows="5" cols="80" name="comment" id="comment"></textarea>
   <div id="after-comment-commit-button">
     [% Hook.process("after_comment_commit_button", 'bug/edit.html.tmpl') %]
+
+    [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
+      [%
+        IF user.settings.state_addselfcc.value == 'always';
+          check_add_self = 1;
+        ELSIF user.settings.state_addselfcc.value == 'cc_unless_role';
+          check_add_self = !(
+              bug.user.isreporter
+              || bug.assigned_to.id == user.id
+              || (bug.qa_contact && bug.qa_contact.id == user.id)
+            );
+        ELSE;
+          check_add_self = 0;
+        END;
+      %]
+      [%# this is in a table to match the alignment of the added-by-extensions
+          checkboxes (needinfo, restrict-comments) %]
+      <table>
+        <tr>
+          <td>
+            <input type="checkbox" name="addselfcc" id="add-self-cc"
+              [%~ " checked" IF check_add_self %]>
+          </td>
+          <td>
+            <label for="add-self-cc">Add me to CC list (follow this [% terms.bug %])</label>
+          </td>
+        </tr>
+      </table>
+    [% END %]
   </div>
 </div>
diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css
index b8ce1f584..75a772d2a 100644
--- a/extensions/BugModal/web/bug_modal.css
+++ b/extensions/BugModal/web/bug_modal.css
@@ -243,6 +243,7 @@ input[type="number"] {
 
 #after-comment-commit-button {
     margin-left: -8px;
+    margin-bottom: 4px;
 }
 
 #needinfo_from_autocomplete {
-- 
cgit v1.2.3-24-g4f1b