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('
  • ', implode(' ', $classes)); + $attr = count($classes) ? sprintf(' class="%s"', implode(' ', $classes)) : ''; + + $content .= ""; if (isset($value['children'])) { $content .= sprintf(' %s', $value['icon'], trans($value['title'])); // recurse - $content .= ''; + $content .= ''; } else { $content .= sprintf(' %s', 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 @@ -