diff --git a/app_helpers.rb b/app_helpers.rb index de9eea04..eb03284d 100644 --- a/app_helpers.rb +++ b/app_helpers.rb @@ -110,3 +110,7 @@ end def sanitize_comment(text) Rinku.auto_link Sanitize.fragment(text), :all, 'target="_blank" rel="nofollow"' end + +def flash_display(opts={}) + erb :'_flash', layout: false, locals: {opts: opts} +end diff --git a/views/admin.erb b/views/admin.erb index 5efcd038..e8962cb0 100644 --- a/views/admin.erb +++ b/views/admin.erb @@ -14,13 +14,7 @@ - <% if flash.keys.length > 0 %> -
- <% flash.keys.each do |key| %> - <%== flash[key] %> - <% end %> -
- <% end %> + <%== flash_display %>
diff --git a/views/admin/email.erb b/views/admin/email.erb index baf2ec38..44238c98 100644 --- a/views/admin/email.erb +++ b/views/admin/email.erb @@ -7,13 +7,7 @@
- <% if flash.keys.length > 0 %> -
- <% flash.keys.each do |key| %> - <%== flash[key] %> - <% end %> -
- <% end %> + <%== flash_display %>
diff --git a/views/dashboard.erb b/views/dashboard.erb index 34910c63..bea67956 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -58,21 +58,7 @@
<% end %> - <% if @error %> -
-

<%== @error %>

-
- <% end %> - - <% if flash.keys.length > 0 %> -
-

- <% flash.keys.each do |key| %> - <%== flash[key] %> - <% end %> -

-
- <% end %> +<%== flash_display %>