X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/db9420ba57478114090806f8b92c48f528eae31f..7e4ceec192572936f5618d6e834bd5cea4f26b80:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 368e3fc20..0c39cf74b 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -6,7 +6,7 @@
<%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
+
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<%= yield %>
@@ -75,6 +75,8 @@
+ <%= yield :optionals %>
+
<% unless @user %>
@@ -85,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')) %>
@@ -123,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 %>
-