Merge remote-tracking branch 'upstream/pull/4776'

[rails.git] / app / views / layouts / _inbox.html.erb

diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb
index 2af76f9ed29e357ecbd6871c9f593e9fde0e43ec..2f5a63753b0bb7e249e9786576915059aaf3813b 100644 (file)
--- a/app/views/layouts/_inbox.html.erb
+++ b/app/views/layouts/_inbox.html.erb
@@ -1,7 +1,3 @@
-<%= link_to raw(t('layouts.inbox',
-    :count => @user.new_messages.size > 0 ? "<span class='count-number'>#{@user.new_messages.size}</span>" : '')),
-    {
-        :action => 'inbox',
-        :display_name => @user.display_name,
-        :controller => 'message'
-    }, { :id => 'inboxanchor' } %>
+<% if current_user.new_messages.size > 0 %>
+<span id="inboxanchor" class="badge count-number m-1"><%= current_user.new_messages.size %></span>
+<% end %>