diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 16:58:01 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 18:34:13 +0100 |
commit | 5e3fa0255341fea8d0842453ff034c3bf5f00ba2 (patch) | |
tree | 44f08bdd9599641786b7fe2183715efa72af2cef /app/views/projects/notes | |
parent | 2b92f91038ad24a2ff3a6607f826cd8e518d8aa2 (diff) | |
download | gitlab-ce-5e3fa0255341fea8d0842453ff034c3bf5f00ba2.tar.gz |
Added resolvable discussion frontend
Diffstat (limited to 'app/views/projects/notes')
-rw-r--r-- | app/views/projects/notes/_form.html.haml | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 80db16ea578..58960670085 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -28,10 +28,23 @@ .error-alert .note-form-actions.clearfix - = f.submit 'Comment', class: "btn btn-nr btn-create append-right-10 comment-btn js-comment-button" - - - if @note.can_be_discussion_note? - = submit_tag 'Start discussion', name: 'new_discussion', class: "btn btn-nr append-right-10 btn-inverted js-note-new-discussion" + .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown + = f.submit 'Comment', class: "btn btn-nr btn-create comment-btn js-comment-button js-comment-submit-button" + - if @note.can_be_discussion_note? + = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-comment-button js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do + = icon('caret-down') + %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } + %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: 'droplab-item-selected' } + = icon('check') + .description + %strong Comment + %p Add a general comment to this merge request. + %li.divider + %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' } } + = icon('check') + .description + %strong Start discussion + %p Discuss a specific suggestion or question that needs to be resolved. = yield(:note_actions) |