Merge pull request #3114 from cprodhomme/extract-head-from-applicatio…

…n-html-haml-file extract head from application.html.haml
railsadminteam · Jul 21, 2019 · 498b23c · 498b23c
2 parents 39f9ecb + 2bb7651
commit 498b23c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/views/layouts/rails_admin/_head.html.haml b/app/views/layouts/rails_admin/_head.html.haml
@@ -0,0 +1,7 @@
+%meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
+%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
+%meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
+%meta{content: "NONE,NOARCHIVE", name: "robots"}
+= csrf_meta_tag
+= stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
+= javascript_include_tag "rails_admin/rails_admin.js"
diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
@@ -1,13 +1,7 @@
 !!! 5
 %html{lang: I18n.locale}
   %head
-    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
-    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-    %meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
-    %meta{content: "NONE,NOARCHIVE", name: "robots"}
-    = csrf_meta_tag
-    = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
-    = javascript_include_tag "rails_admin/rails_admin.js"
+    = render "layouts/rails_admin/head"
   %body.rails_admin
     #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
@@ -18,4 +12,5 @@
         .col-sm-3.col-md-2.sidebar-nav
           = render "layouts/rails_admin/sidebar_navigation"
         .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
-          .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
+          .content{:'data-pjax-container' => true}
+            = render template: 'layouts/rails_admin/pjax'