X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bb83f28a5e9326be55a431d5c3f7b4ae7529a942..8b4d4549a49e580d5c26ac2b3225ccb0c9078e4d:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index d04a2877f..1e00604d4 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -2,6 +2,10 @@ <%= render :partial => "layouts/head" %> +
+ <%= 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 } %> @@ -44,7 +48,7 @@ <% else %>
  • <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
    • <% end %> -
  • <%= 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} %>
    • @@ -71,6 +75,8 @@ + <%= yield :optionals %> + <% unless @user %>

    @@ -81,7 +87,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')) %>

    @@ -119,8 +126,6 @@ <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
    - <%= yield :optionals %> -