From a7da7f4a5865ce8065716d7f59a85d808e8a226f Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 31 Aug 2017 17:49:53 +0200 Subject: [PATCH] suite --- app/assets/stylesheets/public.scss | 10 +++- app/views/public/menu_items/show.html.haml | 62 ++++++++++++++++++++-- 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index feec0a9..faa3798 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -8,6 +8,12 @@ //@import "fontawesome/font-awesome"; +@media (min-width: 992px){ +.mobile_only{ + display:none; +} + +} body{ img{ @@ -88,8 +94,8 @@ font-size:1.2em; #large{ - width:1020px; - max-width:1200px; + width:100%; + max-width:1020px; margin:auto; padding:20px; padding-top:10px; diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index e6b3014..a4466a6 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -1,20 +1,72 @@ --content_for :sidebar do +-if (@menu_item and @menu_item.sidebar) or !@menu_item + + + + -content_for :sidebar do + + -if @menu_item.parent_id + -if @menu_item.ancestors.reverse[0] + -first_level_menu = @menu_item.ancestors.reverse[0] + + -else + + -first_level_menu = @menu_item + + -#if first_level_menu.children.size > 0 + -if first_level_menu.children.count > 0 + .square.green + %h3=menu_item_link(first_level_menu) + %ul + -first_level_menu.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| + + %li + =menu_item_link(menu_item) + -if menu_item.children.where(:enabled => true, :visible => true).size > 0 + %ul + -menu_item.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| + %li=menu_item_link(menu_item) + + + .mobile_only + -if @menu_item.parent_id + -if @menu_item.ancestors.reverse[0] + -first_level_menu = @menu_item.ancestors.reverse[0] + + -else + + -first_level_menu = @menu_item + + -#if first_level_menu.children.size > 0 + -if first_level_menu.children.count > 0 + .square.green + %h3=menu_item_link(first_level_menu) + %ul + -first_level_menu.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| + + %li + =menu_item_link(menu_item) + -if menu_item.children.where(:enabled => true, :visible => true).size > 0 + %ul + -menu_item.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| + %li=menu_item_link(menu_item) + +-else -if @menu_item.parent_id -if @menu_item.ancestors.reverse[0] -first_level_menu = @menu_item.ancestors.reverse[0] - + -else - + -first_level_menu = @menu_item - + -#if first_level_menu.children.size > 0 -if first_level_menu.children.count > 0 .square.green %h3=menu_item_link(first_level_menu) %ul -first_level_menu.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| - + %li =menu_item_link(menu_item) -if menu_item.children.where(:enabled => true, :visible => true).size > 0