Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-16 19:15:48 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-16 19:15:48 +0300
commit06a219baa5130479bf2ee31f26c138509679c562 (patch)
tree565a6057ed91091ac6fd648798979e0d72bb7707 /app/helpers/events_helper.rb
parentf3f27fee88a30899564ed32a2968b0ac8e31451f (diff)
Restyle group page and event filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r--app/helpers/events_helper.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index a3136926b38..903a5009616 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -21,15 +21,14 @@ module EventsHelper
def event_filter_link(key, tooltip)
key = key.to_s
- inactive = if @event_filter.active? key
- nil
- else
- 'inactive'
- end
+ active = if @event_filter.active? key
+ 'active'
+ end
- content_tag :div, class: "filter_icon #{inactive}" do
+ 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
- content_tag :i, nil, class: icon_for_event[key]
+ content_tag(:i, nil, class: icon_for_event[key]) +
+ content_tag(:span, ' ' + tooltip)
end
end
end