X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2a7f689f1fdc4e24717a91ece1894e1401cae670..a5d8839abfdc682710c0f5dd6af6069ad09c07ba:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index f072544aa..d4626d143 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -2,6 +2,7 @@ + <%= javascript_strings %> <%= javascript_include_tag 'prototype' %> <%= javascript_include_tag 'site' %> @@ -17,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 %> @@ -114,7 +121,7 @@
<%= t 'layouts.help_wiki' %>
- <%= t 'layouts.news_blog' %>
+ <%= t 'layouts.news_blog' %>
<%= t 'layouts.shop' %>
<%= yield :left_menu %>