From 65cd2e2e1dfe7c971eeb46a4c9e04a9b2f401230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Fri, 9 Mar 2018 13:21:29 +0100 Subject: [PATCH] Load the custom.css that bypasses the asset pipeline on every screen Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1553353 --- app/views/dashboard/saml_login.html.haml | 1 + app/views/layouts/application.html.haml | 1 + app/views/layouts/login.html.haml | 1 + app/views/layouts/remote_console.html.haml | 1 + app/views/layouts/report_only.html.haml | 1 + 5 files changed, 5 insertions(+) diff --git a/app/views/dashboard/saml_login.html.haml b/app/views/dashboard/saml_login.html.haml index 8bb35cbd37b..d771cf170d0 100644 --- a/app/views/dashboard/saml_login.html.haml +++ b/app/views/dashboard/saml_login.html.haml @@ -2,6 +2,7 @@ %head = favicon_link_tag = stylesheet_link_tag 'application' + = stylesheet_link_tag '/custom.css' = javascript_include_tag 'application' %body diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ded331b0841..a17dcfd724d 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -10,6 +10,7 @@ = favicon_link_tag = stylesheet_link_tag 'application' + = stylesheet_link_tag '/custom.css' = render :partial => "stylesheets/template50" = javascript_include_tag 'application' - if Rails.env.development? diff --git a/app/views/layouts/login.html.haml b/app/views/layouts/login.html.haml index ecd49bb7ed2..1da31406e7b 100644 --- a/app/views/layouts/login.html.haml +++ b/app/views/layouts/login.html.haml @@ -5,6 +5,7 @@ = h productized_title(_(": Login")) = favicon_link_tag = stylesheet_link_tag 'application' + = stylesheet_link_tag '/custom.css' = javascript_include_tag 'application' - if Rails.env.development? = javascript_include_tag 'miq_debug' diff --git a/app/views/layouts/remote_console.html.haml b/app/views/layouts/remote_console.html.haml index 0bef2b14262..e55b15598a0 100644 --- a/app/views/layouts/remote_console.html.haml +++ b/app/views/layouts/remote_console.html.haml @@ -5,6 +5,7 @@ = _('%{product_name} HTML5 Remote Console') % {:product_name => Vmdb::Appliance.PRODUCT_NAME} = favicon_link_tag = stylesheet_link_tag 'application' + = stylesheet_link_tag '/custom.css' -# Load the required JS based on the console type = javascript_include_tag 'jquery', "remote_consoles/#{@console[:type]}", 'remote_console' %body diff --git a/app/views/layouts/report_only.html.haml b/app/views/layouts/report_only.html.haml index d1a97295a18..800fd5609c7 100644 --- a/app/views/layouts/report_only.html.haml +++ b/app/views/layouts/report_only.html.haml @@ -5,6 +5,7 @@ = "%{product}: %{title}" % {:product => Vmdb::Appliance.PRODUCT_NAME, :title => @report.title} = favicon_link_tag = stylesheet_link_tag 'application' + = stylesheet_link_tag '/custom.css' = javascript_include_tag 'application' - if Rails.env.development? = javascript_include_tag 'miq_debug'