From 20a9bddfada88a8a46effc2e9c93190c58ba9318 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 21 Jun 2011 10:31:16 -0400 Subject: reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made --- actionpack/lib/abstract_controller/layouts.rb | 11 ++++++----- 1 file 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 access_level_layout method + # * The EmployeeController will not use a layout # # == Types of layouts # -- cgit v1.2.3