Make main page flash messages visible

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6f4603923a4d4783168c434c8fc6e80f3deaa447..f90dca7bf01ecfefab86692bece3e112b6309cee 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -40,6 +40,7 @@
       dataType: "html",
       complete: function(xhr) {
         clearTimeout(loaderTimeout);
       dataType: "html",
       complete: function(xhr) {
         clearTimeout(loaderTimeout);

+        $('#flash').empty();

         $('#sidebar_loader').hide();
         $('#sidebar_content').html(xhr.responseText);
         if (xhr.getResponseHeader('X-Page-Title')) {
         $('#sidebar_loader').hide();
         $('#sidebar_content').html(xhr.responseText);
         if (xhr.getResponseHeader('X-Page-Title')) {

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index ccbb463a69d857bcc68999b9e0a8b99f0c26304d..68162f7032246e51ba540300f3ea5c1f1a42ba61 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -30,6 +30,10 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 

+    <div id="flash">
+      <%= render :partial => "layouts/flash" %>
+    </div>
+

     <div id="browse_status"></div>
 
     <div id="sidebar_loader" style="display: none;">
     <div id="browse_status"></div>
 
     <div id="sidebar_loader" style="display: none;">


@@ -37,7 +41,6 @@
     </div>
 
     <div id="sidebar_content">
     </div>
 
     <div id="sidebar_content">

-      <%= render :partial => "layouts/flash" %>

       <%= yield %>
     </div>
 
       <%= yield %>
     </div>