diff options
| author | Byron Jones <glob@mozilla.com> | 2015-06-15 06:49:59 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-06-15 06:49:59 +0200 |
| commit | c290f3ecabec75b741d375e6130af9060255c274 (patch) | |
| tree | 7f52627f41229c6d52a7b2115429c2ac408f438e /extensions/BugModal/template/en | |
| parent | ac09f71cfd3e84a01a157a8cba21aec5513a0b14 (diff) | |
| download | bugzilla-c290f3ecabec75b741d375e6130af9060255c274.tar.gz bugzilla-c290f3ecabec75b741d375e6130af9060255c274.tar.xz | |
Bug 1146774: treeherder/tbpl comments are not automatically collapsed
Diffstat (limited to 'extensions/BugModal/template/en')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index 7ea74b469..33d8e73c6 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -19,17 +19,18 @@ <menuitem id="view-comments-only" label="Comments Only"></menuitem> <hr> <menuitem id="view-toggle-cc" label="Show CC Changes"></menuitem> - [% Hook.process('comments-toggle-menu') %] + <menuitem id="view-toggle-treeherder" label="Hide Treeherder Comments" data-userid="[% treeherder.id FILTER none %]"></menuitem> </menu> [% PROCESS bug/time.html.tmpl; FOREACH change_set IN bug.activity_stream; + extra_class = change_set.comment.collapsed ? " ca-" _ change_set.comment.author.id : ""; IF change_set.cc_only; - '<div class="change-set cc-only" id="' _ change_set.id _ '" style="display:none">'; + '<div class="change-set cc-only' _ extra_class _ '" id="' _ change_set.id _ '" style="display:none">'; ELSE; - '<div class="change-set" id="' _ change_set.id _ '">'; + '<div class="change-set' _ extra_class _ '" id="' _ change_set.id _ '">'; END; extra_class = ""; @@ -155,7 +156,7 @@ <tr> <td class="comment-collapse-reason" title="[% comment.author.moz_nick FILTER html %] [[% comment.creation_ts FILTER time_duration FILTER html %]]"> - Comment hidden ([% comment.tags.join(', ') FILTER html %]) + Comment hidden ([% comment.collapsed_reason FILTER html %]) </td> <td class="comment-actions"> <button type="button" class="change-spinner minor" id="ccs-[% comment.count FILTER none %]"> |