aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth.h.rees@gmail.com>2012-09-11 17:12:10 -0700
committerGareth Rees <gareth.h.rees@gmail.com>2012-09-11 17:12:10 -0700
commit17990994e95b420619394e4a94917c34e1fe2663 (patch)
tree1ec915164e9690e45528a8ed5b55ccf6c1dc7215
parentae3965b4752285991acb5ac8147fc9f4a88eea6d (diff)
parent6639ef8b5a2d0655a84888f3a227cbd33b92e175 (diff)
downloadrails-17990994e95b420619394e4a94917c34e1fe2663.tar.gz
rails-17990994e95b420619394e4a94917c34e1fe2663.tar.bz2
rails-17990994e95b420619394e4a94917c34e1fe2663.zip
Merge pull request #113 from lifo/gr-flash-output
Ran the generators and had no further changes. Merging.
-rw-r--r--guides/source/action_controller_overview.textile10
1 files changed, 4 insertions, 6 deletions
diff --git a/guides/source/action_controller_overview.textile b/guides/source/action_controller_overview.textile
index 1d43b44391..5806faed2a 100644
--- a/guides/source/action_controller_overview.textile
+++ b/guides/source/action_controller_overview.textile
@@ -308,12 +308,10 @@ The +destroy+ action redirects to the application's +root_url+, where the messag
<html>
<!-- <head/> -->
<body>
- <% if flash[:notice] %>
- <p class="notice"><%= flash[:notice] %></p>
- <% end %>
- <% if flash[:alert] %>
- <p class="alert"><%= flash[:alert] %></p>
- <% end %>
+ <% flash.each do |name, msg| -%>
+ <%= content_tag :div, msg, class: name %>
+ <% end -%>
+
<!-- more content -->
</body>
</html>