From c707d14eb0f9dd5b11696e4160237b41e6c1e77d Mon Sep 17 00:00:00 2001 From: Roma S Date: Wed, 6 Nov 2019 23:54:53 +0300 Subject: [PATCH 1/2] Convert erb files to haml files --- apps/web/templates/application.html.erb | 22 ------------------- apps/web/templates/application.html.haml | 14 ++++++++++++ .../{create.html.erb => create.html.haml} | 0 .../{create.html.erb => create.html.haml} | 0 4 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 apps/web/templates/application.html.erb create mode 100644 apps/web/templates/application.html.haml rename apps/web/templates/outputs/{create.html.erb => create.html.haml} (100%) rename apps/web/templates/single_run/{create.html.erb => create.html.haml} (100%) diff --git a/apps/web/templates/application.html.erb b/apps/web/templates/application.html.erb deleted file mode 100644 index 0ed243c..0000000 --- a/apps/web/templates/application.html.erb +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - OmniScrapper HQ - - <%= favicon %> - <%= stylesheet 'application' %> - <%= javascript 'jsoneditor.min' %> - - - - - - <%= render partial: 'shared/navbar' %> - -
- <%= yield %> -
- - diff --git a/apps/web/templates/application.html.haml b/apps/web/templates/application.html.haml new file mode 100644 index 0000000..c9cac3f --- /dev/null +++ b/apps/web/templates/application.html.haml @@ -0,0 +1,14 @@ +!!! +%html + %head + %meta{:content => "text/html;charset=utf-8", "http-equiv" => "Content-Type"}/ + %meta{:content => "width=device-width, initial-scale=1, shrink-to-fit=no", :name => "viewport"}/ + %title OmniScrapper HQ + = favicon + = stylesheet 'application' + = javascript 'jsoneditor.min' + %script{:crossorigin => "anonymous", :src => "https://kit.fontawesome.com/d3179d38f0.js"} + %body + = render partial: 'shared/navbar' + .container + = yield diff --git a/apps/web/templates/outputs/create.html.erb b/apps/web/templates/outputs/create.html.haml similarity index 100% rename from apps/web/templates/outputs/create.html.erb rename to apps/web/templates/outputs/create.html.haml diff --git a/apps/web/templates/single_run/create.html.erb b/apps/web/templates/single_run/create.html.haml similarity index 100% rename from apps/web/templates/single_run/create.html.erb rename to apps/web/templates/single_run/create.html.haml From 27574cea42c695a2e9640bdc81e8a7080b1bf4c1 Mon Sep 17 00:00:00 2001 From: Roma S Date: Wed, 6 Nov 2019 23:54:53 +0300 Subject: [PATCH 2/2] Convert erb files to haml files --- apps/web/templates/application.html.erb | 21 ------------------- apps/web/templates/application.html.haml | 14 +++++++++++++ .../{create.html.erb => create.html.haml} | 0 .../{create.html.erb => create.html.haml} | 0 4 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 apps/web/templates/application.html.erb create mode 100644 apps/web/templates/application.html.haml rename apps/web/templates/outputs/{create.html.erb => create.html.haml} (100%) rename apps/web/templates/single_run/{create.html.erb => create.html.haml} (100%) diff --git a/apps/web/templates/application.html.erb b/apps/web/templates/application.html.erb deleted file mode 100644 index 8467b48..0000000 --- a/apps/web/templates/application.html.erb +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - OmniScrapper HQ - - <%= favicon %> - <%= stylesheet 'application' %> - - - - - - <%= render partial: 'shared/navbar' %> - -
- <%= yield %> -
- - diff --git a/apps/web/templates/application.html.haml b/apps/web/templates/application.html.haml new file mode 100644 index 0000000..c9cac3f --- /dev/null +++ b/apps/web/templates/application.html.haml @@ -0,0 +1,14 @@ +!!! +%html + %head + %meta{:content => "text/html;charset=utf-8", "http-equiv" => "Content-Type"}/ + %meta{:content => "width=device-width, initial-scale=1, shrink-to-fit=no", :name => "viewport"}/ + %title OmniScrapper HQ + = favicon + = stylesheet 'application' + = javascript 'jsoneditor.min' + %script{:crossorigin => "anonymous", :src => "https://kit.fontawesome.com/d3179d38f0.js"} + %body + = render partial: 'shared/navbar' + .container + = yield diff --git a/apps/web/templates/outputs/create.html.erb b/apps/web/templates/outputs/create.html.haml similarity index 100% rename from apps/web/templates/outputs/create.html.erb rename to apps/web/templates/outputs/create.html.haml diff --git a/apps/web/templates/single_run/create.html.erb b/apps/web/templates/single_run/create.html.haml similarity index 100% rename from apps/web/templates/single_run/create.html.erb rename to apps/web/templates/single_run/create.html.haml