Show offline/readonly messages as normal flash messages

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 40f5727cbcd812894c97ff7076994b7b8bd64627..f7c6e74ad88c97b05f1af6109b93ed24b07ed348 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -591,12 +591,6 @@ body.compact {
       float: right;
       cursor: pointer;
     }
       float: right;
       cursor: pointer;
     }

-
-    p.error {
-      background-color: #ff7070;
-      padding: 10px;
-      font-weight: bold;
-    }

   }
 
   .overlay-sidebar #sidebar {
   }
 
   .overlay-sidebar #sidebar {

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index acc478c152c4b68aa04bab1d8d84862b22183d45..2ceeda7bea9f62fd24c8220cf239cba776b01e96 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -415,6 +415,12 @@ class ApplicationController < ActionController::Base
       :img_src => %w(developer.mapquest.com)
     )
 
       :img_src => %w(developer.mapquest.com)
     )
 

+    if STATUS == :database_offline || STATUS == :api_offline
+      flash.now[:warning] = t("layouts.osm_offline")
+    elsif STATUS == :database_readonly || STATUS == :api_readonly
+      flash.now[:warning] = t("layouts.osm_read_only")
+    end
+

     request.xhr? ? "xhr" : "map"
   end
 
     request.xhr? ? "xhr" : "map"
   end
 

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 9cd4f8a647dbd0164cfe29109ef7371317db718d..d8bf787a4a9319b3cdd30e73192f6c93784c6248 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -24,12 +24,6 @@
   <div id="sidebar">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
   <div id="sidebar">
     <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 

-    <% if STATUS == :database_offline or STATUS == :api_offline %>
-      <p class="error"><%= t 'layouts.osm_offline' %></p>
-    <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-      <p class="error"><%= t 'layouts.osm_read_only' %></p>
-    <% end %>
-

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