diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 13 | ||||
| -rw-r--r-- | app/views/layouts/_messages.html.erb | 21 |
2 files changed, 22 insertions, 12 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 78f36467..f33e4465 100644 --- a/app/helpers/application_helper.rb +++ b/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 diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb index 47067d20..d8f35d88 100644 --- a/app/views/layouts/_messages.html.erb +++ b/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">×</span> + </button> + <%= message %> + </div> <% end -%> - - </div> -</div> + <% end -%> <% end %> |