<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+ <%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
-
X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4f826acfca0ede6b7d4868e8bb45a608c44582ce..1f92b6f35b43fa36e42a924fb5561d889120e457:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 1154237cb..105244611 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 => '' + t('layouts.intro_3_ucl') + '', + :bytemark => '' + t('layouts.intro_3_bytemark') + '' %> +