+
+ <%= 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 %>
@@ -25,7 +29,7 @@
<%
viewclass = ''
- editclass = ''
+ editclass = 'disabled'
historyclass = ''
exportclass = ''
traceclass = ''
@@ -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 @@
@@ -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 %>
-