This website works better with JavaScript.
Home
Explore
Help
Sign In
abunchtell
/
mastodon
Watch
1
Star
0
Fork
0
Code
Issues
0
Activity
Browse Source
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
4 changed files
with
12 additions
and
14 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+7
-0
app/helpers/flashes_helper.rb
+3
-0
app/views/application/_flashes.html.haml
+1
-7
app/views/layouts/admin.html.haml
+1
-7
app/views/layouts/auth.html.haml
+ 7
- 0
app/helpers/flashes_helper.rb
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
- 0
app/views/application/_flashes.html.haml
View File
@@ -0,0 +1,3 @@
- user_facing_flashes.each do |key, value|
.flash-message{class: key}
%strong= value
+ 1
- 7
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
+ 1
- 7
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
Write
Preview
Loading…
Cancel
Save