diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 9019323..96043a2 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -544,3 +544,21 @@ cursor:pointer color: #82827d; text-decoration: none; } } } +#sidebar{ + width:300px; + padding:30px 20px; + float:left; + +} + +#body{ + + &.with_sidebar{ + margin-left:340px; + } + +} + + + + diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 0a8f984..f72d2c8 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -73,45 +73,39 @@ - -if @menu_item and @menu_item.id != 1 - -if @menu_item.ancestors.reverse[0] - -menu_title = @menu_item.ancestors.reverse[0] + -if @menu_item + -if @menu_item.parent_id + -if @menu_item.ancestors.reverse[0] + -first_level_menu = @menu_item.ancestors.reverse[0] + -else - -menu_title = @menu_item - - .menu_item_top_menu_container - %div{:style => "overflow:hidden;width:100%;"} - #menu_item_top_menu.menu_item_title - - -if @menu_item - -if @menu_item.parent_id - -if @menu_item.ancestors.reverse[0] - -first_level_menu = @menu_item.ancestors.reverse[0] + -first_level_menu = @menu_item - -else + -if first_level_menu.children.size > 0 + #sidebar + #menu_left.widget + %h3=menu_item_link(first_level_menu) + + + + %ul + -first_level_menu.children.order(:position).each do |menu_item| - -first_level_menu = @menu_item - - -if first_level_menu.children.size > 0 - - .sub_menu_bar_container - .sub_menu_bar - %ul - -first_level_menu.children.order(:position).each do |menu_item| - - %li - -if @ancestor_1 - -if @ancestor_1 == menu_item - =menu_item_link(menu_item, true) - -else - =menu_item_link(menu_item, false) - -else - =menu_item_link(menu_item) + %li + -if @ancestor_1 + -if @ancestor_1 == menu_item + =menu_item_link(menu_item, true) + -else + =menu_item_link(menu_item, false) + -else + =menu_item_link(menu_item) + + - #body=yield - + #body{:class => ("with_sidebar" if first_level_menu.children.size > 0)}=yield + .clear -if @menu_item and @menu_item.id == 1 diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index 849417f..03dd0e9 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -8,6 +8,11 @@ -content_for :corps do + + + + + -if @menu_item.title_image -img_url = @menu_item.image_file.file.large.url if @menu_item.image_file -if img_url