kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Adding tooltip placement 

Adding the ability to position the tooltip of the status icon.
This commit is contained in:
Scott Hampton 2019-02-25 11:25:00 -07:00
parent 725dfc77c2
commit 506ac78d48
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/ci/status/_icon.html.haml
View File

@ -1,12 +1,13 @@
- status = local_assigns.fetch(:status)
- size = local_assigns.fetch(:size, 16)
- link = local_assigns.fetch(:link, true)
- title = local_assigns.fetch(:title, "Pipeline: #{status.label}")
- css_classes = "ci-status-link ci-status-icon ci-status-icon-#{status.group} #{'has-tooltip' if title.present?}"
- status = local_assigns.fetch(:status)
- size = local_assigns.fetch(:size, 16)
- link = local_assigns.fetch(:link, true)
- title = local_assigns.fetch(:title, "Pipeline: #{status.label}")
- tooltip_placement = local_assigns.fetch(:tooltip_placement, "left")
- css_classes = "ci-status-link ci-status-icon ci-status-icon-#{status.group} #{'has-tooltip' if title.present?}"
- if link && status.has_details?
= link_to status.details_path, class: css_classes, title: title, data: { html: title.present? } do
= link_to status.details_path, class: css_classes, title: title, data: { html: title.present?, placement: tooltip_placement } do
= sprite_icon(status.icon, size: size)
- else
%span{ class: css_classes, title: title, data: { html: title.present? } }
%span{ class: css_classes, title: title, data: { html: title.present?, placement: tooltip_placement } }
= sprite_icon(status.icon, size: size)

2
app/views/projects/issues/_merge_requests.html.haml
View File

@ -27,7 +27,7 @@
= merge_request.to_reference
%span.mr-ci-status.flex-md-grow-1.justify-content-end.d-flex.ml-md-2
- if merge_request.can_read_pipeline?
= render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), link: true
= render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), link: true, tooltip_placement: 'bottom'
- elsif has_any_head_pipeline
= icon('blank fw')