+ +

+ <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %> + <%= t 'layouts.project_name.h1' %> +

<%= link_to(image_tag("osm_logo.png", :size => "120x120", @@ -99,17 +99,14 @@

<%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %>
<%= yield :greeting %>
<%= render :partial => "layouts/inbox" %>
<%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
<%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
<%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>

+ <% if @user and @user.id %> + <%= render :partial => "layouts/user_menu" %> + <% else %> +

<%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
<%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>

+ <% end %>