Skip to content

Commit 498b23c

Browse files
authored
Merge pull request #3114 from cprodhomme/extract-head-from-application-html-haml-file
extract head from application.html.haml
2 parents 39f9ecb + 2bb7651 commit 498b23c

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
%meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
2+
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
3+
%meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
4+
%meta{content: "NONE,NOARCHIVE", name: "robots"}
5+
= csrf_meta_tag
6+
= stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
7+
= javascript_include_tag "rails_admin/rails_admin.js"
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
!!! 5
22
%html{lang: I18n.locale}
33
%head
4-
%meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
5-
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
6-
%meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
7-
%meta{content: "NONE,NOARCHIVE", name: "robots"}
8-
= csrf_meta_tag
9-
= stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
10-
= javascript_include_tag "rails_admin/rails_admin.js"
4+
= render "layouts/rails_admin/head"
115
%body.rails_admin
126
#admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
137
#loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
@@ -18,4 +12,5 @@
1812
.col-sm-3.col-md-2.sidebar-nav
1913
= render "layouts/rails_admin/sidebar_navigation"
2014
.col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
21-
.content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
15+
.content{:'data-pjax-container' => true}
16+
= render template: 'layouts/rails_admin/pjax'

0 commit comments

Comments
 (0)