<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+ <%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
-
X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8758685a86c3032a412183a53399e3e77dae75a1..0b84885cfc566fb2d552c5681c11a2905d28f038:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index c2e4c9bfc..3a80c33a6 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,49 +1,67 @@ - + +
- <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> - <%= javascript_include_tag 'site.js' %> - - -+ <%= t 'layouts.intro_1' %> +
++ <%= t 'layouts.intro_2' %>. +
++ <%= 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") %> +