diff --git a/assets/js/main.js b/assets/js/main.js
index 88f5405c45..510c143cbf 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -1,31 +1,36 @@
-var moment = require('moment');
+var moment = require("moment");
require("moment/min/locales.min");
global.moment = moment;
-const $ = require('jquery');
+const $ = require("jquery");
// create global $ and jQuery variables
window.jQuery = window.$ = global.$ = global.jQuery = $;
// JS is equivalent to the normal "bootstrap" package
// no need to set this to a variable, just require it
-require('bootstrap-sass');
-require('readmore-js');
-require('chosen-js');
-require('webpack-jquery-ui');
-require('webpack-jquery-ui/css');
-require('font-awesome-webpack');
-require('ckeditor');
-require('mediaelement');
-require('js-cookie');
-require('fullcalendar');
-require('qtip2');
-require('image-map-resizer')
+require("bootstrap-sass");
+require("chosen-js");
+require("webpack-jquery-ui");
+require("webpack-jquery-ui/css");
+require("font-awesome-webpack");
+require("ckeditor");
+require("mediaelement");
+require("js-cookie");
+require("fullcalendar");
+require("qtip2");
+require("image-map-resizer");
+
+//require ("readmore-js");
+import "select2";
+
+require("bootstrap-select");
+
/*
-require('jquery-ui-timepicker-addon');
-require('chosen-js');*/
-//require('bootstrap-daterangepicker');
+require("jquery-ui-timepicker-addon");
+require("chosen-js");*/
+//require("bootstrap-daterangepicker");
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index d92d6e2cb2..29a83ffbc7 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -789,7 +789,7 @@ function api_get_path($path = '', $configuration = [])
SYS_TEMPLATE_PATH => 'template/',
WEB_UPLOAD_PATH => 'app/upload/',
WEB_PUBLIC_PATH => 'public/',
- SYS_PUBLIC_PATH => 'web/',
+ SYS_PUBLIC_PATH => 'public/',
WEB_FONTS_PATH => 'fonts/',
SYS_FONTS_PATH => 'fonts/',
];
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index d85a99aca4..f8c6e88126 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -726,6 +726,9 @@ class Template
public function setCssCustomFiles()
{
global $disable_js_and_css_files;
+ // chamilo CSS
+ $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'../chamilo.css');
+
// Base CSS
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css');
diff --git a/main/install/index.php b/main/install/index.php
index 4c38241ad1..08e2a3eac8 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -321,15 +321,11 @@ if ($encryptPassForm == '1') {
— <?php echo get_lang('ChamiloInstallation').' — '.get_lang('Version_').' '.$new_version; ?>
-
-
-
+
diff --git a/webpack.config.js b/webpack.config.js
index d1c015cded..43bd136eea 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,10 +9,14 @@ Encore
// If chamilo is installed in a domain my.chamilo.net
//.setPublicPath('/build')
.cleanupOutputBeforeBuild()
+ // enable features!
+ .enableSassLoader()
+ .autoProvidejQuery()
+ .enableReactPreset()
// read main.js -> output as public/build/chamilo.js
.addEntry('chamilo', './assets/js/main.js')
- // read main.scss -> output as web/build/chamilo_style.css
+ // read main.scss -> output as web/build/css/base.css
.addStyleEntry('css/base', './assets/css/main.scss')
// Add chamilo themes
@@ -20,10 +24,7 @@ Encore
.addStyleEntry('css/themes/chamilo/default', './assets/css/themes/chamilo/default.css')
- // enable features!
- .enableSassLoader()
- .autoProvidejQuery()
- .enableReactPreset()
+
.enableSourceMaps(!Encore.isProduction())
.autoProvideVariables({
$: 'jquery',