<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+ <%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
-
X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5bc1730d89053486d39af6923d8ee7132402fe0c..3b329ff9f9d799b2d3e4fe8a0030bd30aa08adef:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index c9a70b79e..aa534d63a 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,51 +1,63 @@ - - + +
- <%= 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 => 'UCL VR Centre', + :bytemark => 'bytemark' %> +