lib/nested_layouts/isolation.rb @@ -8,12 +8,11 @@ module ActionView #:nodoc: # Wrap part of the template into layout. # All layout files must be in app/views/layouts. def inside_layout(layout, &block) + layout = (layout.to_s =~ /layouts\//) ? layout : "layouts/#{layout}" binding = block.binding if BINDING_REQUIRED - - layout = Dir.entries("#{RAILS_ROOT}/app/views/layouts").detect { |a| /#{layout}/.match(a) } @template.instance_variable_set('@content_for_layout', capture(&block)) concat( - @template.render(:file => "#{RAILS_ROOT}/app/views/layouts/#{layout}", :user_full_path => true), + @template.render(:file => @template.view_paths.find_template(layout, :html), :user_full_path => true), binding ) end lib/nested_layouts.rb a75de05e0bf300c62ec3c42082bc944f11339b05 5a5f6f1ea21b04aceab8d06919c25384896644f6 George Anderson george@benevolentcode.com http://github.com/george/nested-layouts/commit/d4c5f4b19c9f373aa9c58570eb5ab9ca0adf0e54 d4c5f4b19c9f373aa9c58570eb5ab9ca0adf0e54 2009-10-01T08:43:29-07:00 2009-10-01T08:43:29-07:00 Merge commit 'caring/master' into development * commit 'caring/master': Nested layout can use rails to find the layout, this is much more robust than filesystem detection in just one of the view paths. Don't require the layouts/ prefix when using inside_layout -- matches the behavior of rails layouts. Added isolated option to nested layouts to make it work for partial layouts. 25f3b318e042cfbffc0926cb5c48287b538a294e George Anderson george@benevolentcode.com