Adding login form, fixing calendar fatal errors, adding web.main routes

app/Resources/views/layout.html.twig

@@ -24,7 +24,11 @@
     {% endif %}
 
     {% if is_granted('IS_AUTHENTICATED_FULLY') == false %}
-        <form action="{{ path("fos_user_security_check") }}" method="post" role="form">
+
+        <div class="user-panel">
+        </div>
+
+        <form action="{{ path("fos_user_security_check") }}" method="post" role="form" class="sidebar-form">
             <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
             <div class="form-group">
                 <label for="username">{{ 'security.login.username'|trans({}, 'SonataUserBundle') }}</label>
@@ -36,6 +40,8 @@
             </div>
             <button type="submit" class="btn btn-default">Submit</button>
         </form>
+
+        {{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:loginMenu', {'automenu': 'pills', 'stacked':true}) }}
     {% endif %}
 
     {{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:helpMenu', {'automenu': 'pills', 'stacked':true}) }}

app/Resources/views/login.html.twig

@@ -33,7 +33,7 @@
 <!-- jQuery 2.0.2 -->
 <script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
 <!-- Bootstrap -->
-<script src="../../js/bootstrap.min.js" type="text/javascript"></script>
+<script src="../../js/bootstrap.js" type="text/javascript"></script>
 
 </body>
 </html>

main/calendar/agenda_js.php

@@ -3,9 +3,7 @@
 /**
  * @package chamilo.calendar
  */
-/**
- * INIT SECTION
- */
+
 use \ChamiloSession as Session;
 
 // use anonymous mode when accessing this course tool

main/mySpace/session.php

@@ -10,8 +10,6 @@ $nameTools= 'Sessions';
 $language_file = array ('registration', 'index', 'trad4all', 'tracking', 'admin');
 $cidReset = true;
 
-require_once '../inc/global.inc.php';
-
 api_block_anonymous_users();
 
 $this_section = SECTION_TRACKING;
@@ -69,7 +67,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
     if (!empty($a_sessions_drh)) {
         $a_sessions = array_merge($a_sessions, $a_sessions_drh);
     }
-
+    $menu_items = array();
 	if (!api_is_session_admin()) {
 		$menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
 		$menu_items[] = Display::url(Display::return_icon('user.png', get_lang('Students'), array(), 32), "index.php?view=drh_students&display=yourstudents");

src/ChamiloLMS/CoreBundle/Menu/SimpleMenuBuilder.php

@@ -14,11 +14,33 @@ use Symfony\Component\DependencyInjection\ContainerAware;
  */
 class SimpleMenuBuilder extends ContainerAware
 {
-    public function helpMenu(FactoryInterface $factory, array $options)
+    public function loginMenu(FactoryInterface $factory, array $options)
     {
         $menu = $factory->createItem('main');
 
-        $child = $menu->addChild(
+        $menu->addChild(
+            'Register',
+            array(
+                'route' => 'sonata_user_registration_register',
+                array("attributes" => array("id" => 'nav'))
+            )
+        );
+
+        $menu->addChild(
+            'Reset Password',
+            array(
+                'route' => 'fos_user_resetting_request',
+                array("attributes" => array("id" => 'nav'))
+            )
+        );
+
+        return $menu;
+    }
+
+    public function helpMenu(FactoryInterface $factory, array $options)
+    {
+        $menu = $factory->createItem('main');
+        $menu->addChild(
             'Help',
             array(
                 'route' => 'userportal',
@@ -52,25 +74,28 @@ class SimpleMenuBuilder extends ContainerAware
         );
 
         $child = $menu->addChild(
-            'Agenda',
+            'Progress',
             array(
-                'route' => 'userportal',
+                'route' => 'main',
+                'routeParameters' => array('name' => 'mySpace/index.php'),
                 array("attributes" => array("id" => 'nav'))
             )
         );
 
-        $child = $menu->addChild(
-            'Progress',
+        $menu->addChild(
+            'Calendar',
             array(
-                'route' => 'userportal',
+                'route' => 'main',
+                'routeParameters' => array('name' => 'calendar/agenda_js.php'),
                 array("attributes" => array("id" => 'nav'))
             )
         );
 
-        $child = $menu->addChild(
+        $menu->addChild(
             'Settings',
             array(
-                'uri' => '/main/admin/settings.php',
+                'route' => 'main',
+                'routeParameters' => array('name' => 'admin/settings.php'),
                 array("attributes" => array("id" => 'nav'))
             )
         );

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

@@ -14,6 +14,9 @@ main:
 web.ajax:
     path: main/inc/ajax/
 
+web.main:
+    path: main/
+
 web.img:
     path: ChamiloLMS/img/
 

src/ChamiloLMS/CoreBundle/Resources/views/Calendar/month.html.twig

@@ -313,15 +313,15 @@ $(document).ready(function() {
                 $("#dialog-form").dialog({
                     buttons: {
                         '{{ "ExportiCalConfidential"|trans }}' : function() {
-                            url =  "{{ _p.web_main }}calendar/ical_export.php?id=" + calEvent.id+'&course_id='+calEvent.course_id+"&class=confidential";
+                            url =  "{{ path('web.main') }}calendar/ical_export.php?id=" + calEvent.id+'&course_id='+calEvent.course_id+"&class=confidential";
                             window.location.href = url;
                         },
                         '{{ "ExportiCalPrivate"|trans }}': function() {
-                            url =  "{{ _p.web_main }}calendar/ical_export.php?id=" + calEvent.id+'&course_id='+calEvent.course_id+"&class=private";
+                            url =  "{{ path('web.main') }}calendar/ical_export.php?id=" + calEvent.id+'&course_id='+calEvent.course_id+"&class=private";
                             window.location.href = url;
                         },
                         '{{ "ExportiCalPublic"|trans }}': function() {
-                            url =  "{{ _p.web_main }}calendar/ical_export.php?id=" + calEvent.id+'&course_id='+calEvent.course_id+"&class=public";
+                            url =  "{{ path('web.main') }}calendar/ical_export.php?id=" + calEvent.id+'&course_id='+calEvent.course_id+"&class=public";
                             window.location.href = url;
                         },
                         {% if type == 'not_available' %}
@@ -350,7 +350,7 @@ $(document).ready(function() {
                         {% endif %}
 
                         '{{ "Edit"|trans }}' : function() {
-                            url =  "{{ _p.web_main }}calendar/agenda.php?action=edit&type=fromjs&id=" + calEvent.id+'&course_id='+calEvent.course_id+"";
+                            url =  "{{ path('web.main') }}calendar/agenda.php?action=edit&type=fromjs&id=" + calEvent.id+'&course_id='+calEvent.course_id+"";
                             window.location.href = url;
                             $("#dialog-form").dialog( "close" );
                         },
@@ -498,7 +498,7 @@ $(document).ready(function() {
     });
 });
 </script>
-{{ actions_div }}
+{#{{ actions_div }}#}
 
 <div id="simple-dialog-form" style="display:none;">
     <div style="width:500px">