diff options
author | Marin Jankovski <marin@gitlab.com> | 2015-02-26 18:50:23 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2015-02-26 18:50:23 +0000 |
commit | 6146e2940d3cc93eafc3375ab468b39dc3e77c78 (patch) | |
tree | 01826342ebaab79498be4482e82c5bed50fad1e6 /app | |
parent | f05168b1a16d11c74f13b6265409bb55b14400cf (diff) | |
parent | 5d2dda9744eb902e397410f8f4b94af3a0acb1df (diff) | |
download | gitlab-ce-6146e2940d3cc93eafc3375ab468b39dc3e77c78.tar.gz |
Merge branch 'event_tooltip_addition' into 'master'
Added information to tooltips
Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992
See merge request !1571
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/events_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 063916a8df8..d38b546e1b2 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -30,7 +30,7 @@ module EventsHelper end content_tag :li, class: "filter_icon #{active}" do - link_to request.path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do + link_to request.path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => 'Filter by ' + tooltip.downcase do icon(icon_for_event[key]) + content_tag(:span, ' ' + tooltip) end end |