- <% if flash[:error] %> -

<%= flash[:error] %>

- <% end %> - <% if flash[:warning] %> -

<%= flash[:warning] %>

- <% end %> - <% if flash[:notice] %> -

<%= flash[:notice] %>

- <% end %> +

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

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

+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <%= yield %>

@@ -49,17 +28,18 @@

<%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
<%= link_to t('layouts.edit') + ' ▾', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
<%= 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}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
<%= 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.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %>

@@ -96,6 +76,8 @@

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

@@ -106,7 +88,8 @@

<%= t 'layouts.intro_3', - :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), + :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), + :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"), :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"), :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %>

@@ -140,17 +123,14 @@

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

- - <%= yield :optionals %> -

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

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