From 9bf7dccb64baaf5b0bc61c0223e3fa880a273ec7 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Fri, 23 Feb 2018 16:51:50 +0800
Subject: [PATCH] Fix generating sidebar

---
 app/helpers.php                          | 8 +++++---
 resources/assets/src/js/common/layout.js | 2 --
 resources/views/admin/master.tpl         | 2 +-
 resources/views/user/master.tpl          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index f6fa616c..50e1a637 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -166,16 +166,18 @@ if (! function_exists('bs_menu')) {
             }
 
             $classes = [];
-            $active ? ($classes[] = 'active') : null;
+            $active ? ($classes[] = 'active menu-open') : null;
             isset($value['children']) ? ($classes[] = 'treeview') : null;
 
-            $content .= sprintf('<li class="%s">', implode(' ', $classes));
+            $attr = count($classes) ? sprintf(' class="%s"', implode(' ', $classes)) : '';
+
+            $content .= "<li{$attr}>";
 
             if (isset($value['children'])) {
                 $content .= sprintf('<a href="#"><i class="fa %s"></i> <span>%s</span><span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a>', $value['icon'], trans($value['title']));
 
                 // recurse
-                $content .= '<ul class="treeview-menu" style="display: none;">'.bs_menu_render($value['children']).'</ul>';
+                $content .= '<ul class="treeview-menu">'.bs_menu_render($value['children']).'</ul>';
             } else {
                 $content .= sprintf('<a href="%s"><i class="fa %s"></i> <span>%s</span></a>', url($value['link']), $value['icon'], trans($value['title']));
             }
diff --git a/resources/assets/src/js/common/layout.js b/resources/assets/src/js/common/layout.js
index 67b632e1..886b725a 100644
--- a/resources/assets/src/js/common/layout.js
+++ b/resources/assets/src/js/common/layout.js
@@ -12,8 +12,6 @@ $.defaultPaginatorConfig = {
 };
 
 $(document).ready(() => {
-    $('li.active > ul').show();
-
     $('input').iCheck({
         radioClass: 'iradio_square-blue',
         checkboxClass: 'icheckbox_square-blue'
diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl
index 12ed64bf..d229a352 100644
--- a/resources/views/admin/master.tpl
+++ b/resources/views/admin/master.tpl
@@ -63,7 +63,7 @@
                 </div>
 
                 <!-- Sidebar Menu -->
-                <ul class="sidebar-menu">
+                <ul class="sidebar-menu tree" data-widget="tree">
                     <li class="header">{{ trans('general.admin-panel') }}</li>
                     {!! bs_menu('admin') !!}
 
diff --git a/resources/views/user/master.tpl b/resources/views/user/master.tpl
index 3766badf..7f681b44 100644
--- a/resources/views/user/master.tpl
+++ b/resources/views/user/master.tpl
@@ -61,7 +61,7 @@
                 </div>
 
                 <!-- Sidebar Menu -->
-                <ul class="sidebar-menu" data-widget="tree">
+                <ul class="sidebar-menu tree" data-widget="tree">
                     <li class="header">{{ trans('general.user-center') }}</li>
                     {!! bs_menu('user') !!}