Merge pull request #1 from renich/options_to_settings

changed options to settings
Phrogz · Jan 27, 2013 · fa98ac3 · fa98ac3
2 parents fec32d8 + cb8309a
commit fa98ac3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/views/layout.haml b/views/layout.haml
@@ -10,16 +10,16 @@
 		%meta(name="author" content="MyAppAuthor")
 		%link(rel="icon" type="image/png" href="/favicon.png")
 		%title= @title
-		- if options.css_files == :blob
+		- if settings.css_files == :blob
 			%link(type="text/css" rel="stylesheet" href="/blob.css?modified=#{File.mtime('public/blob.css').to_i}" )
 		- else
-			- options.css_files.each do |css|
+			- settings.css_files.each do |css|
 				%link(type="text/css" rel="stylesheet" href="/css/#{css}" )
-		- if options.js_files == :blob
+		- if settings.js_files == :blob
 			%script(type="text/javascript" src="/blob.js?modified=#{File.mtime('public/blob.js').to_i}")
 		- else
-			- options.js_files.each do |js|
+			- settings.js_files.each do |js|
 				%script(type="text/javascript" src="/js/#{js}")
 	%body{id:@action}
 		%h1#title= @title
-		#content= yield
+		#content= yield