Refactor code, move into CoreBundle

config/bundles.php

@@ -15,7 +15,6 @@ return [
     FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
     FOS\RestBundle\FOSRestBundle::class => ['all' => true],
     Chamilo\CoreBundle\ChamiloCoreBundle::class => ['all' => true],
-    Chamilo\ThemeBundle\ChamiloThemeBundle::class => ['all' => true],
     Chamilo\SkillBundle\ChamiloSkillBundle::class => ['all' => true],
     Chamilo\CourseBundle\ChamiloCourseBundle::class => ['all' => true],
     Chamilo\TicketBundle\ChamiloTicketBundle::class => ['all' => true],
@@ -41,4 +40,5 @@ return [
     ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
     Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
+    SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
 ];

config/routes.yaml

@@ -1,3 +1,6 @@
+login_check:
+    path: /login_check
+
 logout:
     path: /logout
 

config/services.yaml

@@ -64,12 +64,6 @@ services:
     Symfony\Component\Mailer\Mailer:
         public: true
 
-    Chamilo\ThemeBundle\:
-        autowire: true
-        resource: '../src/ThemeBundle/*'
-        exclude: '../src/ThemeBundle/{Entity,Migrations,Tests}'
-        public: true
-
     Doctrine\ORM\EntityManager: "@doctrine.orm.default_entity_manager"
 
     chamilo_core.hook_factory:
@@ -99,7 +93,7 @@ sylius_settings:
 
 # Grid default template
 apy_data_grid:
-    theme: '@ChamiloTheme/Resource/grid_theme.html.twig'
+    theme: '@ChamiloCore/Resource/grid_theme.html.twig'
     limits: [20, 50, 100]
     persistence: false
 #    no_data_message: "No data"

public/main/attendance/index.php

@@ -440,7 +440,7 @@ switch ($action) {
         $content = $attendance->getCalendarSheet($edit, $attendanceId, $student_id);
 
         $tpl->assign('table', $content);
-        $content = $tpl->fetch('@ChamiloTheme/Attendance/sheet.html.twig');
+        $content = $tpl->fetch('@ChamiloCore/Attendance/sheet.html.twig');
         break;
     case 'attendance_sheet_export_to_pdf':
         $attendance->attendance_sheet_export_to_pdf(

public/main/exercise/TestCategory.php

@@ -1194,7 +1194,7 @@ class TestCategory
         ;
 
         return Container::$container->get('twig')->render(
-            '@ChamiloTheme/Resource/grid.html.twig',
+            '@ChamiloCore/Resource/grid.html.twig',
             ['grid' => $grid]
         );
     }

public/main/exercise/exercise.class.php

@@ -8721,7 +8721,7 @@ class Exercise
         ;
 
         return Container::$container->get('twig')->render(
-            '@ChamiloTheme/Resource/grid.html.twig',
+            '@ChamiloCore/Resource/grid.html.twig',
             ['grid' => $grid]
         );
     }

public/main/inc/lib/ExerciseCategoryManager.php

@@ -359,7 +359,7 @@ class ExerciseCategoryManager extends Model
         ;
 
         $content .= Container::$container->get('twig')->render(
-            '@ChamiloTheme/Resource/grid.html.twig',
+            '@ChamiloCore/Resource/grid.html.twig',
             ['grid' => $grid]
         );
 

public/main/inc/lib/api.lib.php

@@ -8667,8 +8667,8 @@ function api_mail_html(
         }
 
         $message
-            ->htmlTemplate('ChamiloThemeBundle:Mailer:Default/default.html.twig')
-            ->textTemplate('ChamiloThemeBundle:Mailer:Default/default.text.twig')
+            ->htmlTemplate('ChamiloCoreBundle:Mailer:Default/default.html.twig')
+            ->textTemplate('ChamiloCoreBundle:Mailer:Default/default.text.twig')
         ;
         $message->context($params);
         Container::getMailer()->send($message);

public/main/inc/lib/display.lib.php

@@ -78,7 +78,7 @@ class Display
     public static function display_reduced_header()
     {
         ob_start();
-        self::$legacyTemplate = '@ChamiloTheme/Layout/no_layout.html.twig';
+        self::$legacyTemplate = '@ChamiloCore/Layout/no_layout.html.twig';
 
         return true;
 
@@ -114,7 +114,7 @@ class Display
         if (ob_get_length()) {
             ob_end_clean();
         }
-        $tpl = '@ChamiloTheme/Layout/layout_one_col.html.twig';
+        $tpl = '@ChamiloCore/Layout/layout_one_col.html.twig';
         if (!empty(self::$legacyTemplate)) {
             $tpl = self::$legacyTemplate;
         }
@@ -143,7 +143,7 @@ class Display
         if (ob_get_length()) {
             ob_end_clean();
         }
-        $tpl = '@ChamiloTheme/Layout/no_layout.html.twig';
+        $tpl = '@ChamiloCore/Layout/no_layout.html.twig';
         if (!empty(self::$legacyTemplate)) {
             $tpl = self::$legacyTemplate;
         }

public/main/inc/lib/exercise.lib.php

@@ -4912,7 +4912,7 @@ EOT;
         ];
 
         return Container::getTwig()->render(
-            '@ChamiloTheme/Mailer/Exercise/result_alert_body.html.twig',
+            '@ChamiloCore/Mailer/Exercise/result_alert_body.html.twig',
             $params
         );
     }

public/main/inc/lib/javascript/epiclock/javascript/jquery.dateformat.min.js

@@ -18,7 +18,7 @@ function formatDate(date,format)
 {output+=_[char].apply(date);}
 else
 {output+=char;}
-break;}}
+  break;}}
 return output;}
 _={V:function()
 {return modCalc(this,864e2,1e5);},v:function()

public/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js

@@ -13,36 +13,36 @@
 /*jslint white: true, browser: true, onevar: true, undef: true, eqeqeq: true, bitwise: true, regexp: true, strict: true, newcap: true, immed: true, maxerr: 50, indent: 4 */
 
 (function ($) {
-    //constants
-    var epClock;   // clock object
+  //constants
+  var epClock;   // clock object
 
-    //  Setup
-    $.epiclock.addRenderer('minute', function (element, value)
-    {
-        var currentTime = new Date().valueOf();
-        var dist = epClock.time+epClock.__offset - currentTime;
+  //  Setup
+  $.epiclock.addRenderer('minute', function (element, value)
+  {
+    var currentTime = new Date().valueOf();
+    var dist = epClock.time+epClock.__offset - currentTime;
        
-        //Sets the value to the clock very important!
-        element.text(value);
+    //Sets the value to the clock very important!
+    element.text(value);
         
-        var div_clock = $('#exercise_clock_warning');
+    var div_clock = $('#exercise_clock_warning');
         
-        // 60000 = 60 seconds
-        if (dist <= 300000) {  //5min
-            if (!(div_clock.hasClass('time_warning_two'))) {
-                div_clock.addClass('time_warning_two');
-            }
-        }
+    // 60000 = 60 seconds
+    if (dist <= 300000) {  //5min
+      if (!(div_clock.hasClass('time_warning_two'))) {
+        div_clock.addClass('time_warning_two');
+      }
+    }
         
-        if (dist <= 120000) { //2min
-            div_clock.removeClass('time_warning_two');
-            if (!(div_clock.hasClass('time_warning_one'))) {                
-                div_clock.addClass('time_warning_one');
-            }            
-        }
-    },
-    function ()
-    {
-       epClock = this;
-    });	
+    if (dist <= 120000) { //2min
+      div_clock.removeClass('time_warning_two');
+      if (!(div_clock.hasClass('time_warning_one'))) {                
+        div_clock.addClass('time_warning_one');
+      }            
+    }
+  },
+  function ()
+  {
+    epClock = this;
+  });	
 }(jQuery));

public/main/inc/lib/template.lib.php

@@ -211,10 +211,10 @@ class Template
     public function display_one_col_template()
     {
         $this->loadLegacyParams();
-        $template = '@ChamiloTheme/Layout/layout_one_col.html.twig';
+        $template = '@ChamiloCore/Layout/layout_one_col.html.twig';
         $origin = api_get_origin();
         if ('learnpath' === $origin) {
-            $template = '@ChamiloTheme/Layout/no_layout.html.twig';
+            $template = '@ChamiloCore/Layout/no_layout.html.twig';
         }
         $this->returnResponse($this->params, $template);
     }
@@ -225,7 +225,7 @@ class Template
     public function display_blank_template()
     {
         $this->loadLegacyParams();
-        $template = '@ChamiloTheme/Layout/blank.html.twig';
+        $template = '@ChamiloCore/Layout/blank.html.twig';
         $this->returnResponse($this->params, $template);
     }
 
@@ -235,7 +235,7 @@ class Template
     public function displayBlankTemplateNoHeader()
     {
         $this->loadLegacyParams();
-        $template = '@ChamiloTheme/Layout/blank_no_header.html.twig';
+        $template = '@ChamiloCore/Layout/blank_no_header.html.twig';
         $this->returnResponse($this->params, $template);
     }
 
@@ -245,7 +245,7 @@ class Template
     public function display_no_layout_template()
     {
         $this->loadLegacyParams();
-        $template = '@ChamiloTheme/Layout/no_layout.html.twig';
+        $template = '@ChamiloCore/Layout/no_layout.html.twig';
         $this->returnResponse($this->params, $template);
     }
 
@@ -255,7 +255,7 @@ class Template
     public function displaySkillLayout()
     {
         $this->loadLegacyParams();
-        $template = '@ChamiloTheme/Layout/skill_layout.html.twig';
+        $template = '@ChamiloCore/Layout/skill_layout.html.twig';
         $this->returnResponse($this->params, $template);
     }
 

public/main/index/user_portal.php

@@ -297,5 +297,5 @@ Session::erase('id_session');
 Session::erase('studentview');
 api_remove_in_gradebook();
 
-$controller->tpl->assign('content', $controller->tpl->fetch('@ChamiloTheme/Index/userportal.html.twig'));
+$controller->tpl->assign('content', $controller->tpl->fetch('@ChamiloCore/Index/userportal.html.twig'));
 $controller->tpl->display_one_col_template();

public/main/lp/lp_add_audio.php

@@ -175,4 +175,4 @@ $page .= '</div>';
 
 $tpl->assign('post_page', $page);
 
-$tpl->displayTemplate('@ChamiloTheme/LearnPath/add_audio.html.twig');
+$tpl->displayTemplate('@ChamiloCore/LearnPath/add_audio.html.twig');

public/main/lp/lp_list.php

@@ -953,4 +953,4 @@ $template->assign('lp_is_shown', $lpIsShown);
 $template->assign('filtered_category', $filteredCategoryId);
 $template->assign('allow_min_time', $allowMinTime);
 
-$template->displayTemplate('@ChamiloTheme/LearnPath/list.html.twig');
+$template->displayTemplate('@ChamiloCore/LearnPath/list.html.twig');

public/main/lp/lp_report.php

@@ -151,7 +151,7 @@ $template->assign(
     Display::toolbarAction('lp_actions', [$actions])
 );
 
-$result = $template->fetch('@ChamiloTheme/LearnPath/report.html.twig');
+$result = $template->fetch('@ChamiloCore/LearnPath/report.html.twig');
 $template->assign('content', $result);
 
 if ($export) {

public/main/lp/lp_view.php

@@ -610,7 +610,7 @@ $template->assign(
 
 $frameReady = Display::getFrameReadyBlock('#content_id, #content_id_blank');
 $template->assign('frame_ready', $frameReady);
-$template->displayTemplate('@ChamiloTheme/LearnPath/view.html.twig');
+$template->displayTemplate('@ChamiloCore/LearnPath/view.html.twig');
 
 // Restore a global setting.
 $_setting['show_navigation_menu'] = $save_setting;

public/main/template/default/admin/career_dashboard.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
     {% autoescape false %}

public/main/template/default/admin/gradebook_dependency.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
     {% autoescape false %}

public/main/template/default/admin/gradebook_list.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
     {% autoescape false %}

public/main/template/default/admin/index.html.twig

@@ -55,7 +55,7 @@
                 {% for role in app.user.roles %}
                     {% set role = role | lower | replace ({ 'role_' : ''}) %}
                     {% if role in ['global_admin'] %}
-                        {% include '@ChamiloTheme/Admin/' ~ role ~ '/role_index.html.twig' %}
+                        {% include '@ChamiloCore/Admin/' ~ role ~ '/role_index.html.twig' %}
                     {% endif %}
                 {% endfor %}
             </div>

public/main/template/default/admin/resource_sequence.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
     {% autoescape false %}

public/main/template/default/admin/user_information.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
+{% import '@ChamiloCore/Macros/box.html.twig' as display %}
 
 <div class="details">
     <div class="row">

public/main/template/default/agenda/planification.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% set user_id = student_id == _u.id ? 0 : student_id %}
 

public/main/template/default/auth/course_catalog.html.twig

@@ -1,4 +1,4 @@
-{% import "@ChamiloTheme/Macros/box.html.twig" as macro %}
+{% import "@ChamiloCore/Macros/box.html.twig" as macro %}
 
 {% autoescape false %}
 

public/main/template/default/auth/inscription.html.twig

@@ -1,7 +1,7 @@
 {%
     extends hide_header == true
-    ? '@ChamiloTheme/Layout/blank.html.twig'
-    : '@ChamiloTheme/Layout/layout_one_col.html.twig'
+    ? '@ChamiloCore/Layout/blank.html.twig'
+    : '@ChamiloCore/Layout/layout_one_col.html.twig'
 %}
 
 {% block content %}

public/main/template/default/auth/inscription_edit.html.twig

@@ -1,4 +1,4 @@
-{% extends '@ChamiloTheme/Layout/layout_one_col.html.twig' %}
+{% extends '@ChamiloCore/Layout/layout_one_col.html.twig' %}
 
 {% block content %}
     {% autoescape false %}

public/main/template/default/auth/session_catalog.html.twig

@@ -1,4 +1,4 @@
-{% import "@ChamiloTheme/Macros/box.html.twig" as macro %}
+{% import "@ChamiloCore/Macros/box.html.twig" as macro %}
 {% block content %}
 {% autoescape false %}
 <script>

public/main/template/default/course_description/index.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 {% block content %}
 {% autoescape false %}
     {% for message in messages %}

public/main/template/default/exercise/partials/result_exercise.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
+{% import '@ChamiloCore/Macros/box.html.twig' as display %}
 
 {% autoescape false %}
 

public/main/template/default/forum/list.html.twig

@@ -1,5 +1,5 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
-{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
+{% import '@ChamiloCore/Macros/box.html.twig' as display %}
 
 {% block content %}
 {% autoescape false %}

public/main/template/default/forum/posts.html.twig

@@ -1,5 +1,5 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
-{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
+{% import '@ChamiloCore/Macros/box.html.twig' as display %}
 
 {% block content %}
     {% autoescape false %}

public/main/template/default/message/view_message.html.twig

@@ -1,4 +1,4 @@
-{% extends '@ChamiloTheme/Layout/layout_one_col.html.twig' %}
+{% extends '@ChamiloCore/Layout/layout_one_col.html.twig' %}
 {% block content %}
 
     {% autoescape false %}

public/main/template/default/my_space/course_summary.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 {% block content %}
 
 {% autoescape false %}

public/main/template/default/my_space/index.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 {% autoescape false %}
 <div class="search-student">
     {{ form }}

public/main/template/default/my_space/partials/tracking_course_overview.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
+{% import '@ChamiloCore/Macros/box.html.twig' as display %}
 
 {% set content %}
     <div class="summary-course" id="summary-{{ data.id }}">

public/main/template/default/my_space/user_details.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
+{% import '@ChamiloCore/Macros/box.html.twig' as display %}
 
 {% autoescape false %}
 {% if title %}

public/main/template/default/my_space/user_summary.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 {% block content %}
 
 {% autoescape false %}

public/main/template/default/session/resume_session.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}

public/main/template/default/social/edit_profile.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}
     <div class="row">
         <div class="col-md-3">
             <div class="social-network-menu">
-                {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+                {% include '@ChamiloCore/Social/user_block.html.twig' %}
                 {{ social_menu_block }}
             </div>
         </div>

public/main/template/default/social/friends.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row">
     <div class="col-md-3">
         <div class="social-network-menu">
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
             {{ social_menu_block }}
         </div>
     </div>

public/main/template/default/social/group_view.html.twig

@@ -1,12 +1,12 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row" xmlns="http://www.w3.org/1999/html">
     <div class="col-md-4">
         {% set avatar %}
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
         {% endset %}
         {{ macro.panel('', avatar ) }}
     </div>

public/main/template/default/social/group_waiting_list.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row">
     <div class="col-md-3">
         <div class="social-network-menu">
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
             {{ social_menu_block }}
         </div>
     </div>

public/main/template/default/social/groups.html.twig

@@ -1,12 +1,12 @@
-{% extends '@ChamiloTheme/Layout/layout_one_col.html.twig' %}
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% extends '@ChamiloCore/Layout/layout_one_col.html.twig' %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row">
     <div class="col-md-4">
         {% set avatar %}
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
         {% endset %}
         {{ macro.panel('', avatar ) }}
     </div>

public/main/template/default/social/groups_topics.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}
     <div class="row">
         <div class="col-md-3">
             <div class="sm-groups">
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
             {{ social_menu_block }}
 
             <!-- Block chat list -->

public/main/template/default/social/home.html.twig

@@ -1,4 +1,4 @@
-{% extends '@ChamiloTheme/Layout/layout_one_col.html.twig' %}
+{% extends '@ChamiloCore/Layout/layout_one_col.html.twig' %}
 
 {% block content %}
     {% autoescape false %}
@@ -10,7 +10,7 @@
     </style>
     <div class="row">
         <div class="col-md-3">
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
         </div>
         <div class="col-md-6">
             {#{{ social_search_block }}#}

public/main/template/default/social/inbox.html.twig

@@ -1,4 +1,4 @@
-{% extends '@ChamiloTheme/Layout/layout_one_col.html.twig' %}
+{% extends '@ChamiloCore/Layout/layout_one_col.html.twig' %}
 
 {% block content %}
     {% autoescape false %}

public/main/template/default/social/invitations.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row">
     <div class="col-md-3">
         <div class="social-network-menu">
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
             {{ social_menu_block }}
         </div>
     </div>

public/main/template/default/social/myfiles.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row">
     <div class="col-md-3">
         <div class="social-network-menu">
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
             {{ social_menu_block }}
         </div>
     </div>

public/main/template/default/social/personal_data.html.twig

@@ -1,12 +1,12 @@
-{% extends '@ChamiloTheme/Layout/layout_one_col.html.twig' %}
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% extends '@ChamiloCore/Layout/layout_one_col.html.twig' %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row">
     <div class="col-md-3">
         <div class="social-network-menu">
-            {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+            {% include '@ChamiloCore/Social/user_block.html.twig' %}
             {{ social_menu_block }}
         </div>
     </div>

public/main/template/default/social/profile.html.twig

@@ -1,11 +1,11 @@
-{% extends '@ChamiloTheme/Layout/layout_one_col.html.twig' %}
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% extends '@ChamiloCore/Layout/layout_one_col.html.twig' %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 {% block content %}
 {% autoescape false %}
 <div class="row">
     <div class="col-md-3">
-        {% include '@ChamiloTheme/Social/user_block.html.twig' %}
+        {% include '@ChamiloCore/Social/user_block.html.twig' %}
         {{ social_extra_info_block }}
     </div>
     <div id="wallMessages" class="col-md-6">

public/main/template/default/social/search.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}

public/main/template/default/social/skills_block.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 <script>
 $(function () {

public/main/template/default/social/user_block.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 {% autoescape false %}
 <div class="sidebar-avatar">

public/main/template/default/social/whoisonline.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}

public/main/template/default/user_portal/classic_courses_with_category.html.twig

@@ -1,4 +1,4 @@
-{% import "@ChamiloTheme/Macros/box.html.twig" as display %}
+{% import "@ChamiloCore/Macros/box.html.twig" as display %}
 {% autoescape false %}
 {% if not categories is empty %}
     <div class="classic-courses">

public/main/template/default/user_portal/course_categories.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 <h2>{{ 'CourseCategory'|get_lang }}</h2>
 <p>{{ 'MyCoursePageCategoryIntroduction'|get_lang }}</p>

public/main/template/default/user_portal/list_courses.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 {% autoescape false %}
 

public/main/template/default/user_portal/list_sessions.html.twig

@@ -1,4 +1,4 @@
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloCore/Macros/box.html.twig' as macro %}
 
 {% autoescape false %}
     {% if not session is empty %}

src/CoreBundle/Block/BreadcrumbBlockService.php

@@ -28,7 +28,7 @@ class BreadcrumbBlockService extends BaseBreadcrumbMenuBlockService
 
         $resolver->setDefaults([
             //'menu_template' => 'SonataSeoBundle:Block:breadcrumb.html.twig',
-            'menu_template' => '@ChamiloTheme/Breadcrumb/breadcrumb_legacy.html.twig',
+            'menu_template' => '@ChamiloCore/Breadcrumb/breadcrumb_legacy.html.twig',
             'include_homepage_link' => false,
             'context' => false,
         ]);

src/CoreBundle/Block/CourseBlockService.php

@@ -30,7 +30,7 @@ class CourseBlockService extends AbstractBlockService
         $resolver->setDefaults([
             'url' => false,
             'title' => 'Course block',
-            'template' => '@ChamiloTheme/Block/course.html.twig',
+            'template' => '@ChamiloCore/Block/course.html.twig',
             'ttl' => 0,
         ]);
     }

src/CoreBundle/Block/SkillBlockService.php

@@ -29,7 +29,7 @@ class SkillBlockService extends AbstractBlockService
     {
         $resolver->setDefaults(
             [
-                'template' => '@ChamiloTheme/Block/skill.html.twig',
+                'template' => '@ChamiloCore/Block/skill.html.twig',
                 'ttl' => 0,
             ]
         );

src/CoreBundle/Component/Resource/Template.php

@@ -20,19 +20,19 @@ class Template
 
     public function __construct()
     {
-        $this->index = '@ChamiloTheme/Resource/index.html.twig';
-        $this->list = '@ChamiloTheme/Resource/index.html.twig';
-        $this->edit = '@ChamiloTheme/Resource/edit.html.twig';
+        $this->index = '@ChamiloCore/Resource/index.html.twig';
+        $this->list = '@ChamiloCore/Resource/index.html.twig';
+        $this->edit = '@ChamiloCore/Resource/edit.html.twig';
         // New resource
-        $this->new = '@ChamiloTheme/Resource/new.html.twig';
+        $this->new = '@ChamiloCore/Resource/new.html.twig';
         // New resource node (new folder)
-        $this->newFolder = '@ChamiloTheme/Resource/new_folder.html.twig';
-        $this->viewResource = '@ChamiloTheme/Resource/view_resource.html.twig';
-        $this->diskSpace = '@ChamiloTheme/Resource/disk_space.html.twig';
-        $this->info = '@ChamiloTheme/Resource/info.html.twig';
-        $this->infoAjax = '@ChamiloTheme/Resource/info_ajax.html.twig';
-        $this->preview = '@ChamiloTheme/Resource/preview.html.twig';
-        $this->upload = '@ChamiloTheme/Resource/upload.html.twig';
+        $this->newFolder = '@ChamiloCore/Resource/new_folder.html.twig';
+        $this->viewResource = '@ChamiloCore/Resource/view_resource.html.twig';
+        $this->diskSpace = '@ChamiloCore/Resource/disk_space.html.twig';
+        $this->info = '@ChamiloCore/Resource/info.html.twig';
+        $this->infoAjax = '@ChamiloCore/Resource/info_ajax.html.twig';
+        $this->preview = '@ChamiloCore/Resource/preview.html.twig';
+        $this->upload = '@ChamiloCore/Resource/upload.html.twig';
     }
 
     public function getFromAction(string $action, $isAjax = false)

src/CoreBundle/Controller/Admin/PluginsController.php

@@ -26,7 +26,7 @@ class PluginsController extends SyliusSettingsController
         $installedPlugins = $appPlugin->getInstalledPlugins();
 
         return $this->render(
-            '@ChamiloTheme/Admin/Settings/plugins.html.twig',
+            '@ChamiloCore/Admin/Settings/plugins.html.twig',
             [
                 'plugins' => $installedPlugins,
             ]
@@ -59,7 +59,7 @@ class PluginsController extends SyliusSettingsController
         $installedPlugins = $appPlugin->getInstalledPlugins();
 
         return $this->render(
-            '@ChamiloTheme/Admin/Settings/pluginsAdd.html.twig',
+            '@ChamiloCore/Admin/Settings/pluginsAdd.html.twig',
             [
                 'plugins' => $allPluginsList,
                 'installed_plugins' => $installedPlugins,

src/CoreBundle/Controller/Admin/SettingsController.php

@@ -42,7 +42,7 @@ class SettingsController extends SyliusSettingsController
         $schemas = $manager->getSchemas();
 
         return $this->render(
-            '@ChamiloTheme/Admin/Settings/index.html.twig',
+            '@ChamiloCore/Admin/Settings/index.html.twig',
             [
                 'schemas' => $schemas,
             ]
@@ -100,7 +100,7 @@ class SettingsController extends SyliusSettingsController
         $schemas = $manager->getSchemas();
 
         return $this->render(
-            '@ChamiloTheme/Admin/Settings/search.html.twig',
+            '@ChamiloCore/Admin/Settings/search.html.twig',
             [
                 'keyword' => $keyword,
                 'schemas' => $schemas,
@@ -185,7 +185,7 @@ class SettingsController extends SyliusSettingsController
         $schemas = $manager->getSchemas();
 
         return $this->render(
-            '@ChamiloTheme/Admin/Settings/default.html.twig',
+            '@ChamiloCore/Admin/Settings/default.html.twig',
             [
                 'schemas' => $schemas,
                 'settings' => $settings,

src/CoreBundle/Controller/ChatController.php

@@ -40,7 +40,7 @@ class ChatController extends AbstractResourceController implements CourseControl
         Event::registerLog($logInfo);
 
         return $this->render(
-            '@ChamiloTheme/Chat/chat.html.twig',
+            '@ChamiloCore/Chat/chat.html.twig',
             [
                 'restrict_to_coach' => api_get_configuration_value('course_chat_restrict_to_coach'),
                 'user' => api_get_user_info(),

src/CoreBundle/Controller/CourseController.php

@@ -40,7 +40,7 @@ class CourseController extends AbstractController
      */
     public function welcomeAction(Course $course): Response
     {
-        return $this->render('@ChamiloTheme/Course/welcome.html.twig', ['course' => $course]);
+        return $this->render('@ChamiloCore/Course/welcome.html.twig', ['course' => $course]);
     }
 
     /**
@@ -193,6 +193,6 @@ class CourseController extends AbstractController
         $htmlHeadXtra[] = $metaInfo;
         $htmlHeadXtra[] = api_get_asset('readmore-js/readmore.js');
 
-        return $this->render('@ChamiloTheme/Course/about.html.twig', [$params]);
+        return $this->render('@ChamiloCore/Course/about.html.twig', [$params]);
     }
 }

src/CoreBundle/Controller/CourseHomeController.php

@@ -196,7 +196,7 @@ class CourseHomeController extends ToolBaseController
         $shortcuts = $shortcutQuery->getQuery()->getResult();
 
         return $this->render(
-            '@ChamiloTheme/Course/home.html.twig',
+            '@ChamiloCore/Course/home.html.twig',
             [
                 'course' => $course,
                 'shortcuts' => $shortcuts,
@@ -274,7 +274,7 @@ class CourseHomeController extends ToolBaseController
         $schemas = $manager->getSchemas();
 
         return $this->render(
-            '@ChamiloTheme/Course/settings.html.twig',
+            '@ChamiloCore/Course/settings.html.twig',
             [
                 'course' => $course,
                 'schemas' => $schemas,

src/CoreBundle/Controller/EditorController.php

@@ -52,7 +52,7 @@ class EditorController extends BaseController
         $templates = $editor->simpleFormatTemplates();
 
         return $this->render(
-            '@ChamiloTheme/Editor/templates.html.twig',
+            '@ChamiloCore/Editor/templates.html.twig',
             ['templates' => $templates]
         );
     }
@@ -67,7 +67,7 @@ class EditorController extends BaseController
             'course_condition' => '?'.$this->getCourseUrlQuery(),
         ];
 
-        return $this->render('@ChamiloTheme/Editor/elfinder.html.twig', $params);
+        return $this->render('@ChamiloCore/Editor/elfinder.html.twig', $params);
     }
 
     /**
@@ -154,7 +154,7 @@ class EditorController extends BaseController
         );
 
         return $grid->getGridResponse(
-            '@ChamiloTheme/Editor/custom.html.twig',
+            '@ChamiloCore/Editor/custom.html.twig',
             ['id' => $id, 'tool' => $tool, 'type' => $type]
         );
     }
@@ -199,7 +199,7 @@ class EditorController extends BaseController
         $content = ob_get_contents();
 
         return $this->render(
-            '@ChamiloTheme/layout_empty.html.twig',
+            '@ChamiloCore/layout_empty.html.twig',
             ['content' => $content]
         );*/
     }
@@ -229,7 +229,7 @@ class EditorController extends BaseController
             'tool' => $tool,
         ];
 
-        $renderedView = $this->renderView('@ChamiloTheme/Editor/config_js.html.twig', $params);
+        $renderedView = $this->renderView('@ChamiloCore/Editor/config_js.html.twig', $params);
         $response = new Response($renderedView);
         $response->headers->set('Content-Type', 'text/javascript');
 

src/CoreBundle/Controller/ExceptionController.php

@@ -25,21 +25,21 @@ class ExceptionController extends AbstractController
         $loader = $this->container->get('twig')->getLoader();
         // when not in debug, try to find a template for the specific HTTP status code and format
         if (!$showException) {
-            $template = sprintf('@ChamiloTheme/Exception/%s%s.%s.twig', $name, $code, $format);
+            $template = sprintf('@ChamiloCore/Exception/%s%s.%s.twig', $name, $code, $format);
             if ($loader->exists($template)) {
                 return $template;
             }
         }
 
         // try to find a template for the given format
-        $template = sprintf('@ChamiloTheme/Exception/%s.%s.twig', $name, $format);
+        $template = sprintf('@ChamiloCore/Exception/%s.%s.twig', $name, $format);
         if ($loader->exists($template)) {
             return $template;
         }
 
         // default to a generic HTML exception
         //$request->setRequestFormat('html');
-        $template = sprintf('@ChamiloTheme/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
+        $template = sprintf('@ChamiloCore/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
 
         return $this->render($template, ['exception' => $exception]);
     }
@@ -62,21 +62,21 @@ class ExceptionController extends AbstractController
         $loader = $this->container->get('twig')->getLoader();
         // when not in debug, try to find a template for the specific HTTP status code and format
         if (!$showException) {
-            $template = sprintf('@ChamiloTheme/Exception/%s%s.%s.twig', $name, $code, $format);
+            $template = sprintf('@ChamiloCore/Exception/%s%s.%s.twig', $name, $code, $format);
             if ($loader->exists($template)) {
                 return $template;
             }
         }
 
         // try to find a template for the given format
-        $template = sprintf('@ChamiloTheme/Exception/%s.%s.twig', $name, $format);
+        $template = sprintf('@ChamiloCore/Exception/%s.%s.twig', $name, $format);
         if ($loader->exists($template)) {
             return $template;
         }
 
         // default to a generic HTML exception
         //$request->setRequestFormat('html');
-        $template = sprintf('@ChamiloTheme/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
+        $template = sprintf('@ChamiloCore/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
 
         return $this->render($template, ['exception' => $exception]);
     }

src/CoreBundle/Controller/IndexController.php

@@ -23,7 +23,7 @@ class IndexController extends BaseController
     public function indexAction(): Response
     {
         return $this->render(
-            '@ChamiloTheme/Index/index.html.twig',
+            '@ChamiloCore/Index/index.html.twig',
             [
                 'content' => '',
             ]

src/CoreBundle/Controller/NewsController.php

@@ -33,7 +33,7 @@ class NewsController extends BaseController
         }
 
         return $this->render(
-            '@ChamiloTheme/News/index.html.twig',
+            '@ChamiloCore/News/index.html.twig',
             [
                 'toolbar' => $toolBar,
             ]
@@ -53,7 +53,7 @@ class NewsController extends BaseController
             $content = \SystemAnnouncementManager::getAnnouncements($visibility);
 
             return $this->render(
-                '@ChamiloTheme/News/slider.html.twig',
+                '@ChamiloCore/News/slider.html.twig',
                 [
                     'announcements' => $content,
                 ]
@@ -62,7 +62,7 @@ class NewsController extends BaseController
             $content = \SystemAnnouncementManager::getAnnouncement($id, $visibility);
 
             return $this->render(
-                '@ChamiloTheme/News/view.html.twig',
+                '@ChamiloCore/News/view.html.twig',
                 [
                     'announcement' => $content,
                 ]

src/CoreBundle/Controller/OnlineController.php

@@ -25,7 +25,7 @@ class OnlineController extends BaseController
         $users = \SocialManager::display_user_list($users);
 
         return $this->render(
-            '@ChamiloTheme/Online/index.html.twig',
+            '@ChamiloCore/Online/index.html.twig',
             [
                 'whoisonline' => $users,
             ]
@@ -49,7 +49,7 @@ class OnlineController extends BaseController
         $users = \SocialManager::display_user_list($users);
 
         return $this->render(
-            '@ChamiloTheme/Online/index.html.twig',
+            '@ChamiloCore/Online/index.html.twig',
             [
                 'whoisonline' => $users,
             ]
@@ -74,7 +74,7 @@ class OnlineController extends BaseController
         $users = \SocialManager::display_user_list($users);
 
         return $this->render(
-            '@ChamiloTheme/Online/index.html.twig',
+            '@ChamiloCore/Online/index.html.twig',
             [
                 'whoisonline' => $users,
             ]

src/CoreBundle/Controller/SessionController.php

@@ -249,6 +249,6 @@ class SessionController extends AbstractController
             ),
         ];
 
-        return $this->render('@ChamiloTheme/Session/about.html.twig', $params);
+        return $this->render('@ChamiloCore/Session/about.html.twig', $params);
     }
 }

src/CoreBundle/Entity/User.php

@@ -48,40 +48,6 @@ use Symfony\Component\Validator\Mapping\ClassMetadata;
  * @UniqueEntity("username")
  * @ORM\Entity()
  *
- * @ORM\AttributeOverrides({
- *     @ORM\AttributeOverride(name="username",
- *         column=@ORM\Column(
- *             name="username",
- *             type="string",
- *             length=100,
- *             unique=true
- *         )
- *     ),
- *      @ORM\AttributeOverride(name="email",
- *         column=@ORM\Column(
- *             name="email",
- *             type="string",
- *             length=100,
- *             unique=false
- *         )
- *     ),
- *     @ORM\AttributeOverride(name="emailCanonical",
- *         column=@ORM\Column(
- *             name="email_canonical",
- *             type="string",
- *             length=100,
- *             unique=false
- *         )
- *     ),
- *     @ORM\AttributeOverride(name="usernameCanonical",
- *         column=@ORM\Column(
- *             name="username_canonical",
- *             type="string",
- *             length=180,
- *             unique=false
- *         )
- *     )
- * })
  */
 class User implements UserInterface, EquatableInterface
 {
@@ -104,7 +70,7 @@ class User implements UserInterface, EquatableInterface
     /**
      * @ORM\Column(type="string", unique=true, nullable=true)
      */
-    private $apiToken;
+    protected $apiToken;
 
     /**
      * @var string
@@ -149,6 +115,13 @@ class User implements UserInterface, EquatableInterface
      */
     protected $username;
 
+    /**
+     * @var string|null
+     * @Assert\NotBlank()
+     * @Assert\Length(max=4096)
+     */
+    protected $plainPassword;
+
     /**
      * @var string
      * @ORM\Column(name="password", type="string", length=255, nullable=false, unique=false)
@@ -165,7 +138,7 @@ class User implements UserInterface, EquatableInterface
     /**
      * @var string
      *
-     * @ORM\Column(name="username_canonical", type="string", length=100, nullable=false)
+     * @ORM\Column(name="username_canonical", type="string", length=180, nullable=false)
      */
     protected $usernameCanonical;
 
@@ -592,7 +565,6 @@ class User implements UserInterface, EquatableInterface
      */
     public function __construct()
     {
-        parent::__construct();
         $this->status = self::STUDENT;
         $this->salt = sha1(uniqid(null, true));
         $this->active = true;
@@ -961,7 +933,7 @@ class User implements UserInterface, EquatableInterface
      *
      * @return User
      */
-    public function setLastname($lastname)
+    public function setLastname(string $lastname): self
     {
         $this->lastname = $lastname;
 
@@ -975,35 +947,23 @@ class User implements UserInterface, EquatableInterface
      *
      * @return User
      */
-    public function setFirstname($firstname)
+    public function setFirstname(string $firstname): self
     {
         $this->firstname = $firstname;
 
         return $this;
     }
 
-    /**
-     * Set password.
-     *
-     * @param string $password
-     *
-     * @return User
-     */
-    public function setPassword($password)
+    public function getPassword()
     {
-        $this->password = $password;
-
-        return $this;
+        return $this->password;
     }
 
-    /**
-     * Get password.
-     *
-     * @return string
-     */
-    public function getPassword()
+    public function setPassword(string $password): self
     {
-        return $this->password;
+        $this->password = $password;
+
+        return $this;
     }
 
     /**
@@ -1593,6 +1553,20 @@ class User implements UserInterface, EquatableInterface
         return (string) $this->username;
     }
 
+    public function getPlainPassword(): ?string
+    {
+        return $this->plainPassword;
+    }
+
+    public function setPlainPassword(string $password): void
+    {
+        $this->plainPassword = $password;
+
+        // forces the object to look "dirty" to Doctrine. Avoids
+        // Doctrine *not* saving this entity, if only plainPassword changes
+        $this->password = null;
+    }
+
     /**
      * Returns the expiration date.
      *
@@ -2066,11 +2040,6 @@ class User implements UserInterface, EquatableInterface
         return $this->emailCanonical;
     }
 
-    public function getPlainPassword()
-    {
-        return $this->plainPassword;
-    }
-
     /**
      * @param string $timezone
      *

src/CoreBundle/Framework/Container.php

@@ -77,7 +77,7 @@ class Container
     public static $twig;
     public static $roles;
     /** @var string */
-    public static $legacyTemplate = '@ChamiloTheme/Layout/layout_one_col.html.twig';
+    public static $legacyTemplate = '@ChamiloCore/Layout/layout_one_col.html.twig';
     //private static $settingsManager;
     private static $userManager;
     private static $siteManager;

src/CoreBundle/Resources/views/Account/edit.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
     {% autoescape false %}

src/CoreBundle/Resources/views/Account/home.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
     {% autoescape false %}

src/CoreBundle/Resources/views/Admin/Settings/default.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
-{% from '@ChamiloTheme/Admin/Settings/actions.html.twig' import update %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
+{% from '@ChamiloCore/Admin/Settings/actions.html.twig' import update %}
 {% set namespace = app.request.get('namespace') %}
 
 {% block content %}
     <div class="row">
         <div class="col-xs-3 col-md-3">
-        {% include '@ChamiloTheme/Admin/Settings/menu.html.twig' %}
+        {% include '@ChamiloCore/Admin/Settings/menu.html.twig' %}
         </div>
         <div class="col-xs-9 col-md-9">
             <form class="form-inline"

src/CoreBundle/Resources/views/Admin/Settings/index.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block page_title %}
     {{ 'Settings' | trans }}
@@ -10,7 +10,7 @@
 {% block page_content %}
     <div class="row">
         <div class="col-xs-3 col-md-3">
-        {% include '@ChamiloTheme/Admin/Settings/menu.html.twig' %}
+        {% include '@ChamiloCore/Admin/Settings/menu.html.twig' %}
         </div>
         <div class="col-xs-9 col-md-9">
         </div>

src/CoreBundle/Resources/views/Admin/Settings/search.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
-{% from '@ChamiloTheme/Admin/Settings/actions.html.twig' import update %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
+{% from '@ChamiloCore/Admin/Settings/actions.html.twig' import update %}
 {% set namespace = app.request.get('namespace') %}
 
 {% block content %}
     <div class="row">
         <div class="col-xs-3 col-md-3">
-        {% include '@ChamiloTheme/Admin/Settings/menu.html.twig' %}
+        {% include '@ChamiloCore/Admin/Settings/menu.html.twig' %}
         </div>
         <div class="col-xs-9 col-md-9">
             <div class="page-header">

src/CoreBundle/Resources/views/Admin/admin_topnav.html.twig

@@ -2,6 +2,6 @@
 
 {% block user_block %}
     {#{{ locale_switcher(null, null, 'ChamiloCoreBundle:Admin:switcher_links.html.twig') }}#}
-    {% include '@ChamiloTheme/Admin/switcher_links.html.twig' %}
+    {% include '@ChamiloCore/Admin/switcher_links.html.twig' %}
     {{ parent() }}
 {% endblock %}

src/CoreBundle/Resources/views/Block/course.html.twig

@@ -0,0 +1,5 @@
+{% extends '@SonataBlock/Block/block_base.html.twig' %}
+
+{% block block %}
+{% include "@ChamiloCore/default/layout/hot_courses.html.twig" with {'hot_courses': hot_courses } %}
+{% endblock %}

src/CoreBundle/Resources/views/Chat/chat.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/no_layout.html.twig" %}
+{% extends "@ChamiloCore/Layout/no_layout.html.twig" %}
 
 {% block content %}
     {% autoescape false %}

src/CoreBundle/Resources/views/Course/about.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}

src/CoreBundle/Resources/views/Course/add.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}

src/CoreBundle/Resources/views/Course/home.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
 
 {% block content %}
 {% autoescape false %}

src/CoreBundle/Resources/views/Course/settings.html.twig

@@ -1,11 +1,11 @@
-{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
-{% from '@ChamiloTheme/Admin/Settings/actions.html.twig' import update %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}
+{% from '@ChamiloCore/Admin/Settings/actions.html.twig' import update %}
 {% set namespace = app.request.get('namespace') %}
 
 {% block content %}
     <div class="row">
         <div class="col-xs-3 col-md-3">
-            {% include '@ChamiloTheme/Course/settings_menu.html.twig' %}
+            {% include '@ChamiloCore/Course/settings_menu.html.twig' %}
         </div>
         <div class="col-xs-9 col-md-9">
             {#<div class="page-header">#}