diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-14 14:28:58 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-24 13:12:58 -0600 |
| commit | c1fe066b4b0d822950ec67179c11ca19f3de5dd6 (patch) | |
| tree | 2957ce09f45361510d23c02834ec536c0893adad /app/views/discussions | |
| parent | 43131802a97da44bcef0f9c54e0724b9af62a206 (diff) | |
| download | gitlab-ce-c1fe066b4b0d822950ec67179c11ca19f3de5dd6.tar.gz | |
Added resolve button to discussions
Top count displays how many resolved discussions
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_diff_discussion.html.haml | 8 | ||||
| -rw-r--r-- | app/views/discussions/_parallel_diff_discussion.html.haml | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml index fa1ad9efa73..b9bc8a6304e 100644 --- a/app/views/discussions/_diff_discussion.html.haml +++ b/app/views/discussions/_diff_discussion.html.haml @@ -3,4 +3,10 @@ %td.notes_content %ul.notes{ data: { discussion_id: discussion.id } } = render partial: "projects/notes/note", collection: discussion.notes, as: :note - = link_to_reply_discussion(discussion) + + .discussion-reply-holder + .btn-group-justified.discussion-with-resolve-btn{ role: "group" } + .btn-group{ role: "group" } + = link_to_reply_discussion(note) + .btn-group{ role: "group" } + = render "projects/notes/discussions/resolve_all", note: note diff --git a/app/views/discussions/_parallel_diff_discussion.html.haml b/app/views/discussions/_parallel_diff_discussion.html.haml index a798c438ea0..2ac85699417 100644 --- a/app/views/discussions/_parallel_diff_discussion.html.haml +++ b/app/views/discussions/_parallel_diff_discussion.html.haml @@ -5,7 +5,12 @@ %ul.notes{ data: { discussion_id: discussion_left.id } } = render partial: "projects/notes/note", collection: discussion_left.notes, as: :note - = link_to_reply_discussion(discussion_left, 'old') + .discussion-reply-holder + .btn-group-justified.discussion-with-resolve-btn{ role: "group" } + .btn-group{ role: "group" } + = link_to_reply_discussion(note_left, 'old') + .btn-group{ role: "group" } + = render "projects/notes/discussions/resolve_all", note: note_left - else %td.notes_line.old= "" %td.notes_content.parallel.old= "" @@ -16,7 +21,12 @@ %ul.notes{ data: { discussion_id: discussion_right.id } } = render partial: "projects/notes/note", collection: discussion_right.notes, as: :note - = link_to_reply_discussion(discussion_right, 'new') + .discussion-reply-holder + .btn-group-justified.discussion-with-resolve-btn{ role: "group" } + .btn-group{ role: "group" } + = link_to_reply_discussion(note_right, 'new') + .btn-group{ role: "group" } + = render "projects/notes/discussions/resolve_all", note: note_right - else %td.notes_line.new= "" %td.notes_content.parallel.new= "" |