@@ -66,7 +66,7 @@ class Bones def self.pages Dir.chdir(Bones.pages_path) do Dir.glob('**/*.html.erb').map do |f| - f.starts_with?('_') ? nil : f.gsub('.html.erb', '') + File.basename(f).starts_with?('_') ? nil : f.gsub('.html.erb', '') end.compact end end lib/bones/bones.rb @@ -89,7 +89,8 @@ class Bones if layout && File.file?(layout_filename) erb = ERB.new(File.read(layout_filename)) - eval(erb.src) do |key| + eval(erb.src) do |*keys| + key = keys.first key = :layout if key.blank? instance_variable_get(:"@content_for_#{key}") end lib/bones/template.rb a5579ed2f9f3417b152625b6bdce044f78ac8920 Chris Scharf scharfie@gmail.com http://github.com/scharfie/bones/commit/5d65522e4b496ecc5a859693f0acd7a3fe539e3a 5d65522e4b496ecc5a859693f0acd7a3fe539e3a 2009-10-27T12:01:13-07:00 2009-10-27T12:01:13-07:00 fixed bug with partials in subdirectories 62e41365c168188984ff2553ed0c2388f8ff4dc6 Chris Scharf scharfie@gmail.com