From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sat, 5 Oct 2013 00:34:06 +0000 (-0700)
Subject: Render flash in sidebar
X-Git-Tag: live~4615^2~219
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ecbe27b373bbe241af332d51a663192fd71a2520?ds=sidebyside

Render flash in sidebar
---

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 43d59cfb5..bef955509 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -561,10 +561,6 @@ nav.secondary {
     width: $sidebarWidth;
     border-right: $keyline;
 
-    .alert {
-      background: #e00;
-    }
-
     h2, h3, h4 {
       padding: $lineheight;
       border-bottom: $keyline;
@@ -1541,17 +1537,19 @@ a.donate {
 
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
-.flash {
-    padding: $lineheight;
-  &#error {
-    background-color: #ff7070;
-  }
-  &#warning {
-    background-color: #ffe0cc;
-  }
-  &#notice {
-    background-color: #CBEEA7;
-  }
+.error {
+  padding: $lineheight;
+  background-color: #ff7070;
+}
+
+.warning {
+  padding: $lineheight;
+  background-color: #ffe0cc;
+}
+
+.notice {
+  padding: $lineheight;
+  background-color: #CBEEA7;
 }
 
 /* Rules for highlighting fields with rails validation errors */
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index a3cbbc207..51ef3fe41 100644
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,11 +1,20 @@
 <% if flash[:error] %>
-  <div id="error" class="flash"><%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:error] %></div>
+  <p class="error">
+    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
+    <%= raw flash[:error] %>
+  </p>
 <% end %>
 
 <% if flash[:warning] %>
-  <div id="warning" class="flash"><%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:warning] %></div>
+  <p class="warning">
+    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
+    <%= raw flash[:warning] %>
+  </p>
 <% end %>
 
 <% if flash[:notice] %>
-  <div id="notice" class="flash"><%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:notice] %></div>
+  <p class="notice">
+    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
+    <%= raw flash[:notice] %>
+  </p>
 <% end %>
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index a8a15a30f..8be2aff81 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -17,11 +17,13 @@
 
     <div id="sidebar_content">
       <% if STATUS == :database_offline or STATUS == :api_offline %>
-        <p class="alert"><%= t 'layouts.osm_offline' %></p>
+        <p class="error"><%= t 'layouts.osm_offline' %></p>
       <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-        <p class="alert"><%= t 'layouts.osm_read_only' %></p>
+        <p class="error"><%= t 'layouts.osm_read_only' %></p>
       <% end %>
 
+      <%= render :partial => "layouts/flash" %>
+
       <%= yield %>
     </div>
   </div>