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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
8103bcc4
Commit
8103bcc4
authored
Mar 21, 2018
by
Lukas Eipert
Committed by
Clement Ho
Mar 21, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issuable list: add tooltips to icons
parent
6f71ed60
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
11 deletions
+25
-11
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+7
-0
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+5
-3
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+4
-4
app/views/shared/_issuable_meta_data.html.haml
app/views/shared/_issuable_meta_data.html.haml
+4
-4
changelogs/unreleased/43786-on-the-issuable-list-add-tooltips-to-icons.yml
...ased/43786-on-the-issuable-list-add-tooltips-to-icons.yml
+5
-0
No files found.
app/helpers/issuables_helper.rb
View file @
8103bcc4
...
@@ -377,4 +377,11 @@ module IssuablesHelper
...
@@ -377,4 +377,11 @@ module IssuablesHelper
def
parent
def
parent
@project
||
@group
@project
||
@group
end
end
def
issuable_milestone_tooltip_title
(
issuable
)
if
issuable
.
milestone
milestone_tooltip
=
milestone_tooltip_title
(
issuable
.
milestone
)
_
(
'Milestone'
)
+
(
milestone_tooltip
?
': '
+
milestone_tooltip
:
''
)
end
end
end
end
app/views/projects/issues/_issue.html.haml
View file @
8103bcc4
...
@@ -7,7 +7,9 @@
...
@@ -7,7 +7,9 @@
.issue-main-info
.issue-main-info
.issue-title.title
.issue-title.title
%span
.issue-title-text
%span
.issue-title-text
=
confidential_icon
(
issue
)
-
if
issue
.
confidential?
%span
.has-tooltip
{
title:
_
(
'Confidential'
)
}
=
confidential_icon
(
issue
)
=
link_to
issue
.
title
,
issue_path
(
issue
)
=
link_to
issue
.
title
,
issue_path
(
issue
)
-
if
issue
.
tasks?
-
if
issue
.
tasks?
%span
.task-status.hidden-xs
%span
.task-status.hidden-xs
...
@@ -24,11 +26,11 @@
...
@@ -24,11 +26,11 @@
-
if
issue
.
milestone
-
if
issue
.
milestone
%span
.issuable-milestone.hidden-xs
%span
.issuable-milestone.hidden-xs
=
link_to
project_issues_path
(
issue
.
project
,
milestone_title:
issue
.
milestone
.
title
),
data:
{
html:
1
,
toggle:
'tooltip'
,
title:
milestone_tooltip_title
(
issue
.
mileston
e
)
}
do
=
link_to
project_issues_path
(
issue
.
project
,
milestone_title:
issue
.
milestone
.
title
),
data:
{
html:
1
,
toggle:
'tooltip'
,
title:
issuable_milestone_tooltip_title
(
issu
e
)
}
do
=
icon
(
'clock-o'
)
=
icon
(
'clock-o'
)
=
issue
.
milestone
.
title
=
issue
.
milestone
.
title
-
if
issue
.
due_date
-
if
issue
.
due_date
%span
.issuable-due-date.hidden-xs
{
class:
"#{'cred' if issue.overdue?}"
}
%span
.issuable-due-date.hidden-xs
.has-tooltip
{
class:
"#{'cred' if issue.overdue?}"
,
title:
_
(
'Due date'
)
}
=
icon
(
'calendar'
)
=
icon
(
'calendar'
)
=
issue
.
due_date
.
to_s
(
:medium
)
=
issue
.
due_date
.
to_s
(
:medium
)
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
8103bcc4
...
@@ -23,11 +23,11 @@
...
@@ -23,11 +23,11 @@
-
if
merge_request
.
milestone
-
if
merge_request
.
milestone
%span
.issuable-milestone.hidden-xs
%span
.issuable-milestone.hidden-xs
=
link_to
project_merge_requests_path
(
merge_request
.
project
,
milestone_title:
merge_request
.
milestone
.
title
),
data:
{
html:
1
,
toggle:
'tooltip'
,
title:
milestone_tooltip_title
(
merge_request
.
milestone
)
}
do
=
link_to
project_merge_requests_path
(
merge_request
.
project
,
milestone_title:
merge_request
.
milestone
.
title
),
data:
{
html:
1
,
toggle:
'tooltip'
,
title:
issuable_milestone_tooltip_title
(
merge_request
)
}
do
=
icon
(
'clock-o'
)
=
icon
(
'clock-o'
)
=
merge_request
.
milestone
.
title
=
merge_request
.
milestone
.
title
-
if
merge_request
.
target_project
.
default_branch
!=
merge_request
.
target_branch
-
if
merge_request
.
target_project
.
default_branch
!=
merge_request
.
target_branch
%span
.project-ref-path
%span
.project-ref-path
.has-tooltip
{
title:
_
(
'Target branch'
)
}
=
link_to
project_ref_path
(
merge_request
.
project
,
merge_request
.
target_branch
),
class:
'ref-name'
do
=
link_to
project_ref_path
(
merge_request
.
project
,
merge_request
.
target_branch
),
class:
'ref-name'
do
=
sprite_icon
(
'fork'
,
size:
12
,
css_class:
'fork-sprite'
)
=
sprite_icon
(
'fork'
,
size:
12
,
css_class:
'fork-sprite'
)
...
@@ -51,11 +51,11 @@
...
@@ -51,11 +51,11 @@
=
render_pipeline_status
(
merge_request
.
head_pipeline
)
=
render_pipeline_status
(
merge_request
.
head_pipeline
)
-
if
merge_request
.
open?
&&
merge_request
.
broken?
-
if
merge_request
.
open?
&&
merge_request
.
broken?
%li
.issuable-pipeline-broken.hidden-xs
%li
.issuable-pipeline-broken.hidden-xs
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
"Cannot be merged automatically"
,
data:
{
container:
'body'
}
do
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
_
(
'Cannot be merged automatically'
)
do
=
icon
(
'exclamation-triangle'
)
=
icon
(
'exclamation-triangle'
)
-
if
merge_request
.
assignee
-
if
merge_request
.
assignee
%li
%li
=
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
=
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
,
name:
false
,
title:
_
(
'Assigned to :name'
)
)
=
render
'shared/issuable_meta_data'
,
issuable:
merge_request
=
render
'shared/issuable_meta_data'
,
issuable:
merge_request
...
...
app/views/shared/_issuable_meta_data.html.haml
View file @
8103bcc4
...
@@ -5,21 +5,21 @@
...
@@ -5,21 +5,21 @@
-
issuable_mr
=
@issuable_meta_data
[
issuable
.
id
].
merge_requests_count
-
issuable_mr
=
@issuable_meta_data
[
issuable
.
id
].
merge_requests_count
-
if
issuable_mr
>
0
-
if
issuable_mr
>
0
%li
.issuable-mr.hidden-xs
%li
.issuable-mr.hidden-xs
.has-tooltip
{
title:
_
(
'Related merge requests'
)
}
=
image_tag
(
'icon-merge-request-unmerged.svg'
,
class:
'icon-merge-request-unmerged'
)
=
image_tag
(
'icon-merge-request-unmerged.svg'
,
class:
'icon-merge-request-unmerged'
)
=
issuable_mr
=
issuable_mr
-
if
upvotes
>
0
-
if
upvotes
>
0
%li
.issuable-upvotes.hidden-xs
%li
.issuable-upvotes.hidden-xs
.has-tooltip
{
title:
_
(
'Upvotes'
)
}
=
icon
(
'thumbs-up'
)
=
icon
(
'thumbs-up'
)
=
upvotes
=
upvotes
-
if
downvotes
>
0
-
if
downvotes
>
0
%li
.issuable-downvotes.hidden-xs
%li
.issuable-downvotes.hidden-xs
.has-tooltip
{
title:
_
(
'Downvotes'
)
}
=
icon
(
'thumbs-down'
)
=
icon
(
'thumbs-down'
)
=
downvotes
=
downvotes
%li
.issuable-comments.hidden-xs
%li
.issuable-comments.hidden-xs
=
link_to
issuable_url
,
class:
(
'no-comments'
if
note_count
.
zero?
)
do
=
link_to
issuable_url
,
class:
[
'has-tooltip'
,
(
'no-comments'
if
note_count
.
zero?
)],
title:
_
(
'Comments'
)
do
=
icon
(
'comments'
)
=
icon
(
'comments'
)
=
note_count
=
note_count
changelogs/unreleased/43786-on-the-issuable-list-add-tooltips-to-icons.yml
0 → 100644
View file @
8103bcc4
---
title
:
Add tooltips to icons in lists of issues and merge requests
merge_request
:
17700
author
:
type
:
changed
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