diff options
| author | Byron Jones <glob@mozilla.com> | 2015-10-15 08:17:18 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-10-15 08:17:18 +0200 |
| commit | 5265c09db899e148ceef6ba47aa199fa1e282e7b (patch) | |
| tree | 5152b687d9a0865dbbcd5896ae7effa41021a3bd /extensions/BugModal/template/en | |
| parent | 0e11b4a741c9104db967a2c51fa77b071cb087f5 (diff) | |
| download | bugzilla-5265c09db899e148ceef6ba47aa199fa1e282e7b.tar.gz bugzilla-5265c09db899e148ceef6ba47aa199fa1e282e7b.tar.xz | |
Bug 1146766 - 'follow/stop following' doesn't indicate changes are immediated (eg. the "cc following" count isn't updated)
Diffstat (limited to 'extensions/BugModal/template/en')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl | 5 | ||||
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl | 56 |
2 files changed, 34 insertions, 27 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index b8c86194c..a7eb2b7c6 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -149,6 +149,9 @@ [%# === header === %] <div id="xhr-error" style="display:none"></div> +<div id="floating-message" style="display:none"> + <div id="floating-message-text"></div> +</div> [% WRAPPER bug_modal/module.html.tmpl title = "" @@ -618,7 +621,7 @@ [% IF bug.cc && bug.cc.size %] <input type="hidden" name="removecc" id="removecc"> <span id="cc-latch">▸</span> - <span id="cc-summary"> + <span id="cc-summary" data-count="[% bug.cc.size FILTER none %]"> [% IF bug.cc.size == 1; is_cced ? "Just you" : "1 person"; 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 b2ba5fe0c..71a9b16ae 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 @@ -53,32 +53,36 @@ [%# this checkboxes are in tables to match the alignment of the added-by-extensions checkboxes (needinfo, restrict-comments) %] - [% 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; - %] - <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 %] + [% + IF NOT bug.cc || NOT bug.cc.contains(user.login); + hide_add_self = 0; + ELSE; + hide_add_self = 1; + END; + 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; + %] + <table id="add-self-cc-container" [%= 'style="display:none"' IF hide_add_self %]> + <tr> + <td> + <input type="checkbox" name="addselfcc" id="add-self-cc" + [%= "disabled" IF hide_add_self %] + [%= "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> <table class="edit-show" style="display:none"> <tr> |