Fixing chamilo menu and adding SuperAdmin frop legacy to new symfony2 app

src/Chamilo/CoreBundle/EventListener/LegacyLoginListener.php

@@ -56,10 +56,16 @@ class LegacyLoginListener implements EventSubscriberInterface
                         /** @var User $user */
                         $user = $this->container->get('sonata.user.user_manager')->findOneBy($criteria);
                         if ($user) {
+                            $em = $this->container->get('doctrine');
                             /** @var User $completeUser */
-                            $completeUser = $this->container->get('doctrine')->getRepository('ChamiloUserBundle:User')->findOneBy($criteria);
+                            $completeUser = $em->getRepository('ChamiloUserBundle:User')->findOneBy($criteria);
                             $user->setLanguage($completeUser->getLanguage());
 
+                            $isAdminUser = $em->getRepository('ChamiloCoreBundle:Admin')->findOneBy(['userId' => $user->getId()]);
+                            if ($isAdminUser) {
+                                $user->setSuperAdmin(true);
+                            }
+
                             $languages = ['german' => 'de', 'english' => 'en', 'spanish' => 'es', 'french' => 'fr'];
 
                             if ($user && isset($languages[$user->getLanguage()])) {

src/Chamilo/CoreBundle/Menu/NavBuilder.php

@@ -71,9 +71,9 @@ class NavBuilder extends ContainerAware
                 $translator->trans('My courses'),
                 array('route' => 'userportal')
             );
-            /*
+
             $menu->addChild(
-                $translator->trans('Calendar'),
+                $translator->trans('Personal agenda'),
                 array(
                     'route' => 'main',
                     'routeParameters' => array(
@@ -93,7 +93,7 @@ class NavBuilder extends ContainerAware
             );
 
             $menu->addChild(
-                $translator->trans('Social'),
+                $translator->trans('Social network'),
                 array(
                     'route' => 'main',
                     'routeParameters' => array(
@@ -102,24 +102,28 @@ class NavBuilder extends ContainerAware
                 )
             );
 
-            $menu->addChild(
-                $translator->trans('Dashboard'),
-                array(
-                    'route' => 'main',
-                    'routeParameters' => array(
-                        'name' => 'dashboard/index.php',
-                    ),
-                )
-            );
-
             if ($checker->isGranted('ROLE_ADMIN')) {
+
+                $menu->addChild(
+                    $translator->trans('Dashboard'),
+                    array(
+                        'route' => 'main',
+                        'routeParameters' => array(
+                            'name' => 'dashboard/index.php',
+                        ),
+                    )
+                );
+
                 $menu->addChild(
                     $translator->trans('Administration'),
                     array(
-                        'route' => 'administration',
+                        'route' => 'main',
+                        'routeParameters' => array(
+                            'name' => 'social/home.php',
+                        )
                     )
                 );
-            }*/
+            }
         }
 
         // Getting site information
@@ -178,7 +182,6 @@ class NavBuilder extends ContainerAware
                         )
                     )->setAttribute('divider_append', true);
                 }
-
             }
         }
 
@@ -229,12 +232,12 @@ class NavBuilder extends ContainerAware
                 array(
                     'route' => 'main',
                     'routeParameters' => array(
-                        'name' => '../../../index.php',
+                        'name' => '../index.php',
                         'logout' => 'logout',
                         'uid' => $user->getId(),
-
                     ),
                     'query' => '1',
+                    'icon' => 'fa fa-sign-out'
                 )
             );
 

src/Chamilo/CoreBundle/Resources/config/routing.yml

@@ -29,7 +29,7 @@
 
 # Legacy routes
 main:
-    path: /main/{name}
+    path: ../../main/{name}
     defaults: { _controller: ChamiloCoreBundle:Legacy:classic }
     requirements:
       name: .+

src/Chamilo/CoreBundle/Resources/translations/messages.fr.po

@@ -10,5 +10,27 @@ msgstr "Boîte de réception"
 msgid "Logout"
 msgstr "Quitter"
 
+msgid "Personal agenda"
+msgstr "Agenda perso"
+
+msgid "Reporting"
+msgstr "Suivi"
+
+msgid "Social network"
+msgstr "Réseau social"
+
+msgid "Dashboard"
+msgstr "Panneau de contrôle"
+
+msgid "Administration"
+msgstr "Administration"
+
+
+
+
+
+
+
+
 
 

src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -182,11 +182,10 @@
             {% block menu %}
                 <nav class="navbar navbar-default">
                     <div class="container">
-                        {{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:leftMenu', {'automenu': 'navbar', 'stacked':true}) }}
-                        <div style="float:right">
-                            {{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:rightMenu', {'automenu': 'navbar'} ) }}
+                        <div class="collapse navbar-collapse">
+                        {{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:leftMenu', {'automenu': 'navbar', 'stacked' : false}) }}
+                        {{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:rightMenu', {'automenu': 'navbar', 'pull-right' : true} ) }}
                         </div>
-
                     </div>
                 </nav>
                 {#{% include "@template_style/layout/menu.html.twig" %}#}