DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #472 from sgmap/fix_turbolinks_multiple_layout_bug

Browse source 
Fix turbolinks multiple layouts bug
This commit is contained in:
Mathieu Magnin 2017-06-21 15:04:53 +02:00 committed by GitHub
commit 0084d836dd
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/layouts/application.html.haml
View file

@ -10,8 +10,8 @@
= favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32") = favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96") = favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96")
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => "reload"
= stylesheet_link_tag 'print', media: 'print', 'data-turbolinks-track' => true = stylesheet_link_tag 'print', media: 'print', 'data-turbolinks-track' => "reload"
= javascript_include_tag 'application', 'data-turbolinks-track' => true = javascript_include_tag 'application', 'data-turbolinks-track' => true
= csrf_meta_tags = csrf_meta_tags

20
app/views/layouts/new_application.html.haml
View file

@ -1,8 +1,8 @@
%html %html
%head %head
%meta{ "http-equiv" => "Content-Type", :content => "text/html; charset=UTF-8" } %meta{ "http-equiv": "Content-Type", content: "text/html; charset=UTF-8" }
%meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge" } %meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ :name => "turbolinks-cache-control", :content => "no-cache" } %meta{ name: "turbolinks-cache-control", content: "no-cache" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" } %meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
= csrf_meta_tags = csrf_meta_tags
= action_cable_meta_tag = action_cable_meta_tag
@ -14,12 +14,12 @@
= favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32") = favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96") = favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96")
= stylesheet_link_tag "new_design/new_application", :media => "all", "data-turbolinks-track" => true = stylesheet_link_tag "new_design/new_application", media: "all", "data-turbolinks-track": "reload"
= stylesheet_link_tag "print", :media => "print", "data-turbolinks-track" => true = stylesheet_link_tag "print", media: "print", "data-turbolinks-track": true
%body %body
= render :partial => "layouts/support_navigator_banner" = render partial: "layouts/support_navigator_banner"
= render :partial => "layouts/ie_lt_10" = render partial: "layouts/ie_lt_10"
#beta{ class:(Rails.env == "production" ? "" : "beta_staging") } #beta{ class:(Rails.env == "production" ? "" : "beta_staging") }
- if Rails.env == "production" - if Rails.env == "production"
Beta Beta
@ -30,14 +30,14 @@
= render partial: "layouts/flash_messages" = render partial: "layouts/flash_messages"
= yield = yield
= render :partial => "layouts/switch_devise_profile_module" = render partial: "layouts/switch_devise_profile_module"
= render partial: "layouts/new_footer" = render partial: "layouts/new_footer"
= render partial: "layouts/google_analytics" = render partial: "layouts/google_analytics"
= render partial: "layouts/mailjet_newsletter" = render partial: "layouts/mailjet_newsletter"
= javascript_include_tag "application", "data-turbolinks-track" => true = javascript_include_tag "application", "data-turbolinks-track": true
= yield :charts_js = yield :charts_js
- if Rails.env == "test" - if Rails.env == "test"
%script{ :type => "text/javascript" } %script{ type: "text/javascript" }
(typeof jQuery !== "undefined") && (jQuery.fx.off = true); (typeof jQuery !== "undefined") && (jQuery.fx.off = true);