diff --git a/resources/views/widgets/menu.blade.php b/resources/views/widgets/menu.blade.php index 196ef5d4..26c7cdfc 100755 --- a/resources/views/widgets/menu.blade.php +++ b/resources/views/widgets/menu.blade.php @@ -1,7 +1,24 @@ 0) { + foreach ($submenus as $subitem) { + if (isActive($subitem->link, $subitem->submenu)) { + return true; + } + } + } + + if($link == "#") { + return false; + } + + if ($link == "/") { + return $_SERVER["REQUEST_URI"] == "/" || $_SERVER["REQUEST_URI"] == ""; + } + + return (substr($_SERVER["REQUEST_URI"], 0, strlen($link)) == $link); } function buildMenu($menu, $ismobile) @@ -13,7 +30,7 @@ function buildMenu($menu, $ismobile) } $submenu = count($item->submenu) > 0; - $isactive = isActive($item->link, !$ismobile); + $isactive = isActive($item->link, $ismobile ? [] : $item->submenu); $icon = ""; $isplayer = false; $isFile = false; @@ -52,7 +69,7 @@ function buildMenu($menu, $ismobile) . buildMenu($item->submenu, $ismobile) . "\t\t\t\n"; } - $result .= "\t\t\n"; + $result .= "\t\t\n"; } return $result; @@ -61,7 +78,7 @@ function buildMenu($menu, $ismobile)