gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only one collapsed menu on non-admin pages

Browse source 
(cherry picked from commit 96ff845120e7a9c83d5d4c30908b283bb9449247)
This commit is contained in:
James Mason 2017-10-26 12:07:16 -07:00
parent 4ecf078db6
commit 4e742d170f
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_admin_sidebar_index.html.haml
View file

@ -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 .btn-group
%button{type: 'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'} %button{type: 'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
%span.fa.fa-home %span.fa.fa-home

3
app/views/layouts/_navigation.html.haml
View file

@ -1,7 +1,8 @@
.navbar.navbar-default.navbar-fixed-top.nav-osem{role: 'navigation'} .navbar.navbar-default.navbar-fixed-top.nav-osem{role: 'navigation'}
.container .container
.navbar-header .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' } %button{ "data-target"=>"#side-nav", "data-toggle"=>"collapse", class: 'navbar-toggle side-nav-btn', type: 'button' }
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
%span.icon-bar %span.icon-bar