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

[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 18716618fa7e828958986542b5be73ba6f8766ea..79a1db2da4fa56f150b45e343e548bd3f501464e 100644 (file)
--- a/app/views/layouts/_inbox.html.erb
+++ b/app/views/layouts/_inbox.html.erb
@@ -1,7 +1,3 @@
-<%
-inbox_attributes = {}
-inbox_attributes[:id] = "inboxanchor"
-inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
-inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
-%>
-<%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %>
+<% if current_user.new_messages.size > 0 %>
+<span id="inboxanchor" class="count-number"><%= current_user.new_messages.size %></span>
+<% end %>