Use http_clone_button and ssh_clone_button to restore tooltip functionality in clone panel
This commit is contained in:
parent
68fa4de6e3
commit
d5c071419a
2 changed files with 12 additions and 20 deletions
|
@ -23,36 +23,30 @@ module ButtonHelper
|
|||
end
|
||||
|
||||
def http_clone_button(project)
|
||||
klass = 'btn js-protocol-switch'
|
||||
klass << ' active' if default_clone_protocol == 'http'
|
||||
klass = 'http-selector'
|
||||
klass << ' has_tooltip' if current_user.try(:require_password?)
|
||||
|
||||
protocol = gitlab_config.protocol.upcase
|
||||
|
||||
content_tag :button, protocol,
|
||||
content_tag :a, protocol,
|
||||
class: klass,
|
||||
href: @project.http_url_to_repo,
|
||||
data: {
|
||||
clone: project.http_url_to_repo,
|
||||
container: 'body',
|
||||
html: 'true',
|
||||
html: true,
|
||||
title: "Set a password on your account<br>to pull or push via #{protocol}"
|
||||
},
|
||||
type: :button
|
||||
}
|
||||
end
|
||||
|
||||
def ssh_clone_button(project)
|
||||
klass = 'btn js-protocol-switch'
|
||||
klass << ' active' if default_clone_protocol == 'ssh'
|
||||
klass = 'ssh-selector'
|
||||
klass << ' has_tooltip' if current_user.try(:require_ssh_key?)
|
||||
|
||||
content_tag :button, 'SSH',
|
||||
content_tag :a, 'SSH',
|
||||
class: klass,
|
||||
href: project.ssh_url_to_repo,
|
||||
data: {
|
||||
clone: project.ssh_url_to_repo,
|
||||
container: 'body',
|
||||
html: 'true',
|
||||
html: true,
|
||||
title: 'Add an SSH key to your profile<br>to pull or push via SSH.'
|
||||
},
|
||||
type: :button
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -8,11 +8,9 @@
|
|||
= icon('angle-down')
|
||||
%ul.dropdown-menu.dropdown-menu-right.clone-options-dropdown
|
||||
%li
|
||||
%a#ssh-selector{href: @project.ssh_url_to_repo}
|
||||
SSH
|
||||
= ssh_clone_button(project)
|
||||
%li
|
||||
%a#http-selector{href: @project.http_url_to_repo}
|
||||
#{gitlab_config.protocol.upcase}
|
||||
= http_clone_button(project)
|
||||
|
||||
= text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true
|
||||
.input-group-btn
|
||||
|
|
Loading…
Reference in a new issue