techhub/mastodon
2
0
Fork 0
Code Activity

Clean up flash display in views (#2336)

Browse Source 
* Add flashes partial to DRY up admin/auth layouts

* Further consolidate flash messages
This commit is contained in:
Matt Jankowski
2017-04-22 22:22:34 -04:00
committed by Eugen
parent ee82d8a876
commit 532bec6e56
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/flashes_helper.rb Normal file
View File

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

3
app/views/application/_flashes.html.haml Normal file
View File

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

8
app/views/layouts/admin.html.haml
View File

@@ -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

8
app/views/layouts/auth.html.haml
View File

@@ -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