From d0a961099261fbb6ed0569957caf5e87eddcdb66 Mon Sep 17 00:00:00 2001
From: nikhilgupta1211 <nikeythe@gmail.com>
Date: Sun, 20 Aug 2017 16:27:35 +0530
Subject: [PATCH] Made Sidebar collapsible for small screens

Added a hamburger button in _admin_html.haml for navbar collapse

Fixes #853
---
 app/assets/stylesheets/osem.css.scss       |  6 ++++++
 app/views/layouts/_admin_sidebar.html.haml |  2 +-
 app/views/layouts/_navigation.html.haml    | 10 ++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/osem.css.scss b/app/assets/stylesheets/osem.css.scss
index 5a331436..775418b3 100644
--- a/app/assets/stylesheets/osem.css.scss
+++ b/app/assets/stylesheets/osem.css.scss
@@ -94,3 +94,9 @@ p.comment-body {
 .box{
   height: 230px;
 }
+
+/* sidebar hamburger btn */
+.side-nav-btn{
+ margin-left: 10px;
+ float: left;
+}
diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml
index 1c7bac9a..28ef62e2 100644
--- a/app/views/layouts/_admin_sidebar.html.haml
+++ b/app/views/layouts/_admin_sidebar.html.haml
@@ -1,4 +1,4 @@
-%ul.nav.nav-stacked.nav-pills.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-cog
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 9750be92..9995123b 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,7 +1,13 @@
 .navbar.navbar-default.navbar-fixed-top.nav-osem{role: 'navigation'}
   .container
     .navbar-header
-      %button{"data-target"=>".navbar-collapse", "data-toggle"=>"collapse", class: 'navbar-toggle', type: 'button'}
+      - if @conference && @conference.short_title.present?
+        %button{ "data-target"=>"#side-nav", "data-toggle"=>"collapse", class: 'navbar-toggle side-nav-btn', type: 'button' }
+          %span.sr-only Toggle navigation
+          %span.icon-bar
+          %span.icon-bar
+          %span.icon-bar
+      %button{"data-target"=>"#main-nav", "data-toggle"=>"collapse", class: 'navbar-toggle', type: 'button'}
         %span.sr-only
           Toggle navigation
         %span.icon-bar
@@ -11,7 +17,7 @@
         = link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager'
       - else
         = link_to conference.organization.name, organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager'
-    .collapse.navbar-collapse
+    .collapse.navbar-collapse#main-nav
       - if content_for :splash_nav
         %ul.nav.navbar-nav#splash-nav
           = content_for :splash_nav