Merge branch 'master' into notes

[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..fcaa5ae648031e971543f029fb852a06aa671d54 100644 (file)
--- a/app/views/layouts/_inbox.html.erb
+++ b/app/views/layouts/_inbox.html.erb
@@ -1,7 +1,13 @@
-<%
-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_html",
+      :count => @user.new_messages.size > 0 ?
+                content_tag(
+                  :span, @user.new_messages.size, :class => "count-number"
+                ) :
+                ""
+    ),
+    inbox_path(:display_name => @user.display_name),
+    :id => "inboxanchor"
+  )
 %>
-<%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %>