<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+ <%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
-
X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c382f33e1c2e17ba00898dede1ff9c3605818f16..3b6d2c5336eac35912909c9102c77bf6472901e6:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index d32490729..7aa2db7b9 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,50 +1,58 @@ +
- <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> - <%= javascript_include_tag 'site.js' %> - - -