diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-05-06 12:25:23 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-05-06 12:25:23 -0400 |
commit | 5ed7a39dc7aeff97bd7dceb9e125b352223e29a3 (patch) | |
tree | 2557c887521305ddcbdddde52e5561e19780e19e /app/helpers/events_helper.rb | |
parent | 5b3c823fc9fe6788184a29dec7393158738ef584 (diff) | |
download | gitlab-ce-5ed7a39dc7aeff97bd7dceb9e125b352223e29a3.tar.gz |
Fix tooltips for event filter linksrs-fix-filter-tooltips
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r-- | app/helpers/events_helper.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index c9fd0f0362b..18c75a8726b 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -25,12 +25,16 @@ module EventsHelper def event_filter_link(key, tooltip) key = key.to_s - active = if @event_filter.active? key - 'active' - end + active = 'active' if @event_filter.active?(key) + link_opts = { + class: 'event_filter_link', + id: "#{key}_event_filter", + title: "Filter by #{tooltip.downcase}", + data: { toggle: 'tooltip', placement: 'top' } + } 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' => 'Filter by ' + tooltip.downcase do + link_to request.path, link_opts do icon(icon_for_event[key]) + content_tag(:span, ' ' + tooltip) end end |