X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/42cdcce858e38418403aa4733837da4c3a62ff34..592ab2bec84542d329d88692adf4674a8d7adaa7:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index d1983a9f0..dc621c631 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -18,8 +18,14 @@
- <% if @notice || flash[:notice] %> -
<%= @notice || flash[:notice] %>
+ <% if flash[:error] %> +
<%= flash[:error] %>
+ <% end %> + <% if flash[:warning] %> +
<%= flash[:warning] %>
+ <% end %> + <% if flash[:notice] %> +
<%= flash[:notice] %>
<% end %> <%= yield %> @@ -92,7 +98,8 @@

<%= t 'layouts.intro_3', :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), - :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.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')) %>

<% end %> @@ -115,7 +122,7 @@
<%= t 'layouts.help_wiki' %>
- <%= t 'layouts.news_blog' %>
+ <%= t 'layouts.news_blog' %>
<%= t 'layouts.shop' %>
<%= yield :left_menu %>