From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Mar 2010 16:02:30 +0000 (+0000)
Subject: Update the inbox link in the greeting bar when messages are marked
X-Git-Tag: live~6322^2~35
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7f1691e878e76aafc6de537fadbdcb3f8f4aaaff

Update the inbox link in the greeting bar when messages are marked
as read or unread.
---

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index b5b3e45a7..5db9cccfa 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -115,6 +115,7 @@ class MessageController < ApplicationController
       if message.save
         if request.xhr?
           render :update do |page|
+            page.replace "inboxanchor", :partial => "layouts/inbox"
             page.replace "inbox-count", :partial => "message_count"
             page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
           end
diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb
new file mode 100644
index 000000000..18716618f
--- /dev/null
+++ b/app/views/layouts/_inbox.html.erb
@@ -0,0 +1,7 @@
+<%
+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 %>
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 9fdee1eec..5679f3e8b 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -36,12 +36,7 @@
         <span id="full-greeting"><%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %></span> 
         <span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> | 
         <%= yield :greeting %>
-        <%
-        inbox_attributes = {}
-        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 %> |
+        <%= render :partial => "layouts/inbox" %> |
         <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.request_uri)}%>
       <% else %>
         <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |