From f0a90c4bc27364ce8feda4fe56ee9a77026ca3cb Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 23 Jan 2018 19:54:28 +0200 Subject: [PATCH] Convert HAML to ERB --- app/views/layouts/registrar/base.haml | 44 ---------------- app/views/layouts/registrar/base.html.erb | 64 +++++++++++++++++++++++ 2 files changed, 64 insertions(+), 44 deletions(-) delete mode 100644 app/views/layouts/registrar/base.haml create mode 100644 app/views/layouts/registrar/base.html.erb diff --git a/app/views/layouts/registrar/base.haml b/app/views/layouts/registrar/base.haml deleted file mode 100644 index c3e30d90f..000000000 --- a/app/views/layouts/registrar/base.haml +++ /dev/null @@ -1,44 +0,0 @@ -!!! 5 -%html{lang: I18n.locale.to_s} - %head - %meta{charset: "utf-8"}/ - %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/ - %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/ - - if content_for? :head_title - = yield :head_title - - else - %title= t(:registrar_head_title) - = csrf_meta_tags - = stylesheet_link_tag 'registrar-manifest', media: 'all' - = javascript_include_tag 'registrar-manifest' - = favicon_link_tag 'favicon.ico' - %body - %nav.navbar.navbar-default.navbar-fixed-top - .container - .navbar-header - %button.navbar-toggle.collapsed{"aria-controls" => "navbar", "aria-expanded" => "false", "data-target" => "#navbar", "data-toggle" => "collapse", :type => "button"} - %span.sr-only Toggle navigation - %span.icon-bar - %span.icon-bar - %span.icon-bar - = link_to registrar_root_path, class: 'navbar-brand' do - = t(:registrar_head_title) - - if unstable_env.present? - .text-center - %small{style: 'color: #0074B3;'}= unstable_env - = render 'navbar' - - .container - = render 'shared/flash' - - if depp_controller? - = render 'registrar/shared/epp_results' - = yield - - %footer.footer - .container - .row - .col-md-6 - = image_tag 'eis-logo-et.png' - .col-md-6.text-right - Version - = CURRENT_COMMIT_HASH diff --git a/app/views/layouts/registrar/base.html.erb b/app/views/layouts/registrar/base.html.erb new file mode 100644 index 000000000..fcbaaa21e --- /dev/null +++ b/app/views/layouts/registrar/base.html.erb @@ -0,0 +1,64 @@ + + + + + + + <% if content_for? :head_title %> + <%= yield :head_title %> + <% else %> + + <%= t(:registrar_head_title) %> + + <% end %> + <%= csrf_meta_tags %> + <%= stylesheet_link_tag 'registrar-manifest', media: 'all' %> + <%= javascript_include_tag 'registrar-manifest' %> + <%= favicon_link_tag 'favicon.ico' %> + + + +
+ <%= render 'shared/flash' %> + <% if depp_controller? %> + <%= render 'registrar/shared/epp_results' %> + <% end %> + <%= yield %> +
+ + +