X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3d0f9536c403711554621a8eba3d86321fcbd7cc..d8cf49f0d7f0006bb8b5ccb16d3d236069e6821a:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 23e3b34c5..5d61e8c63 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -94,24 +94,14 @@ module ApplicationHelper end def body_class - [ - params[:controller], - "#{params[:controller]}-#{params[:action]}", - "#{current_layout}-layout", - @extra_body_class - ].compact.join(" ") + if content_for? :body_class + content_for :body_class + else + "#{params[:controller]} #{params[:controller]}-#{params[:action]}" + end end def current_page_class(path) :current if current_page?(path) end - - def current_layout - layout = controller.send(:_layout) - if layout.instance_of? String - layout - else - File.basename(layout.identifier).split('.').first - end - end end