Merge branch '23868-build-graph-tooltips' into 'master'
Remove tooltips from build nodes Before: <img src="/uploads/48441dccfe39c5eb1da3dbb9a26e6bd2/Screen_Shot_2016-10-26_at_2.43.46_PM.png" width="400px"> After: <img src="/uploads/d72b2ad4603c964283e155e5a2b053fe/Screen_Shot_2016-10-26_at_2.43.31_PM.png" width="400px"> Closes #23868 See merge request !7128
This commit is contained in:
commit
337c5ded7e
|
@ -1,14 +1,13 @@
|
|||
- is_playable = subject.playable? && can?(current_user, :update_build, @project)
|
||||
- if is_playable
|
||||
= link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, data: { toggle: 'tooltip', title: "#{subject.name} - play", container: '.pipeline-graph', placement: 'bottom' } do
|
||||
= render_status_with_link('build', 'play')
|
||||
= ci_icon_for_status('play')
|
||||
.ci-status-text= subject.name
|
||||
- elsif can?(current_user, :read_build, @project)
|
||||
= link_to namespace_project_build_path(subject.project.namespace, subject.project, subject), data: { toggle: 'tooltip', title: "#{subject.name} - #{subject.status}", container: '.pipeline-graph', placement: 'bottom' } do
|
||||
%span.ci-status-icon
|
||||
= render_status_with_link('build', subject.status)
|
||||
= ci_icon_for_status(subject.status)
|
||||
.ci-status-text= subject.name
|
||||
- else
|
||||
%span.ci-status-icon
|
||||
= render_status_with_link('build', subject.status)
|
||||
= ci_icon_for_status(subject.status)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- group_status = CommitStatus.where(id: subject).status
|
||||
%button.dropdown-menu-toggle.has-tooltip{ type: 'button', data: { toggle: 'dropdown', title: "#{name} - #{group_status}" } }
|
||||
%span.ci-status-icon
|
||||
= render_status_with_link('build', group_status)
|
||||
= ci_icon_for_status(group_status)
|
||||
%span.ci-status-text
|
||||
= name
|
||||
%span.badge= subject.size
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
- if subject.target_url
|
||||
= link_to subject.target_url do
|
||||
%span.ci-status-icon
|
||||
= render_status_with_link('commit status', subject.status)
|
||||
= ci_icon_for_status(subject.status)
|
||||
%span.ci-status-text= subject.name
|
||||
- else
|
||||
%span.ci-status-icon
|
||||
= render_status_with_link('commit status', subject.status)
|
||||
= ci_icon_for_status(subject.status)
|
||||
%span.ci-status-text= subject.name
|
||||
|
|
Loading…
Reference in New Issue