X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ea458b1821ab29fb37fd14def1eb2a20e7787e6e..7f1691e878e76aafc6de537fadbdcb3f8f4aaaff:/app/views/layouts/site.html.erb 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 @@ <%= 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')) %> <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> | <%= 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')} %> |