diff --git a/app/config/assetic.yml b/app/config/assetic.yml index b3c5f490f1..2e97421bc4 100755 --- a/app/config/assetic.yml +++ b/app/config/assetic.yml @@ -138,12 +138,9 @@ assetic: - %kernel.root_dir%/../web/bundles/sonataadmin/vendor/bootstrap/dist/css/bootstrap.min.css - %kernel.root_dir%/../web/bundles/sonatacore/select2/select2.css - %kernel.root_dir%/../web/bundles/mopabootstrap/css/datepicker.css - - %kernel.root_dir%/../web/bundles/sonatademo/css/demo.css + #- %kernel.root_dir%/../web/bundles/sonatademo/css/demo.css filters: - cssrewrite - yui_css - common_js: - inputs: - - %kernel.root_dir%/../web/bundles/admin-theme-bundle/vendor/jquery/dist/jquery.js - - %kernel.root_dir%/../web/bundles/admin-theme-bundle/vendor/jquery-ui/ui/jquery-ui.js + diff --git a/app/config/sonata/sonata_admin.yml b/app/config/sonata/sonata_admin.yml index 1754bd0244..08f677847a 100644 --- a/app/config/sonata/sonata_admin.yml +++ b/app/config/sonata/sonata_admin.yml @@ -103,7 +103,7 @@ sonata_admin: - assetic/sonata_admin_css.css - assetic/sonata_formatter_css.css - assetic/sonata_jqueryui_css.css - - bundles/sonatademo/css/demo.css + #- bundles/sonatademo/css/demo.css - bundles/sonataformatter/markitup/skins/sonata/style.css - bundles/sonataformatter/markitup/sets/markdown/style.css diff --git a/src/ChamiloLMS/CoreBundle/EventListener/MenuListener.php b/src/ChamiloLMS/CoreBundle/EventListener/MenuListener.php index 1b0c9a7a93..b51d7ba15e 100644 --- a/src/ChamiloLMS/CoreBundle/EventListener/MenuListener.php +++ b/src/ChamiloLMS/CoreBundle/EventListener/MenuListener.php @@ -12,11 +12,17 @@ class MenuListener { protected $container; + /** + * @param ContainerInterface $container + */ public function __construct(ContainerInterface $container) { $this->container = $container; } + /** + * @param SidebarMenuKnpEvent $event + */ public function onSetupMenu(SidebarMenuKnpEvent $event) { $request = $event->getRequest(); @@ -26,6 +32,10 @@ class MenuListener } } + /** + * @param Request $request + * @return mixed + */ protected function getMenu(Request $request) { $menu = $this->container->get('chamilolms.menu.simple_menu'); @@ -39,8 +49,14 @@ class MenuListener return $this->activateByRoute($request->get('_route'), $menuItems); } + /** + * @param $route + * @param $items + * @return mixed + */ protected function activateByRoute($route, $items) { + /** @var \Knp\Menu\MenuItem $item */ foreach ($items as $item) { if ($item->hasChildren()) {