Skip to content

Commit 62e5273

Browse files
committed
Merge pull request #3 from workgena/sidebar_classes
Separate the logic for sidebar main_content_classes
2 parents a20e62e + 17b0500 commit 62e5273

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

lib/active_admin_sidebar/activeadmin_views_pages_base.rb

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,13 @@ class ActiveAdmin::Views::Pages::Base < Arbre::HTML::Document
22

33
def build_page_content
44
build_flash_messages
5-
classes = Arbre::HTML::ClassList.new
6-
7-
if skip_sidebar?
8-
classes << 'without_sidebar'
9-
else
10-
classes << 'with_sidebar'
11-
classes << 'left_sidebar' if left_sidebar?
12-
end
13-
14-
15-
16-
div :id => "active_admin_content", :class => classes do
17-
5+
div id: "active_admin_content", class: main_content_classes do
186
build_sidebar unless skip_sidebar? || right_sidebar?
197
build_main_content_wrapper
208
build_sidebar unless skip_sidebar? || left_sidebar?
21-
229
end
2310
end
2411

25-
2612
def left_sidebar?
2713
assigns[:sidebar_position] == :left
2814
end
@@ -31,6 +17,15 @@ def right_sidebar?
3117
!left_sidebar?
3218
end
3319

20+
def main_content_classes
21+
classes = Arbre::HTML::ClassList.new
22+
if skip_sidebar?
23+
classes << 'without_sidebar'
24+
else
25+
classes << 'with_sidebar'
26+
classes << 'left_sidebar' if left_sidebar?
27+
end
28+
classes
29+
end
3430

35-
36-
end
31+
end

0 commit comments

Comments
 (0)