aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2011-06-21 10:31:16 -0400
committerMatt Jankowski <mjankowski@thoughtbot.com>2011-06-21 10:31:16 -0400
commit20a9bddfada88a8a46effc2e9c93190c58ba9318 (patch)
tree4a37debd8bd21e20be55152b82a8a0e40431eb10
parent100b675cba2a634884e07ed31d8c59245f48a864 (diff)
downloadrails-20a9bddfada88a8a46effc2e9c93190c58ba9318.tar.gz
rails-20a9bddfada88a8a46effc2e9c93190c58ba9318.tar.bz2
rails-20a9bddfada88a8a46effc2e9c93190c58ba9318.zip
reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made
-rw-r--r--actionpack/lib/abstract_controller/layouts.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 8f73e244d7..5765ad34f7 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -81,11 +81,12 @@ module AbstractController
# class EmployeeController < BankController
# layout nil
#
- # The InformationController uses "bank_standard" inherited from the BankController, the VaultController overwrites
- # and picks the layout dynamically, and the EmployeeController doesn't want to use a layout at all.
- #
- # The TellerController uses +teller.html.erb+, and TillController inherits that layout and
- # uses it as well.
+ # In these examples:
+ # * The InformationController will use the "bank_standard" layout, which is inherited from BankController
+ # * The TellerController will follow convention and use +app/views/layouts/teller.html.erb+
+ # * The TillController will inherit the layout from TellerController and use +teller.html.erb+ as well
+ # * The VaultController will pick a layout dynamically by calling the <tt>access_level_layout</tt> method
+ # * The EmployeeController will not use a layout
#
# == Types of layouts
#