Fixed flash_class helper method.

nning · Jul 24, 2014 · 8dce1bd · 8dce1bd
1 parent f38624a
commit 8dce1bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -12,7 +12,7 @@ def domains
 
   # Convert flash message type to bootstrap class.
   def flash_class(type)
-    ({ notice: :info, alert: :warning, error: :danger }[type] or type).to_s
+    ({notice: :info, alert: :warning, error: :danger}[type.to_sym] || type).to_s
   end
 
   # Link to last visited page.

diff --git a/app/views/shared/_flash_messages.html.haml b/app/views/shared/_flash_messages.html.haml
@@ -1,4 +1,8 @@
 - flash.each do |type, message|
-  %div{class: "alert alert-#{flash_class(type)}"}
-    = link_to '×', '#', class: 'close', :'data-dismiss' => 'alert'
-    %p= message
+  %div.alert.alert-dismissable{class: "alert-#{flash_class(type)}"}
+    = link_to '#', class: 'close', :'data-dismiss' => 'alert' do
+      %span{:'aria-hidden' => 'true'} &times;
+      %span.sr-only Close
+    %p
+      %strong= flash_class(type).capitalize + ':'
+      = message