summaryrefslogtreecommitdiff
path: root/app/helpers/events_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r--app/helpers/events_helper.rb19
1 files changed, 15 insertions, 4 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 77f15a253ee..ab556938d8c 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -170,7 +170,7 @@ module EventsHelper
event.note_target_reference
end
- link_to(text, event_note_target_url(event), title: event.target_title, class: 'has-tooltip')
+ link_to(text, event_note_target_url(event), title: event.target_title, class: 'has-tooltip event-target-link')
else
content_tag(:strong, '(deleted)')
end
@@ -183,9 +183,9 @@ module EventsHelper
"--broken encoding"
end
- def icon_for_event(note)
+ def icon_for_event(note, size: 24)
icon_name = ICON_NAMES_BY_EVENT_TYPE[note]
- sprite_icon(icon_name, size: 24) if icon_name
+ sprite_icon(icon_name, size: size) if icon_name
end
def icon_for_profile_event(event)
@@ -203,8 +203,19 @@ module EventsHelper
def inline_event_icon(event)
unless current_path?('users#show')
content_tag :span, class: "system-note-image-inline #{event.action_name.parameterize}-icon" do
- icon_for_event(event.action_name)
+ icon_for_event(event.action_name, size: 14)
end
end
end
+
+ def event_user_info(event)
+ output = []
+
+ output << content_tag(:span, link_to_author(event), class: "author_name")
+ output << content_tag(:span, event.author.to_reference, class: "username")
+
+ content_tag(:div, class: "event-user-info") do
+ output.join.html_safe
+ end
+ end
end