From c62a374ebdcc4e25f8bdb5510f10ddb6e10629f9 Mon Sep 17 00:00:00 2001 From: Simon Williams Date: Tue, 2 Oct 2012 13:19:07 -0600 Subject: [PATCH] fix banner inception don't include fixed bottom bar warnings on pages that have been loaded into iframes and have set @body_class_no_headers. currently these are only used in test environments. test plan: - in a test environment, go to speedgrader to an assignment with submission previews - you should have the "test environment" warning along the bottom of the page, but it should not be duplicated inside of the preview area. Change-Id: I9a8c7162cd2480e5fe17e90079cce8ecd9ca721c Reviewed-on: https://gerrit.instructure.com/14096 Tested-by: Jenkins Reviewed-by: Jon Jensen --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1a85976af14..11540107f6c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@ content_for :pre_html do @body_class_no_headers = @headers == false - @show_fixed_bottom = @fixed_warnings.present? || (@real_current_user && @real_current_user != @current_user && (!@body_class_no_headers || @outer_frame)) + @show_fixed_bottom = (@fixed_warnings.present? || (@real_current_user && @real_current_user != @current_user)) && (!@body_class_no_headers || @outer_frame) @body_classes << "no-headers" if @body_class_no_headers unless (@body_classes.include? "no-headers") || (@show_left_side == false) left_side = yield :left_side