diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 15d2c8c..f15dbc9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -296,7 +296,7 @@ module ApplicationHelper def partial_for_class(klass, prefix=nil, suffix=nil) raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil? name = klass.name.underscore - @controller.view_paths.each do |view_path| + controller.view_paths.each do |view_path| partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix) return partial if partial end diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb index b4cb507..313909e 100644 --- a/app/helpers/boxes_helper.rb +++ b/app/helpers/boxes_helper.rb @@ -1,7 +1,7 @@ module BoxesHelper def insert_boxes(content) - if controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?) + if controller.send(:boxes_editor?) && controller.send(:uses_design_blocks?) content + display_boxes_editor(controller.boxes_holder) else maybe_display_custom_element(controller.boxes_holder, :custom_header_expanded, :id => 'profile-header') + diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index 4a223a5..713de45 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -2,8 +2,8 @@ module LayoutHelper def body_classes # Identify the current controller and action for the CSS: - " controller-#{@controller.controller_name}" + - " action-#{@controller.controller_name}-#{@controller.action_name}" + + " controller-#{controller.controller_name}" + + " action-#{controller.controller_name}-#{controller.action_name}" + " template-#{profile.nil? ? "default" : profile.layout_template}" + (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "") end -- libgit2 0.21.2