From 4e742d170f76181b2d9f00cc2777aa684d63d7d7 Mon Sep 17 00:00:00 2001 From: James Mason Date: Thu, 26 Oct 2017 12:07:16 -0700 Subject: [PATCH] Only one collapsed menu on non-admin pages (cherry picked from commit 96ff845120e7a9c83d5d4c30908b283bb9449247) --- app/views/layouts/_admin_sidebar_index.html.haml | 2 +- app/views/layouts/_navigation.html.haml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_admin_sidebar_index.html.haml b/app/views/layouts/_admin_sidebar_index.html.haml index f828fe85..0283bf72 100644 --- a/app/views/layouts/_admin_sidebar_index.html.haml +++ b/app/views/layouts/_admin_sidebar_index.html.haml @@ -1,4 +1,4 @@ -%ul.nav.nav-pills.nav-stacked.mySidebar +%ul.nav.nav-stacked.nav-pills.mySidebar.collapse.navbar-collapse#side-nav .btn-group %button{type: 'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'} %span.fa.fa-home diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 4a59e69a..a480b5ed 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,7 +1,8 @@ .navbar.navbar-default.navbar-fixed-top.nav-osem{role: 'navigation'} .container .navbar-header - - if @conference && @conference.short_title.present? + + - if controller.class.name.split("::").first=="Admin" %button{ "data-target"=>"#side-nav", "data-toggle"=>"collapse", class: 'navbar-toggle side-nav-btn', type: 'button' } %span.sr-only Toggle navigation %span.icon-bar