Selaa lähdekoodia

Minor - Fix js and css calls #1990 #2324

jmontoyaa 7 vuotta sitten
vanhempi
commit
dc76a464a8
93 muutettua tiedostoa jossa 70 lisäystä ja 75 poistoa
  1. 2 2
      assets/js/main.js
  2. 2 2
      main/admin/user_add.php
  3. 2 2
      main/admin/user_edit.php
  4. 6 5
      main/auth/profile.php
  5. 0 4
      main/calendar/agenda_js.php
  6. 2 2
      main/course_info/infocours.php
  7. 2 2
      main/exercise/exercise.php
  8. 43 32
      main/inc/lib/template.lib.php
  9. 2 2
      main/session/session_add.php
  10. 2 2
      main/session/session_edit.php
  11. 2 3
      plugin/buycourses/src/services_add.php
  12. 2 2
      plugin/buycourses/src/services_edit.php
  13. 0 0
      public/libs/fullcalendar/.bower.json
  14. 0 0
      public/libs/fullcalendar/CHANGELOG.md
  15. 0 0
      public/libs/fullcalendar/CONTRIBUTING.md
  16. 0 0
      public/libs/fullcalendar/LICENSE.txt
  17. 0 0
      public/libs/fullcalendar/README.md
  18. 0 0
      public/libs/fullcalendar/bower.json
  19. 0 0
      public/libs/fullcalendar/dist/fullcalendar.css
  20. 0 0
      public/libs/fullcalendar/dist/fullcalendar.js
  21. 0 0
      public/libs/fullcalendar/dist/fullcalendar.min.css
  22. 0 0
      public/libs/fullcalendar/dist/fullcalendar.min.js
  23. 0 0
      public/libs/fullcalendar/dist/fullcalendar.print.css
  24. 0 0
      public/libs/fullcalendar/dist/fullcalendar.print.min.css
  25. 0 0
      public/libs/fullcalendar/dist/gcal.js
  26. 0 0
      public/libs/fullcalendar/dist/gcal.min.js
  27. 0 0
      public/libs/fullcalendar/dist/locale-all.js
  28. 0 0
      public/libs/fullcalendar/dist/locale/af.js
  29. 0 0
      public/libs/fullcalendar/dist/locale/ar-dz.js
  30. 0 0
      public/libs/fullcalendar/dist/locale/ar-ly.js
  31. 0 0
      public/libs/fullcalendar/dist/locale/ar-ma.js
  32. 0 0
      public/libs/fullcalendar/dist/locale/ar-sa.js
  33. 0 0
      public/libs/fullcalendar/dist/locale/ar-tn.js
  34. 0 0
      public/libs/fullcalendar/dist/locale/ar.js
  35. 0 0
      public/libs/fullcalendar/dist/locale/bg.js
  36. 0 0
      public/libs/fullcalendar/dist/locale/ca.js
  37. 0 0
      public/libs/fullcalendar/dist/locale/cs.js
  38. 0 0
      public/libs/fullcalendar/dist/locale/da.js
  39. 0 0
      public/libs/fullcalendar/dist/locale/de-at.js
  40. 0 0
      public/libs/fullcalendar/dist/locale/de.js
  41. 0 0
      public/libs/fullcalendar/dist/locale/el.js
  42. 0 0
      public/libs/fullcalendar/dist/locale/en-au.js
  43. 0 0
      public/libs/fullcalendar/dist/locale/en-ca.js
  44. 0 0
      public/libs/fullcalendar/dist/locale/en-gb.js
  45. 0 0
      public/libs/fullcalendar/dist/locale/en-ie.js
  46. 0 0
      public/libs/fullcalendar/dist/locale/en-nz.js
  47. 0 0
      public/libs/fullcalendar/dist/locale/es-do.js
  48. 0 0
      public/libs/fullcalendar/dist/locale/es.js
  49. 0 0
      public/libs/fullcalendar/dist/locale/eu.js
  50. 0 0
      public/libs/fullcalendar/dist/locale/fa.js
  51. 0 0
      public/libs/fullcalendar/dist/locale/fi.js
  52. 0 0
      public/libs/fullcalendar/dist/locale/fr-ca.js
  53. 0 0
      public/libs/fullcalendar/dist/locale/fr-ch.js
  54. 0 0
      public/libs/fullcalendar/dist/locale/fr.js
  55. 0 0
      public/libs/fullcalendar/dist/locale/gl.js
  56. 0 0
      public/libs/fullcalendar/dist/locale/he.js
  57. 0 0
      public/libs/fullcalendar/dist/locale/hi.js
  58. 0 0
      public/libs/fullcalendar/dist/locale/hr.js
  59. 0 0
      public/libs/fullcalendar/dist/locale/hu.js
  60. 0 0
      public/libs/fullcalendar/dist/locale/id.js
  61. 0 0
      public/libs/fullcalendar/dist/locale/is.js
  62. 0 0
      public/libs/fullcalendar/dist/locale/it.js
  63. 0 0
      public/libs/fullcalendar/dist/locale/ja.js
  64. 0 0
      public/libs/fullcalendar/dist/locale/kk.js
  65. 0 0
      public/libs/fullcalendar/dist/locale/ko.js
  66. 0 0
      public/libs/fullcalendar/dist/locale/lb.js
  67. 0 0
      public/libs/fullcalendar/dist/locale/lt.js
  68. 0 0
      public/libs/fullcalendar/dist/locale/lv.js
  69. 0 0
      public/libs/fullcalendar/dist/locale/mk.js
  70. 0 0
      public/libs/fullcalendar/dist/locale/ms-my.js
  71. 0 0
      public/libs/fullcalendar/dist/locale/ms.js
  72. 0 0
      public/libs/fullcalendar/dist/locale/nb.js
  73. 0 0
      public/libs/fullcalendar/dist/locale/nl-be.js
  74. 0 0
      public/libs/fullcalendar/dist/locale/nl.js
  75. 0 0
      public/libs/fullcalendar/dist/locale/nn.js
  76. 0 0
      public/libs/fullcalendar/dist/locale/pl.js
  77. 0 0
      public/libs/fullcalendar/dist/locale/pt-br.js
  78. 0 0
      public/libs/fullcalendar/dist/locale/pt.js
  79. 0 0
      public/libs/fullcalendar/dist/locale/ro.js
  80. 0 0
      public/libs/fullcalendar/dist/locale/ru.js
  81. 0 0
      public/libs/fullcalendar/dist/locale/sk.js
  82. 0 0
      public/libs/fullcalendar/dist/locale/sl.js
  83. 0 0
      public/libs/fullcalendar/dist/locale/sr-cyrl.js
  84. 0 0
      public/libs/fullcalendar/dist/locale/sr.js
  85. 0 0
      public/libs/fullcalendar/dist/locale/sv.js
  86. 0 0
      public/libs/fullcalendar/dist/locale/th.js
  87. 0 0
      public/libs/fullcalendar/dist/locale/tr.js
  88. 0 0
      public/libs/fullcalendar/dist/locale/uk.js
  89. 0 0
      public/libs/fullcalendar/dist/locale/vi.js
  90. 0 0
      public/libs/fullcalendar/dist/locale/zh-cn.js
  91. 0 0
      public/libs/fullcalendar/dist/locale/zh-tw.js
  92. 3 1
      src/ThemeBundle/Resources/views/Layout/base-layout.html.twig
  93. 0 14
      yarn.lock

+ 2 - 2
assets/js/main.js

@@ -18,7 +18,8 @@ require("font-awesome-webpack");
 // require("ckeditor"); // version 4.x doesnt have webpack support
 require("mediaelement");
 //require("js-cookie");
-require("fullcalendar");
+// full calendar added in lib
+//require("fullcalendar");
 require("qtip2");
 require("image-map-resizer");
 
@@ -33,7 +34,6 @@ require("select2/dist/css/select2.css");
 require('bootstrap-select/dist/js/bootstrap-select.js');
 require('bootstrap-select/dist/css/bootstrap-select.css');
 
-
 // Don't work with webpack
 //require("js-cookie");
 /*

+ 2 - 2
main/admin/user_add.php

@@ -43,8 +43,8 @@ if ($checkPass == 'true') {
     });
     </script>';
 }
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 $htmlHeadXtra[] = '
 <script>
 $("#status_select").ready(function() {

+ 2 - 2
main/admin/user_edit.php

@@ -74,8 +74,8 @@ if ($geolocalization) {
     $htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true&key='.$gmapsApiKey.'" ></script>';
 }
 
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 $tool_name = get_lang('ModifyUserInfo');
 
 $interbreadcrumb[] = ['url' => 'index.php', "name" => get_lang('PlatformAdmin')];

+ 6 - 5
main/auth/profile.php

@@ -24,7 +24,9 @@ if (api_get_setting('allow_social_tool') == 'true') {
 
 $_SESSION['this_section'] = $this_section;
 
-if (!(isset($_user['user_id']) && $_user['user_id']) || api_is_anonymous($_user['user_id'], true)) {
+if (!(isset($_user['user_id']) && $_user['user_id']) ||
+    api_is_anonymous($_user['user_id'], true)
+) {
     api_not_allowed(true);
 }
 
@@ -37,8 +39,8 @@ if ($geolocalization) {
 }
 
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
     $("#id_generate_api_key").on("click", function (e) {
@@ -771,8 +773,7 @@ if (api_get_setting('allow_social_tool') === 'true') {
 
     $tpl->assign('social_menu_block', $menu);
     $tpl->assign('social_right_content', $form->returnForm());
-    $social_layout = $tpl->get_template('social/edit_profile.tpl');
-
+    $social_layout = $tpl->get_template('social/edit_profile.html.twig');
     $tpl->display($social_layout);
 } else {
     $bigImage = UserManager::getUserPicture(api_get_user_id(), USER_IMAGE_SIZE_BIG);

+ 0 - 4
main/calendar/agenda_js.php

@@ -20,14 +20,10 @@ require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_CALENDAR_EVENT;
 $this_section = SECTION_MYAGENDA;
 
-$htmlHeadXtra[] = api_get_jquery_libraries_js(['jquery-ui', 'jquery-ui-i18n']);
-$htmlHeadXtra[] = api_get_asset('qtip2/jquery.qtip.min.js');
 $htmlHeadXtra[] = api_get_asset('fullcalendar/dist/fullcalendar.js');
 $htmlHeadXtra[] = api_get_asset('fullcalendar/dist/locale-all.js');
 $htmlHeadXtra[] = api_get_asset('fullcalendar/dist/gcal.js');
 $htmlHeadXtra[] = api_get_css_asset('fullcalendar/dist/fullcalendar.min.css');
-$htmlHeadXtra[] = api_get_css_asset('qtip2/jquery.qtip.min.css');
-$htmlHeadXtra[] = api_get_asset('js-cookie/src/js.cookie.js');
 
 if (api_is_platform_admin() && ($type == 'admin' || $type == 'platform')) {
     $type = 'admin';

+ 2 - 2
main/course_info/infocours.php

@@ -41,8 +41,8 @@ if (!$is_allowedToEdit) {
     api_not_allowed(true);
 }
 
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 $show_delete_watermark_text_message = false;
 if (api_get_setting('pdf_export_watermark_by_course') == 'true') {
     if (isset($_GET['delete_watermark'])) {

+ 2 - 2
main/exercise/exercise.php

@@ -20,8 +20,8 @@ $current_course_tool = TOOL_QUIZ;
 // Setting the tabs
 $this_section = SECTION_COURSES;
 
-$htmlHeadXtra[] = api_get_asset('qtip2/jquery.qtip.min.js');
-$htmlHeadXtra[] = api_get_css_asset('qtip2/jquery.qtip.min.css');
+//$htmlHeadXtra[] = api_get_asset('qtip2/jquery.qtip.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('qtip2/jquery.qtip.min.css');
 
 // Access control
 api_protect_course_script(true);

+ 43 - 32
main/inc/lib/template.lib.php

@@ -1013,38 +1013,7 @@ class Template
         $this->assign('prefetch', $prefetch);
         $this->assign('text_direction', api_get_text_direction());
         $this->assign('section_name', 'section-'.$this_section);
-
-        // Default root chamilo favicon
-        $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_PATH).'favicon.ico" type="image/x-icon" />';
-
-        //Added to verify if in the current Chamilo Theme exist a favicon
-        $favicoThemeUrl = api_get_path(SYS_CSS_PATH).$this->themeDir.'images/';
-
-        //If exist pick the current chamilo theme favicon
-        if (is_file($favicoThemeUrl.'favicon.ico')) {
-            $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_CSS_PATH).$this->themeDir.'images/favicon.ico" type="image/x-icon" />';
-        }
-
-        if (api_is_multiple_url_enabled()) {
-            $access_url_id = api_get_current_access_url_id();
-            if ($access_url_id != -1) {
-                $url_info = api_get_access_url($access_url_id);
-                $url = api_remove_trailing_slash(
-                    preg_replace('/https?:\/\//i', '', $url_info['url'])
-                );
-                $clean_url = api_replace_dangerous_char($url);
-                $clean_url = str_replace('/', '-', $clean_url);
-                $clean_url .= '/';
-                $homep = api_get_path(REL_PATH).'home/'.$clean_url; //homep for Home Path
-                $icon_real_homep = api_get_path(SYS_APP_PATH).'home/'.$clean_url;
-                //we create the new dir for the new sites
-                if (is_file($icon_real_homep.'favicon.ico')) {
-                    $favico = '<link rel="shortcut icon" href="'.$homep.'favicon.ico" type="image/x-icon" />';
-                }
-            }
-        }
-
-        $this->assign('favico', $favico);
+        $this->assign('favico', $this->getPortalIcon($this->theme));
         $this->setHelp();
 
         //@todo move this in the template
@@ -1226,6 +1195,48 @@ class Template
         $this->assign('social_meta', $socialMeta);
     }
 
+    /**
+     * @param string $theme
+     *
+     * @return string
+     */
+    public static function getPortalIcon($theme)
+    {
+        // Default root chamilo favicon
+        $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_PATH).'favicon.ico" type="image/x-icon" />';
+
+        // Added to verify if in the current Chamilo Theme exist a favicon
+        $favicoThemeUrl = api_get_path(SYS_CSS_PATH).'/themes/'.$theme.'/images/';
+
+        //If exist pick the current chamilo theme favicon
+        if (is_file($favicoThemeUrl.'favicon.ico')) {
+            $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/favicon.ico" type="image/x-icon" />';
+        }
+        if (api_is_multiple_url_enabled()) {
+            $access_url_id = api_get_current_access_url_id();
+            if ($access_url_id != -1) {
+                $url_info = api_get_access_url($access_url_id);
+                $url = api_remove_trailing_slash(
+                    preg_replace('/https?:\/\//i', '', $url_info['url'])
+                );
+                $clean_url = api_replace_dangerous_char($url);
+                $clean_url = str_replace('/', '-', $clean_url);
+                $clean_url .= '/';
+                $homep = api_get_path(REL_PATH).'home/'.$clean_url; //homep for Home Path
+                $icon_real_homep = api_get_path(SYS_APP_PATH).'home/'.$clean_url;
+                //we create the new dir for the new sites
+                if (is_file($icon_real_homep.'favicon.ico')) {
+                    $favico = '<link rel="shortcut icon" href="'.$homep.'favicon.ico" type="image/x-icon" />';
+                }
+            }
+        }
+
+        //var_dump(Container::$container->get('router')->generate('legacy_index'));
+        //var_dump(api_get_path(WEB_PATH));
+
+        return $favico;
+    }
+
     /**
      * Set footer parameters
      */

+ 2 - 2
main/session/session_add.php

@@ -23,8 +23,8 @@ $formSent = 0;
 $errorMsg = '';
 
 // Crop picture plugin for session images
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 
 $interbreadcrumb[] = [
     'url' => 'session_list.php',

+ 2 - 2
main/session/session_edit.php

@@ -14,8 +14,8 @@ $this_section = SECTION_PLATFORM_ADMIN;
 $formSent = 0;
 
 // Crop picture plugin for session images
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);

+ 2 - 3
plugin/buycourses/src/services_add.php

@@ -22,9 +22,8 @@ if (!empty($users)) {
 }
 
 api_protect_admin_script(true);
-
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 
 //view
 $interbreadcrumb[] = [

+ 2 - 2
plugin/buycourses/src/services_edit.php

@@ -28,8 +28,8 @@ if (!empty($users)) {
 }
 
 api_protect_admin_script(true);
-$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
-$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
+//$htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
+//$htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 
 //view
 $interbreadcrumb[] = [

+ 0 - 0
app/Resources/public/assets/fullcalendar/.bower.json → public/libs/fullcalendar/.bower.json


+ 0 - 0
app/Resources/public/assets/fullcalendar/CHANGELOG.md → public/libs/fullcalendar/CHANGELOG.md


+ 0 - 0
app/Resources/public/assets/fullcalendar/CONTRIBUTING.md → public/libs/fullcalendar/CONTRIBUTING.md


+ 0 - 0
app/Resources/public/assets/fullcalendar/LICENSE.txt → public/libs/fullcalendar/LICENSE.txt


+ 0 - 0
app/Resources/public/assets/fullcalendar/README.md → public/libs/fullcalendar/README.md


+ 0 - 0
app/Resources/public/assets/fullcalendar/bower.json → public/libs/fullcalendar/bower.json


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/fullcalendar.css → public/libs/fullcalendar/dist/fullcalendar.css


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/fullcalendar.js → public/libs/fullcalendar/dist/fullcalendar.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/fullcalendar.min.css → public/libs/fullcalendar/dist/fullcalendar.min.css


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/fullcalendar.min.js → public/libs/fullcalendar/dist/fullcalendar.min.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/fullcalendar.print.css → public/libs/fullcalendar/dist/fullcalendar.print.css


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/fullcalendar.print.min.css → public/libs/fullcalendar/dist/fullcalendar.print.min.css


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/gcal.js → public/libs/fullcalendar/dist/gcal.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/gcal.min.js → public/libs/fullcalendar/dist/gcal.min.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale-all.js → public/libs/fullcalendar/dist/locale-all.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/af.js → public/libs/fullcalendar/dist/locale/af.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ar-dz.js → public/libs/fullcalendar/dist/locale/ar-dz.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ar-ly.js → public/libs/fullcalendar/dist/locale/ar-ly.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ar-ma.js → public/libs/fullcalendar/dist/locale/ar-ma.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ar-sa.js → public/libs/fullcalendar/dist/locale/ar-sa.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ar-tn.js → public/libs/fullcalendar/dist/locale/ar-tn.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ar.js → public/libs/fullcalendar/dist/locale/ar.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/bg.js → public/libs/fullcalendar/dist/locale/bg.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ca.js → public/libs/fullcalendar/dist/locale/ca.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/cs.js → public/libs/fullcalendar/dist/locale/cs.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/da.js → public/libs/fullcalendar/dist/locale/da.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/de-at.js → public/libs/fullcalendar/dist/locale/de-at.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/de.js → public/libs/fullcalendar/dist/locale/de.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/el.js → public/libs/fullcalendar/dist/locale/el.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/en-au.js → public/libs/fullcalendar/dist/locale/en-au.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/en-ca.js → public/libs/fullcalendar/dist/locale/en-ca.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/en-gb.js → public/libs/fullcalendar/dist/locale/en-gb.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/en-ie.js → public/libs/fullcalendar/dist/locale/en-ie.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/en-nz.js → public/libs/fullcalendar/dist/locale/en-nz.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/es-do.js → public/libs/fullcalendar/dist/locale/es-do.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/es.js → public/libs/fullcalendar/dist/locale/es.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/eu.js → public/libs/fullcalendar/dist/locale/eu.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/fa.js → public/libs/fullcalendar/dist/locale/fa.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/fi.js → public/libs/fullcalendar/dist/locale/fi.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/fr-ca.js → public/libs/fullcalendar/dist/locale/fr-ca.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/fr-ch.js → public/libs/fullcalendar/dist/locale/fr-ch.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/fr.js → public/libs/fullcalendar/dist/locale/fr.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/gl.js → public/libs/fullcalendar/dist/locale/gl.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/he.js → public/libs/fullcalendar/dist/locale/he.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/hi.js → public/libs/fullcalendar/dist/locale/hi.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/hr.js → public/libs/fullcalendar/dist/locale/hr.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/hu.js → public/libs/fullcalendar/dist/locale/hu.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/id.js → public/libs/fullcalendar/dist/locale/id.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/is.js → public/libs/fullcalendar/dist/locale/is.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/it.js → public/libs/fullcalendar/dist/locale/it.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ja.js → public/libs/fullcalendar/dist/locale/ja.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/kk.js → public/libs/fullcalendar/dist/locale/kk.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ko.js → public/libs/fullcalendar/dist/locale/ko.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/lb.js → public/libs/fullcalendar/dist/locale/lb.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/lt.js → public/libs/fullcalendar/dist/locale/lt.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/lv.js → public/libs/fullcalendar/dist/locale/lv.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/mk.js → public/libs/fullcalendar/dist/locale/mk.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ms-my.js → public/libs/fullcalendar/dist/locale/ms-my.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ms.js → public/libs/fullcalendar/dist/locale/ms.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/nb.js → public/libs/fullcalendar/dist/locale/nb.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/nl-be.js → public/libs/fullcalendar/dist/locale/nl-be.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/nl.js → public/libs/fullcalendar/dist/locale/nl.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/nn.js → public/libs/fullcalendar/dist/locale/nn.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/pl.js → public/libs/fullcalendar/dist/locale/pl.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/pt-br.js → public/libs/fullcalendar/dist/locale/pt-br.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/pt.js → public/libs/fullcalendar/dist/locale/pt.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ro.js → public/libs/fullcalendar/dist/locale/ro.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/ru.js → public/libs/fullcalendar/dist/locale/ru.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/sk.js → public/libs/fullcalendar/dist/locale/sk.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/sl.js → public/libs/fullcalendar/dist/locale/sl.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/sr-cyrl.js → public/libs/fullcalendar/dist/locale/sr-cyrl.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/sr.js → public/libs/fullcalendar/dist/locale/sr.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/sv.js → public/libs/fullcalendar/dist/locale/sv.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/th.js → public/libs/fullcalendar/dist/locale/th.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/tr.js → public/libs/fullcalendar/dist/locale/tr.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/uk.js → public/libs/fullcalendar/dist/locale/uk.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/vi.js → public/libs/fullcalendar/dist/locale/vi.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/zh-cn.js → public/libs/fullcalendar/dist/locale/zh-cn.js


+ 0 - 0
app/Resources/public/assets/fullcalendar/dist/locale/zh-tw.js → public/libs/fullcalendar/dist/locale/zh-tw.js


+ 3 - 1
src/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -24,7 +24,9 @@
     <link href="https://chamilo.org/the-association/" rel="author"/>
     <link href="https://chamilo.org/the-association/" rel="copyright"/>
     <link rel="apple-touch-icon" href="{{ asset('apple-touch-icon.png') }}"/>
-    <link rel="icon" type="image/x-icon" href="{{ asset('build/css/themes/'~ theme ~'/favicon.ico') }}"/>
+    {% autoescape false %}
+    {{ favico }}
+    {% endautoescape %}
     <title>
     {% block title %}
     {{ chamilo_settings_get('platform.institution') }} - {{ chamilo_settings_get('platform.site_name') }}

+ 0 - 14
yarn.lock

@@ -3440,18 +3440,10 @@ jquery@>=1.10, jquery@>=1.2.3, jquery@>=1.6.0, jquery@>=1.8, jquery@>=2.0.0, jqu
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
 
-jquery@~2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.1.4.tgz#228bde698a0c61431dc2630a6a154f15890d2317"
-
 js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
 
-js-cookie@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb"
-
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -5058,12 +5050,6 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-readmore-js@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readmore-js/-/readmore-js-2.1.0.tgz#0cf33cfc6f1f06af2a58e8e4fc4704db8c77fb57"
-  dependencies:
-    jquery "~2.1.4"
-
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"