+ +

+ <%= 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", @@ -44,7 +44,6 @@

<%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %>
<%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %>
<%= link_to t('layouts.copyright'), copyright_path %>

@@ -58,10 +57,16 @@

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

<%= t'layouts.data' %>

<%= link_to t('layouts.copyright'), copyright_path %>

<%= link_to t('layouts.export_data'), export_path %>

<%= link_to t('layouts.gps_traces'), traces_path %>

<%= yield :left_menu %> @@ -69,10 +74,7 @@

<%= ad = [{:image => 'sotm-birmingham-ad.png', :title => 'State of the Map Birmingham', - :href =>'http://stateofthemap.org/'}, - {:image => 'donate-ad.png', - :title => 'Server Donation Drive', - :href =>'http://donate.openstreetmap.org/'}].sample + :href =>'http://stateofthemap.org/'}].sample link_to ad[:href], :title => ad[:title] do image_tag ad[:image], :class => :ad @@ -81,6 +83,7 @@

+ <%= h(t('layouts.make_a_donation.text')) %>

<%=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 %>

<%= link_to t('layouts.view'), root_path, { - :id => 'viewanchor', - :title => t('layouts.view_tooltip'), - :class => 'geolink llz layers' - } %>
<%= link_to h(t('layouts.edit')) + content_tag(:span, "â¼", :class => "menuicon"), edit_path, { - :id => 'editanchor', - :title => t('javascripts.site.edit_tooltip'), - :data => { :minzoom => 13, :editor => preferred_editor }, - :class => 'geolink llz object disabled' - } %>
<%= link_to t('layouts.history'), browse_changesets_path, { - :id => 'historyanchor', - :data => { :minzoom => 11 }, - :title => t('javascripts.site.history_tooltip'), - :class => 'geolink bbox' - } %>
<%= link_to t('layouts.export'), export_path, { - :id => 'exportanchor', - :title => t('layouts.export_tooltip'), - :data => { :url => url_for(:controller => :export, :action => :start) }, - :class => 'geolink llz layers' - } %>

<%= link_to t('layouts.edit_with', - :editor => t("editor.#{editor}.description")), - edit_path(:editor => editor), { - :data => { :editor => editor }, - :class => "geolink llz object" - } %>
+ <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %> +
+ <%= render :partial => 'layouts/edit_menu', + :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%> +
+ <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %> +

<%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <% if content_for? :heading %> @@ -157,8 +126,8 @@ <%= yield %>