Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
506ac78d
Commit
506ac78d
authored
Feb 25, 2019
by
Scott Hampton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding tooltip placement
Adding the ability to position the tooltip of the status icon.
parent
725dfc77
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
app/views/ci/status/_icon.html.haml
app/views/ci/status/_icon.html.haml
+8
-7
app/views/projects/issues/_merge_requests.html.haml
app/views/projects/issues/_merge_requests.html.haml
+1
-1
No files found.
app/views/ci/status/_icon.html.haml
View file @
506ac78d
...
@@ -2,11 +2,12 @@
...
@@ -2,11 +2,12 @@
-
size
=
local_assigns
.
fetch
(
:size
,
16
)
-
size
=
local_assigns
.
fetch
(
:size
,
16
)
-
link
=
local_assigns
.
fetch
(
:link
,
true
)
-
link
=
local_assigns
.
fetch
(
:link
,
true
)
-
title
=
local_assigns
.
fetch
(
:title
,
"Pipeline:
#{
status
.
label
}
"
)
-
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?
}
"
-
css_classes
=
"ci-status-link ci-status-icon ci-status-icon-
#{
status
.
group
}
#{
'has-tooltip'
if
title
.
present?
}
"
-
if
link
&&
status
.
has_details?
-
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
)
=
sprite_icon
(
status
.
icon
,
size:
size
)
-
else
-
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
)
=
sprite_icon
(
status
.
icon
,
size:
size
)
app/views/projects/issues/_merge_requests.html.haml
View file @
506ac78d
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
=
merge_request
.
to_reference
=
merge_request
.
to_reference
%span
.mr-ci-status.flex-md-grow-1.justify-content-end.d-flex.ml-md-2
%span
.mr-ci-status.flex-md-grow-1.justify-content-end.d-flex.ml-md-2
-
if
merge_request
.
can_read_pipeline?
-
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
-
elsif
has_any_head_pipeline
=
icon
(
'blank fw'
)
=
icon
(
'blank fw'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment