From f3e79f7659c7f64aa7ca88fd01c24e815489dfe0 Mon Sep 17 00:00:00 2001 From: Nikita Kholin Date: Sat, 28 Jan 2017 18:27:18 +0200 Subject: [PATCH] Change template language to slim --- Gemfile | 1 + Gemfile.lock | 5 +++++ app/views/layouts/application.html.erb | 14 -------------- app/views/layouts/application.html.slim | 9 +++++++++ app/views/layouts/mailer.html.erb | 13 ------------- app/views/layouts/mailer.html.slim | 8 ++++++++ app/views/layouts/mailer.text.erb | 1 - app/views/layouts/mailer.text.slim | 1 + 8 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/application.html.slim delete mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.html.slim delete mode 100644 app/views/layouts/mailer.text.erb create mode 100644 app/views/layouts/mailer.text.slim diff --git a/Gemfile b/Gemfile index d0913b0..03d4df3 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ gem 'pg', '~> 0.18' gem 'puma', '~> 3.0' gem 'rails', '~> 5.0.1' gem 'sass-rails', '~> 5.0' +gem 'slim' gem 'turbolinks', '~> 5' gem 'uglifier', '>= 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 58bb984..35d3bef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -224,6 +224,9 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) + slim (3.0.7) + temple (~> 0.7.6) + tilt (>= 1.3.3, < 2.1) slop (3.6.0) spring (2.0.1) activesupport (>= 4.2) @@ -237,6 +240,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + temple (0.7.7) thor (0.19.4) thread_safe (0.3.5) tilt (2.0.6) @@ -289,6 +293,7 @@ DEPENDENCIES sass-rails (~> 5.0) selenium-webdriver shoulda-matchers + slim spring spring-watcher-listen (~> 2.0.0) turbolinks (~> 5) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index b485585..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Room538 - <%= csrf_meta_tags %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - - - - <%= yield %> - - diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim new file mode 100644 index 0000000..f9d9a0a --- /dev/null +++ b/app/views/layouts/application.html.slim @@ -0,0 +1,9 @@ +doctype html +html + head + title Room538 + = csrf_meta_tags + = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' + = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' + body + = yield diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb deleted file mode 100644 index cbd34d2..0000000 --- a/app/views/layouts/mailer.html.erb +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - <%= yield %> - - diff --git a/app/views/layouts/mailer.html.slim b/app/views/layouts/mailer.html.slim new file mode 100644 index 0000000..aa4c616 --- /dev/null +++ b/app/views/layouts/mailer.html.slim @@ -0,0 +1,8 @@ +doctype html +html + head + meta[http-equiv="Content-Type" content="text/html; charset=utf-8"] + style + | /* Email styles need to be inline */ + body + = yield diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb deleted file mode 100644 index 37f0bdd..0000000 --- a/app/views/layouts/mailer.text.erb +++ /dev/null @@ -1 +0,0 @@ -<%= yield %> diff --git a/app/views/layouts/mailer.text.slim b/app/views/layouts/mailer.text.slim new file mode 100644 index 0000000..0a90f09 --- /dev/null +++ b/app/views/layouts/mailer.text.slim @@ -0,0 +1 @@ += yield