@@ -13,8 +13,8 @@

<% if @user and @user.id %> - <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip'))) %> - <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> | + <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip'))) %> + <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> | <%= 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')}%> @@ -51,7 +51,7 @@

<%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), edit_path(:editor => editor), { @@ -70,7 +70,7 @@ <%= link_to(image_tag("osm_logo.png", :size => "120x120", :alt => t('layouts.logo.alt_text')), - root_path) %>
+ root_path) %>
<%= t 'layouts.project_name.h1' %>

<%= t('layouts.tag_line') %>

@@ -102,40 +102,36 @@

<%= raw t 'layouts.donate', :link => "#{t('layouts.donate_link_text')}" %>

<%= t'layouts.help' %> -
- +
  <%= link_to t('layouts.gps_traces'), traces_path, { :id => 'traceanchor', :title => t('layouts.gps_traces_tooltip') - } %>
-

<%= t 'layouts.project_name.h1' %>

<%= t('layouts.tag_line') %>

<%= t'layouts.help' %>

<%= t'layouts.community' %>

<%= link_to t('layouts.gps_traces'), traces_path, { :id => 'traceanchor', :title => t('layouts.gps_traces_tooltip') - } %>