Clean up flash display in views (#2336)

* Add flashes partial to DRY up admin/auth layouts

* Further consolidate flash messages
master
Matt Jankowski 7 years ago committed by Eugen
parent ee82d8a876
commit 532bec6e56
  1. 7
      app/helpers/flashes_helper.rb
  2. 3
      app/views/application/_flashes.html.haml
  3. 8
      app/views/layouts/admin.html.haml
  4. 8
      app/views/layouts/auth.html.haml

@ -0,0 +1,7 @@
# frozen_string_literal: true
module FlashesHelper
def user_facing_flashes
flash.to_hash.slice('alert', 'error', 'notice', 'success')
end
end

@ -0,0 +1,3 @@
- user_facing_flashes.each do |key, value|
.flash-message{class: key}
%strong= value

@ -13,13 +13,7 @@
.content
%h2= yield :page_title
- if flash[:notice]
.flash-message.notice
%strong= flash[:notice]
- if flash[:alert]
.flash-message.alert
%strong= flash[:alert]
= render 'flashes'
= yield

@ -9,13 +9,7 @@
= image_tag 'logo.png'
.form-container
- if flash[:notice]
.flash-message.notice
%strong= flash[:notice]
- if flash[:alert]
.flash-message.alert
%strong= flash[:alert]
= render 'flashes'
= yield

Loading…
Cancel
Save