+
+
+
+
+ <% if actors.size == 1 %>
+ " class="crayons-link fw-bold"><%= actors.first["name"] %>
+ <% elsif actors.size == 2 %>
+ " class="crayons-link fw-bold"><%= actors.first["name"] %> and
+ " class="crayons-link fw-bold"><%= actors.last["name"] %>
+ <% elsif actors.size > 1 %>
+ " class="crayons-link fw-bold"><%= actors.first["name"] %> and <%= pluralize(actors.size - 1, "other") %>
+ <% end %>
+ reacted to
+ " class="crayons-link fw-bold">
+ <%# your article/comment or the actual title of the article/comment %>
+ <%= reactable_data["title"].blank? ? "your #{reactable_data['class']['name'].downcase}" : h(reactable_data["title"]) %>
+
+ with
+
+
+ <% reaction_categories = siblings.map { |n| n["category"] } %>
+ <% reaction_categories.each do |cat| %>
+ <% image_path = ReactionImage.new(cat).path %>
+ <% if image_path.present? %>
+ <%= inline_svg_tag(image_path, aria: true, class: "crayons-icon reaction-image mx-1 my-1 reaction-icon--#{cat}", title: cat.to_s.humanize) %>
+ <% end %>
<% end %>
- reacted to
-
" class="notification-comment-reacted-link">
- <%# your article/comment or the actual title of the article/comment %>
- <%= reactable_data["title"].blank? ? "your #{reactable_data['class']['name'].downcase}" : h(reactable_data["title"]) %>
-
-
- with
- <% reaction_categories = siblings.map { |n| n["category"] } %>
- <% reaction_categories.each do |cat| %>
- <% image_path = ReactionImage.new(cat).path %>
- <% if image_path.present? %>
- <%= image_tag(image_path, class: "reaction-image", alt: cat.to_s.humanize) %>
- <% end %>
- <% end %>
-
diff --git a/app/views/notifications/_article.html.erb b/app/views/notifications/_article.html.erb
index cdfdbc28a..76543f4ad 100644
--- a/app/views/notifications/_article.html.erb
+++ b/app/views/notifications/_article.html.erb
@@ -1,59 +1,60 @@
-<% if notification.action == "Reaction" %>
- <%= render "reaction", notification: notification %>
-<% elsif notification.action.include? "Milestone" %>
- <%= render "milestone", notification: notification %>
-<% else %>
- <% json_data = notification.json_data %>
- <% if json_data["organization"] %>
-
- <% end %>
-
" class="small-pic-link-wrapper">
-
-
" alt="link to <%= json_data["user"]["username"] %>'s profile">
-
-
-
">
- <%= json_data["user"]["name"] %>
-
- made a new post<%= ":" unless json_data["organization"] %>
- <% if json_data["organization"] %>
- under
"><%= json_data["organization"]["name"] %>:
- <% end %>
+
+ <% end %>
+
diff --git a/app/views/notifications/_badgeachievement.html.erb b/app/views/notifications/_badgeachievement.html.erb
index 471bb00f8..6db456113 100644
--- a/app/views/notifications/_badgeachievement.html.erb
+++ b/app/views/notifications/_badgeachievement.html.erb
@@ -1,30 +1,20 @@
<% json_data = notification.json_data %>
-
/giphy-downsized.gif" alt="A random celebratory gif!">