Commit 930f8251

mo <mokha@cisco.com>
2017-08-31 23:09:04
fix alerts.
1 parent 8c12dd7
Changed files (2)
app/helpers/application_helper.rb
@@ -34,4 +34,17 @@ module ApplicationHelper
   def configuration_for(key, default)
     content_for(key) || default
   end
+
+  def flash_to_alert(key)
+    case key.to_sym
+    when :success
+      'primary'
+    when :error
+      'danger'
+    when :warning
+      'warning'
+    else
+      'info'
+    end
+  end
 end
app/views/layouts/_messages.html.erb
@@ -1,15 +1,12 @@
 <% if(flash.any?) -%>
-<div class="row-fluid">
-  <div class="span12">
-    <% flash.each do |key, value| -%>
-      <% Array(value).uniq.each do |message| -%>
-        <div class="alert alert-<%= key %>">
-          <a class="close" data-dismiss="alert" href="#">×</a>
-          <%= message %>
-        </div>
-      <% end -%>
+  <% flash.each do |key, value| -%>
+    <% Array(value).uniq.each do |message| -%>
+      <div class="alert alert-dismissible fade show alert-<%= flash_to_alert(key) %>" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <%= message %>
+      </div>
     <% end -%>
-    &nbsp;
-  </div>
-</div>
+  <% end -%>
 <% end %>