Update the inbox link in the greeting bar when messages are marked
as read or unread.
This commit is contained in:
parent
ea458b1821
commit
7f1691e878
3 changed files with 9 additions and 6 deletions
|
@ -115,6 +115,7 @@ class MessageController < ApplicationController
|
||||||
if message.save
|
if message.save
|
||||||
if request.xhr?
|
if request.xhr?
|
||||||
render :update do |page|
|
render :update do |page|
|
||||||
|
page.replace "inboxanchor", :partial => "layouts/inbox"
|
||||||
page.replace "inbox-count", :partial => "message_count"
|
page.replace "inbox-count", :partial => "message_count"
|
||||||
page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
|
page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
|
||||||
end
|
end
|
||||||
|
|
7
app/views/layouts/_inbox.html.erb
Normal file
7
app/views/layouts/_inbox.html.erb
Normal file
|
@ -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 %>
|
|
@ -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="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> |
|
<span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> |
|
||||||
<%= yield :greeting %>
|
<%= yield :greeting %>
|
||||||
<%
|
<%= render :partial => "layouts/inbox" %> |
|
||||||
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 %> |
|
|
||||||
<%= 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)}%>
|
<%= 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 %>
|
<% else %>
|
||||||
<%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
|
<%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue