From fc5923f567f1567ae81f9a606b8f4fb35fc3cef9 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 29 Nov 2018 15:19:52 +0100 Subject: [PATCH] Minor - Fix menu links --- main/inc/lib/social.lib.php | 4 ++-- src/CoreBundle/Menu/LeftMenuBuilder.php | 30 +++++++++++-------------- src/CoreBundle/Menu/NavBuilder.php | 7 +++--- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index b033e0c521..702faaab4d 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -960,7 +960,7 @@ class SocialManager extends UserManager $itemMenu[1] = [ 'item' => get_lang('Messages').$count_unread_message, - 'url' => api_get_path(WEB_CODE_PATH).'social/inbox.php', + 'url' => api_get_path(WEB_CODE_PATH).'messages/inbox.php', 'icon' => $messagesIcon, 'active' => ($show == 'messages' ? 'active' : null), ]; @@ -1049,7 +1049,7 @@ class SocialManager extends UserManager $itemMenu[1] = [ 'item' => get_lang('Messages').$count_unread_message, - 'url' => api_get_path(WEB_CODE_PATH).'social/inbox.php', + 'url' => api_get_path(WEB_CODE_PATH).'messages/inbox.php', 'icon' => $messagesIcon, 'active' => ($show == 'messages' ? 'active' : null), ]; diff --git a/src/CoreBundle/Menu/LeftMenuBuilder.php b/src/CoreBundle/Menu/LeftMenuBuilder.php index 875c07cbcd..739425095a 100644 --- a/src/CoreBundle/Menu/LeftMenuBuilder.php +++ b/src/CoreBundle/Menu/LeftMenuBuilder.php @@ -46,7 +46,7 @@ class LeftMenuBuilder implements ContainerAwareInterface return $menu; if (api_is_allowed_to_create_course()) { - $lang = $translator->trans('CreateCourse'); + $lang = $translator->trans('Create course'); if ($settingsManager->getSetting('course.course_validation') == 'true') { $lang = $translator->trans('CreateCourseRequest'); } @@ -122,7 +122,7 @@ class LeftMenuBuilder implements ContainerAwareInterface $menu->setChildrenAttribute('class', 'nav nav-pills nav-stacked'); $menu->addChild( - $translator->trans('MySessions'), + $translator->trans('My sessions'), [ 'route' => 'userportal', 'routeParameters' => ['type' => 'sessions'], @@ -131,7 +131,7 @@ class LeftMenuBuilder implements ContainerAwareInterface if ($checker->isGranted('ROLE_ADMIN')) { $menu->addChild( - $translator->trans('AddSession'), + $translator->trans('Add a training session'), [ 'route' => 'legacy_main', 'routeParameters' => ['name' => 'session/session_add.php'], @@ -179,7 +179,7 @@ class LeftMenuBuilder implements ContainerAwareInterface ); $menu->addChild( - $translator->trans('PendingInvitations'), + $translator->trans('Pending invitations'), [ 'route' => 'legacy_main', 'routeParameters' => [ @@ -189,7 +189,7 @@ class LeftMenuBuilder implements ContainerAwareInterface ); $menu->addChild( - $translator->trans('MyFiles'), + $translator->trans('My files'), [ 'route' => 'legacy_main', 'routeParameters' => [ @@ -199,7 +199,7 @@ class LeftMenuBuilder implements ContainerAwareInterface ); $menu->addChild( - $translator->trans('EditProfile'), + $translator->trans('Edit profile'), [ 'route' => 'legacy_main', 'routeParameters' => [ @@ -277,7 +277,7 @@ class LeftMenuBuilder implements ContainerAwareInterface ); $menu->addChild( - $translator->trans('ViewMySharedProfile'), + $translator->trans('My shared profile'), [ 'route' => 'legacy_main', 'routeParameters' => [ @@ -297,7 +297,7 @@ class LeftMenuBuilder implements ContainerAwareInterface ); $menu->addChild( - $translator->trans('SocialGroups'), + $translator->trans('Social groups'), [ 'route' => 'legacy_main', 'routeParameters' => [ @@ -317,7 +317,7 @@ class LeftMenuBuilder implements ContainerAwareInterface ); $menu->addChild( - $translator->trans('MyFiles'), + $translator->trans('My files'), [ 'route' => 'legacy_main', 'routeParameters' => [ @@ -344,14 +344,14 @@ class LeftMenuBuilder implements ContainerAwareInterface $translator = $this->container->get('translator'); $settingsManager = $this->container->get('chamilo.settings.manager'); $allow = $settingsManager->getSetting('certificate.hide_my_certificate_link'); - $menu = $factory->createItem('root'); + if ($checker->isGranted('IS_AUTHENTICATED_FULLY')) { $menu->setChildrenAttribute('class', 'nav nav-pills nav-stacked'); - if ($allow == false) { + if ('false' === $allow) { $menu->addChild( - $translator->trans('MyCertificates'), + $translator->trans('My certificates'), [ 'route' => 'legacy_main', 'routeParameters' => ['name' => 'gradebook/my_certificates.php'], @@ -359,10 +359,7 @@ class LeftMenuBuilder implements ContainerAwareInterface ); } - if ($settingsManager->getSetting( - 'allow_public_certificates' - ) === 'true' - ) { + if ($settingsManager->getSetting('allow_public_certificates') === 'true') { $menu->addChild( $translator->trans('Search'), [ @@ -433,7 +430,6 @@ class LeftMenuBuilder implements ContainerAwareInterface 'FOSUserBundle' ), [ - //'route' => 'fos_user_resetting_request', 'route' => 'legacy_main', 'routeParameters' => ['name' => 'auth/lostPassword.php'], ['attributes' => ['id' => 'nav']], diff --git a/src/CoreBundle/Menu/NavBuilder.php b/src/CoreBundle/Menu/NavBuilder.php index f87352e3a7..86cf117fa5 100644 --- a/src/CoreBundle/Menu/NavBuilder.php +++ b/src/CoreBundle/Menu/NavBuilder.php @@ -62,9 +62,10 @@ class NavBuilder implements ContainerAwareInterface $container = $this->container; $checker = $container->get('security.authorization_checker'); $translator = $container->get('translator'); + $router = $container->get('router'); $menu = $factory->createItem('root'); $settingsManager = $container->get('chamilo.settings.manager'); - //$router = $this->container->get('router'); + $rootWeb = $router->generate('legacy_index'); $menu->addChild( 'home', @@ -286,8 +287,7 @@ class NavBuilder implements ContainerAwareInterface 'settings', [ 'label' => $translator->trans('Advanced settings'), - 'route' => 'chamilo_platform_settings', - 'routeParameters' => ['namespace' => 'platform'], + 'uri' => $rootWeb.'public/admin/settings/platform', ] ); } @@ -321,6 +321,7 @@ class NavBuilder implements ContainerAwareInterface 'enabled' => true, ]); + // Needed when loading legacy pages (inside main) $isLegacy = $container->get('request_stack')->getCurrentRequest()->get('load_legacy'); $urlAppend = $container->getParameter('url_append'); $legacyIndex = '';