diff --git a/Gemfile b/Gemfile index 074bcb3..76a3e87 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,8 @@ gem 'rails', '3.0.9' gem 'sqlite3' +gem 'haml' + group :development, :test do gem 'rspec-rails' gem 'cucumber-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 130a640..8a4c265 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,7 @@ GEM ffi (1.0.9) gherkin (2.4.1) json (>= 1.4.6) + haml (3.1.2) i18n (0.5.0) json (1.5.3) json_pure (1.5.3) @@ -123,6 +124,7 @@ DEPENDENCIES capybara cucumber-rails database_cleaner + haml rails (= 3.0.9) rspec-rails sqlite3 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 9d579a8..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Scube - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> - - - -<%= yield %> - - - diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml new file mode 100644 index 0000000..af87716 --- /dev/null +++ b/app/views/layouts/application.html.haml @@ -0,0 +1,10 @@ +!!! +%html + %head + %meta{'charset' => 'utf-8'} + %title scube + = stylesheet_link_tag :all + = javascript_include_tag :defaults + = csrf_meta_tag + %body + = yield