Merge branch 'mr-copy-filename-btn-update' into 'master'
Updated positioning of copy file path button in diffs ## What does this MR do? Updated the positioning of the copy file path button in diffs. ## Screenshots (if relevant) ![Screen_Shot_2016-10-31_at_16.53.24](/uploads/53de39ce550855f86b90d2d9fc227f95/Screen_Shot_2016-10-31_at_16.53.24.png) ## What are the relevant issue numbers? Closes #23591 See merge request !7203
This commit is contained in:
commit
b328c78855
|
@ -16,13 +16,14 @@ module ButtonHelper
|
|||
# See http://clipboardjs.com/#usage
|
||||
def clipboard_button(data = {})
|
||||
css_class = data[:class] || 'btn-clipboard btn-transparent'
|
||||
title = data[:title] || 'Copy to Clipboard'
|
||||
data = { toggle: 'tooltip', placement: 'bottom', container: 'body' }.merge(data)
|
||||
content_tag :button,
|
||||
icon('clipboard'),
|
||||
class: "btn #{css_class}",
|
||||
data: data,
|
||||
type: :button,
|
||||
title: 'Copy to Clipboard'
|
||||
title: title
|
||||
end
|
||||
|
||||
def http_clone_button(project, placement = 'right', append_link: true)
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
= link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do
|
||||
= icon('comment')
|
||||
\
|
||||
= clipboard_button(clipboard_text: diff_file.new_path, class: 'btn-file-option')
|
||||
- if editable_diff?(diff_file)
|
||||
- link_opts = @merge_request.id ? { from_merge_request_id: @merge_request.id } : {}
|
||||
= edit_blob_link(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path,
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
- if diff_file.deleted_file
|
||||
deleted
|
||||
|
||||
= clipboard_button(clipboard_text: diff_file.new_path, class: 'btn-clipboard btn-transparent prepend-left-5', title: 'Copy filename to clipboard')
|
||||
|
||||
- if diff_file.mode_changed?
|
||||
%small
|
||||
= "#{diff_file.a_mode} → #{diff_file.b_mode}"
|
||||
|
|
Loading…
Reference in New Issue