Fix merge

Victor Costa
1 parent 61044cca
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
app/helpers/layout_helper.rb
@@ -2,6 +2,7 @@ module LayoutHelper
  
   def body_classes
     # Identify the current controller and action for the CSS:
+    (logged_in? ? " logged-in" : "") +
     " controller-#{controller.controller_name}" +
     " action-#{controller.controller_name}-#{controller.action_name}" +
     " template-#{@layout_template || if profile.blank? then 'default' else profile.layout_template end}" +
...	...	@@ -2,6 +2,7 @@ module LayoutHelper
2	2
3	3	def body_classes
4	4	# Identify the current controller and action for the CSS:
	5	+ (logged_in? ? " logged-in" : "") +
5	6	" controller-#{controller.controller_name}" +
6	7	" action-#{controller.controller_name}-#{controller.action_name}" +
7	8	" template-#{@layout_template \|\| if profile.blank? then 'default' else profile.layout_template end}" +
...	...