<% if @user and @user.id %> @@ -26,131 +24,156 @@ <% end %>

<%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
<%= link_to h(t('layouts.edit')) + ' ▾'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
<%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
<%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
<%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
<%= link_to t('layouts.view'), { + :controller => 'site', + :action => 'index' + }, { + :id => 'viewanchor', + :title => t('layouts.view_tooltip'), + :class => 'geolink llz layers' + } %>
<%= link_to h(t('layouts.edit')) + content_tag(:span, "â¾", :class => "menuicon"), { + :controller => 'site', + :action => 'edit' + }, { + :id => 'editanchor', + :title => t('javascripts.site.edit_tooltip'), + :data => { :minzoom => 13 }, + :class => 'geolink llz object disabled' + } %>
<%= link_to t('layouts.history'), { + :controller => 'changeset', + :action => 'list' + }, { + :id => 'historyanchor', + :data => { :minzoom => 11 }, + :title => t('javascripts.site.history_tooltip'), + :class => 'geolink bbox' + } %>
<%= link_to t('layouts.export'), { + :controller => 'site', + :action => 'export' + }, { + :id => 'exportanchor', + :title => t('layouts.export_tooltip'), + :class => 'geolink llz layers' + } %>

- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
+ <%= link_to(image_tag("osm_logo.png", + :size => "120x120", + :alt => t('layouts.logo.alt_text')), + :controller => 'site', + :action => 'index') %>

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

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

- <%= yield :optionals %> - <% unless @user %> -

- <%= t 'layouts.intro_1' %> -

<%= t 'layouts.intro_1' %>

<%= t 'layouts.intro_2_html', - :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"), - :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')), - :license => link_to(t('layouts.intro_2_license'), - url_for({:controller => 'site', :action => 'copyright'})), - :create_account => link_to(t('layouts.intro_2_create_account'), - url_for({:controller => 'user', :action => 'new'})) + :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"), + :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')), + :license => link_to(t('layouts.intro_2_license'), + url_for({:controller => 'site', :action => 'copyright'})), + :create_account => link_to(t('layouts.intro_2_create_account'), + url_for({:controller => 'user', :action => 'new'})) %>

<% end %> - <% if STATUS == :database_offline or STATUS == :api_offline %> <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -

+ <% end %> - <% if false %> -

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

<%= t'layouts.help' %> -
- <%= 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'), {:controller => 'site', :action => 'copyright'} %>
+
- <%= 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'), {:controller => 'site', :action => 'copyright'} %>
<%= t'layouts.community' %> -
- <%= t 'layouts.community_blogs' %>
- <%= t 'layouts.foundation' %>
- <%= link_to(t('layouts.user_diaries'), { - :controller => 'diary_entry', - :action => 'list', - :display_name => nil - }, { - :title => t('layouts.user_diaries_tooltip') - }) %>
+
- <%= t 'layouts.community_blogs' %>
- <%= t 'layouts.foundation' %>
- <%= link_to(t('layouts.user_diaries'), { + :controller => 'diary_entry', + :action => 'list', + :display_name => nil + }, { + :title => t('layouts.user_diaries_tooltip') + }) %>
<%= link_to t('layouts.gps_traces'), { + :controller => 'trace', + :action => 'list', + :display_name => nil, + :tag => nil, + :page => nil + }, { + :id => 'traceanchor', + :title => t('layouts.gps_traces_tooltip') + } %>

- +

+ <%= link_to image_tag("sotm.png", + :alt => t('layouts.sotm2012'), + :title => t('layouts.sotm2012'), + :border => "0"), "http://stateofthemap.org/register-now/" %> +

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

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"), - :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), - :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %> -

<%= t 'layouts.partners_html', + :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %> +

- - - <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - <%= render :partial => "layouts/piwik" %> + <% end -%>